PlatformView: Add Offset method (#33)

Swanseo0 · web-flow · commit 9b11d8099c09 · 2023-05-12T15:57:04.000+09:00
Signed-off-by: swan.seo &lt;swan.seo@samsung.com&gt;
diff --git a/flutter/shell/platform/tizen/channels/platform_view_channel.cc b/flutter/shell/platform/tizen/channels/platform_view_channel.cc
@@ -17,11 +17,13 @@ constexpr char kChannelName[] = "flutter/platform_views";
 
 }  // namespace
 
-PlatformViewChannel::PlatformViewChannel(BinaryMessenger* messenger)
+PlatformViewChannel::PlatformViewChannel(BinaryMessenger* messenger,
+                                         double pixel_ratio)
     : channel_(std::make_unique<MethodChannel<EncodableValue>>(
           messenger,
           kChannelName,
-          &StandardMethodCodec::GetInstance())) {
+          &StandardMethodCodec::GetInstance())),
+      pixel_ratio_(pixel_ratio) {
   channel_->SetMethodCallHandler(
       [this](const MethodCall<EncodableValue>& call,
              std::unique_ptr<MethodResult<EncodableValue>> result) {
@@ -104,6 +106,8 @@ void PlatformViewChannel::HandleMethodCall(
     OnClearFocus(arguments, std::move(result));
   } else if (method == "dispose") {
     OnDispose(arguments, std::move(result));
+  } else if (method == "offset") {
+    OnOffset(arguments, std::move(result));
   } else if (method == "resize") {
     OnResize(arguments, std::move(result));
   } else if (method == "touch") {
@@ -147,8 +151,8 @@ void PlatformViewChannel::OnCreate(
     if (focused_view) {
       focused_view->SetFocus(false);
     }
-    PlatformView* view =
-        iter->second->Create(*view_id, *width, *height, byte_message);
+    PlatformView* view = iter->second->Create(
+        *view_id, *width * pixel_ratio_, *height * pixel_ratio_, byte_message);
     if (view) {
       views_[*view_id] = view;
       result->Success(EncodableValue(view->GetTextureId()));
@@ -206,6 +210,33 @@ void PlatformViewChannel::OnDispose(
   result->Success();
 }
 
+void PlatformViewChannel::OnOffset(
+    const EncodableValue* arguments,
+    std::unique_ptr<MethodResult<EncodableValue>>&& result) {
+  auto* map = std::get_if<EncodableMap>(arguments);
+  if (!map) {
+    result->Error("Invalid arguments");
+    return;
+  }
+
+  EncodableValueHolder<int> view_id(map, "id");
+  EncodableValueHolder<double> left(map, "left");
+  EncodableValueHolder<double> top(map, "top");
+
+  if (!view_id || !left || !top) {
+    result->Error("Invalid arguments");
+    return;
+  }
+  PlatformView* view = FindViewById(*view_id);
+  if (!view) {
+    result->Error("Can't find view id");
+    return;
+  }
+  view->Offset(*left * pixel_ratio_, *top * pixel_ratio_);
+
+  result->Success();
+}
+
 void PlatformViewChannel::OnResize(
     const EncodableValue* arguments,
     std::unique_ptr<MethodResult<EncodableValue>>&& result) {
@@ -229,7 +260,7 @@ void PlatformViewChannel::OnResize(
     result->Error("Can't find view id");
     return;
   }
-  view->Resize(*width, *height);
+  view->Resize(*width * pixel_ratio_, *height * pixel_ratio_);
 
   result->Success(*arguments);
 }
@@ -256,10 +287,10 @@ void PlatformViewChannel::OnTouch(
 
   type = std::get<int>(event->at(0));
   button = std::get<int>(event->at(1));
-  x = std::get<double>(event->at(2));
-  y = std::get<double>(event->at(3));
-  dx = std::get<double>(event->at(4));
-  dy = std::get<double>(event->at(5));
+  x = std::get<double>(event->at(2)) * pixel_ratio_;
+  y = std::get<double>(event->at(3)) * pixel_ratio_;
+  dx = std::get<double>(event->at(4)) * pixel_ratio_;
+  dy = std::get<double>(event->at(5)) * pixel_ratio_;
 
   PlatformView* view = FindViewById(*view_id);
   if (!view) {
diff --git a/flutter/shell/platform/tizen/channels/platform_view_channel.h b/flutter/shell/platform/tizen/channels/platform_view_channel.h
@@ -11,6 +11,7 @@
 
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/binary_messenger.h"
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/method_channel.h"
+#include "flutter/shell/platform/tizen/tizen_view_base.h"
 
 class PlatformView;
 class PlatformViewFactory;
@@ -19,7 +20,7 @@ namespace flutter {
 
 class PlatformViewChannel {
  public:
-  explicit PlatformViewChannel(BinaryMessenger* messenger);
+  explicit PlatformViewChannel(BinaryMessenger* messenger, double pixel_ratio);
   virtual ~PlatformViewChannel();
 
   void Dispose();
@@ -52,6 +53,8 @@ class PlatformViewChannel {
                     std::unique_ptr<MethodResult<EncodableValue>>&& result);
   void OnDispose(const EncodableValue* arguments,
                  std::unique_ptr<MethodResult<EncodableValue>>&& result);
+  void OnOffset(const EncodableValue* arguments,
+                std::unique_ptr<MethodResult<EncodableValue>>&& result);
   void OnResize(const EncodableValue* arguments,
                 std::unique_ptr<MethodResult<EncodableValue>>&& result);
   void OnTouch(const EncodableValue* arguments,
@@ -60,6 +63,8 @@ class PlatformViewChannel {
   std::unique_ptr<MethodChannel<EncodableValue>> channel_;
   std::map<std::string, std::unique_ptr<PlatformViewFactory>> view_factories_;
   std::map<int, PlatformView*> views_;
+
+  double pixel_ratio_;
 };
 
 }  // namespace flutter
diff --git a/flutter/shell/platform/tizen/flutter_tizen.cc b/flutter/shell/platform/tizen/flutter_tizen.cc
@@ -314,7 +314,7 @@ void FlutterDesktopRegisterViewFactory(
     FlutterDesktopPluginRegistrarRef registrar,
     const char* view_type,
     std::unique_ptr<PlatformViewFactory> view_factory) {
-  registrar->engine->platform_view_channel()->ViewFactories().insert(
+  registrar->engine->view()->platform_view_channel()->ViewFactories().insert(
       std::pair<std::string, std::unique_ptr<PlatformViewFactory>>(
           view_type, std::move(view_factory)));
 }
diff --git a/flutter/shell/platform/tizen/flutter_tizen_engine.cc b/flutter/shell/platform/tizen/flutter_tizen_engine.cc
@@ -250,8 +250,6 @@ bool FlutterTizenEngine::RunEngine() {
                void* user_data) { SendKeyEvent(event, callback, user_data); });
     navigation_channel_ = std::make_unique<NavigationChannel>(
         internal_plugin_registrar_->messenger());
-    platform_view_channel_ = std::make_unique<PlatformViewChannel>(
-        internal_plugin_registrar_->messenger());
   }
 
   accessibility_settings_ = std::make_unique<AccessibilitySettings>(this);
@@ -263,9 +261,6 @@ bool FlutterTizenEngine::RunEngine() {
 
 bool FlutterTizenEngine::StopEngine() {
   if (engine_) {
-    if (platform_view_channel_) {
-      platform_view_channel_->Dispose();
-    }
     for (const auto& [callback, registrar] :
          plugin_registrar_destruction_callbacks_) {
       callback(registrar);
diff --git a/flutter/shell/platform/tizen/flutter_tizen_engine.h b/flutter/shell/platform/tizen/flutter_tizen_engine.h
@@ -107,10 +107,6 @@ class FlutterTizenEngine {
 
   NavigationChannel* navigation_channel() { return navigation_channel_.get(); }
 
-  PlatformViewChannel* platform_view_channel() {
-    return platform_view_channel_.get();
-  }
-
 #ifndef WEARABLE_PROFILE
   std::weak_ptr<flutter::AccessibilityBridge> accessibility_bridge() {
     return accessibility_bridge_;
@@ -264,9 +260,6 @@ class FlutterTizenEngine {
   // A plugin that implements the Flutter navigation channel.
   std::unique_ptr<NavigationChannel> navigation_channel_;
 
-  // A plugin that implements the Flutter platform_views channel.
-  std::unique_ptr<PlatformViewChannel> platform_view_channel_;
-
   // A plugin that implements the Flutter settings channel.
   std::unique_ptr<SettingsChannel> settings_channel_;
 
diff --git a/flutter/shell/platform/tizen/flutter_tizen_view.cc b/flutter/shell/platform/tizen/flutter_tizen_view.cc
@@ -49,6 +49,19 @@ const std::vector<std::string> kBindableSystemKeys = {
 // (ui/events/x/events_x_utils.cc).
 constexpr int32_t kScrollOffsetMultiplier = 53;
 
+double ComputePixelRatio(flutter::TizenViewBase* view) {
+  // The scale factor is computed based on the display DPI and the current
+  // profile. A fixed DPI value (72) is used on TVs. See:
+  // https://docs.tizen.org/application/native/guides/ui/efl/multiple-screens
+#ifdef TV_PROFILE
+  double dpi = 72.0;
+#else
+  double dpi = static_cast<double>(view->GetDpi());
+#endif
+  double scale_factor = dpi / 90.0 * kProfileFactor;
+  return std::max(scale_factor, 1.0);
+}
+
 }  // namespace
 
 namespace flutter {
@@ -64,6 +77,9 @@ FlutterTizenView::FlutterTizenView(std::unique_ptr<TizenViewBase> tizen_view)
 
 FlutterTizenView::~FlutterTizenView() {
   if (engine_) {
+    if (platform_view_channel_) {
+      platform_view_channel_->Dispose();
+    }
     engine_->StopEngine();
   }
   DestroyRenderSurface();
@@ -84,6 +100,10 @@ void FlutterTizenView::SetEngine(std::unique_ptr<FlutterTizenEngine> engine) {
 
   platform_channel_ =
       std::make_unique<PlatformChannel>(messenger, tizen_view_.get());
+
+  double pixel_ratio = ComputePixelRatio(tizen_view_.get());
+  platform_view_channel_ =
+      std::make_unique<PlatformViewChannel>(messenger, pixel_ratio);
   mouse_cursor_channel_ =
       std::make_unique<MouseCursorChannel>(messenger, tizen_view_.get());
   text_input_channel_ = std::make_unique<TextInputChannel>(
@@ -316,9 +336,9 @@ void FlutterTizenView::OnKey(const char* key,
     }
   }
 
-  if (engine_->platform_view_channel()) {
-    if (engine_->platform_view_channel()->SendKey(
-            key, string, compose, modifiers, scan_code, is_down)) {
+  if (platform_view_channel_) {
+    if (platform_view_channel_->SendKey(key, string, compose, modifiers,
+                                        scan_code, is_down)) {
       return;
     }
   }
@@ -373,23 +393,11 @@ void FlutterTizenView::SendWindowMetrics(int32_t left,
                                          int32_t width,
                                          int32_t height,
                                          double pixel_ratio) {
-  double computed_pixel_ratio = pixel_ratio;
   if (pixel_ratio == 0.0) {
-    // The scale factor is computed based on the display DPI and the current
-    // profile. A fixed DPI value (72) is used on TVs. See:
-    // https://docs.tizen.org/application/native/guides/ui/efl/multiple-screens
-#ifdef TV_PROFILE
-    double dpi = 72.0;
-#else
-    double dpi = static_cast<double>(tizen_view_->GetDpi());
-#endif
-    double scale_factor = dpi / 90.0 * kProfileFactor;
-    computed_pixel_ratio = std::max(scale_factor, 1.0);
-  } else {
-    computed_pixel_ratio = pixel_ratio;
+    pixel_ratio = ComputePixelRatio(tizen_view_.get());
   }
 
-  engine_->SendWindowMetrics(left, top, width, height, computed_pixel_ratio);
+  engine_->SendWindowMetrics(left, top, width, height, pixel_ratio);
 }
 
 void FlutterTizenView::SendFlutterPointerEvent(FlutterPointerPhase phase,
diff --git a/flutter/shell/platform/tizen/flutter_tizen_view.h b/flutter/shell/platform/tizen/flutter_tizen_view.h
@@ -111,6 +111,10 @@ class FlutterTizenView : public TizenViewEventHandlerDelegate {
 
   void SendInitialGeometry();
 
+  PlatformViewChannel* platform_view_channel() {
+    return platform_view_channel_.get();
+  }
+
   TextInputChannel* text_input_channel() { return text_input_channel_.get(); }
 
  private:
@@ -178,6 +182,9 @@ class FlutterTizenView : public TizenViewEventHandlerDelegate {
   // A plugin that implements the Flutter platform channel.
   std::unique_ptr<PlatformChannel> platform_channel_;
 
+  // A plugin that implements the Flutter platform_views channel.
+  std::unique_ptr<PlatformViewChannel> platform_view_channel_;
+
   // A plugin that implements the Flutter cursor channel.
   std::unique_ptr<MouseCursorChannel> mouse_cursor_channel_;
 
diff --git a/flutter/shell/platform/tizen/public/flutter_platform_view.h b/flutter/shell/platform/tizen/public/flutter_platform_view.h
@@ -30,6 +30,7 @@ class PlatformView {
 
   virtual void Dispose() = 0;
 
+  virtual void Offset(double left, double top) {}
   virtual void Resize(double width, double height) = 0;
   virtual void Touch(int type,
                      int button,

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ void FlutterDesktopRegisterViewFactory(`
`314`	`314`	`FlutterDesktopPluginRegistrarRef registrar,`
`315`	`315`	`const char* view_type,`
`316`	`316`	`std::unique_ptr<PlatformViewFactory> view_factory) {`
`317`		`- registrar->engine->platform_view_channel()->ViewFactories().insert(`
	`317`	`+ registrar->engine->view()->platform_view_channel()->ViewFactories().insert(`
`318`	`318`	`std::pair<std::string, std::unique_ptr<PlatformViewFactory>>(`
`319`	`319`	`view_type, std::move(view_factory)));`
`320`	`320`	`}`