Support user made window

* This is a necessary feature for partial window.

Signed-off-by: MuHong Byun <[email protected]>

Author: bwikbs

shell/platform/tizen/flutter_tizen.cc

@@ -29,7 +29,7 @@ FlutterDesktopEngineRef FlutterDesktopRunEngine(
     bool headed) {
   StartLogging();
 
-  auto engine = std::make_unique<FlutterTizenEngine>(headed);
+  auto engine = std::make_unique<FlutterTizenEngine>(headed,engine_properties.custom_win);
   if (!engine->RunEngine(engine_properties)) {
     FT_LOGE("Failed to run the Flutter engine.");
     return nullptr;

shell/platform/tizen/flutter_tizen_engine.cc

@@ -38,8 +38,8 @@ static DeviceProfile GetDeviceProfile() {
   return DeviceProfile::kUnknown;
 }
 
-FlutterTizenEngine::FlutterTizenEngine(bool headed)
-    : device_profile(GetDeviceProfile()) {
+FlutterTizenEngine::FlutterTizenEngine(bool headed, void* win)
+    : device_profile(GetDeviceProfile()), custom_window_(win) {
   // Run flutter task on Tizen main loop.
   // Tizen engine has four threads (GPU thread, UI thread, IO thread, platform
   // thread). UI threads need to send flutter task to platform thread.
@@ -64,9 +64,7 @@ FlutterTizenEngine::FlutterTizenEngine(bool headed)
   }
 }
 
-FlutterTizenEngine::~FlutterTizenEngine() {
-  renderer = nullptr;
-}
+FlutterTizenEngine::~FlutterTizenEngine() { renderer = nullptr; }
 
 void FlutterTizenEngine::InitializeRenderer() {
 #ifdef TIZEN_RENDERER_EVAS_GL
@@ -257,8 +255,7 @@ void FlutterTizenEngine::SetPluginRegistrarDestructionCallback(
   plugin_registrar_destruction_callback_ = callback;
 }
 
-void FlutterTizenEngine::SendWindowMetrics(int32_t width,
-                                           int32_t height,
+void FlutterTizenEngine::SendWindowMetrics(int32_t width, int32_t height,
                                            double pixel_ratio) {
   FlutterWindowMetricsEvent event;
   event.struct_size = sizeof(FlutterWindowMetricsEvent);
@@ -331,11 +328,13 @@ void FlutterTizenEngine::OnOrientationChange(int32_t degree) {
   SetWindowOrientation(degree);
 }
 
+bool FlutterTizenEngine::hasCustomWindow() { return custom_window_ != nullptr; }
+void* FlutterTizenEngine::CustomWindow() { return custom_window_; }
+
 // The Flutter Engine calls out to this function when new platform messages are
 // available.
 void FlutterTizenEngine::OnFlutterPlatformMessage(
-    const FlutterPlatformMessage* engine_message,
-    void* user_data) {
+    const FlutterPlatformMessage* engine_message, void* user_data) {
   if (engine_message->struct_size != sizeof(FlutterPlatformMessage)) {
     FT_LOGE("Invalid message size received. Expected: %zu, but received %zu",
             sizeof(FlutterPlatformMessage), engine_message->struct_size);

shell/platform/tizen/flutter_tizen_engine.h

@@ -58,7 +58,7 @@ enum DeviceProfile { kUnknown, kMobile, kWearable, kTV, kCommon };
 // Manages state associated with the underlying FlutterEngine.
 class FlutterTizenEngine : public TizenRenderer::Delegate {
  public:
-  explicit FlutterTizenEngine(bool headed);
+  explicit FlutterTizenEngine(bool headed, void* win = nullptr);
   virtual ~FlutterTizenEngine();
 
   // Prevent copying.
@@ -83,6 +83,9 @@ class FlutterTizenEngine : public TizenRenderer::Delegate {
   void SetWindowOrientation(int32_t degree);
   void OnOrientationChange(int32_t degree) override;
 
+  // This is an experimental feature to support partial window.
+  bool hasCustomWindow() override;
+  void* CustomWindow() override;
   // The Flutter engine instance.
   FLUTTER_API_SYMBOL(FlutterEngine) flutter_engine;
 
@@ -111,8 +114,7 @@ class FlutterTizenEngine : public TizenRenderer::Delegate {
   bool IsHeaded() { return renderer != nullptr; }
 
   static void OnFlutterPlatformMessage(
-      const FlutterPlatformMessage* engine_message,
-      void* user_data);
+      const FlutterPlatformMessage* engine_message, void* user_data);
   FlutterDesktopMessage ConvertToDesktopMessage(
       const FlutterPlatformMessage& engine_message);
   FlutterRendererConfig GetRendererConfig();
@@ -152,6 +154,8 @@ class FlutterTizenEngine : public TizenRenderer::Delegate {
 
   // The current renderer transformation.
   FlutterTransformation transformation_;
+
+  void* custom_window_;
 };
 
 #endif  // EMBEDDER_TIZEN_EMBEDDER_ENGINE_H_

shell/platform/tizen/public/flutter_tizen.h

@@ -36,6 +36,8 @@ typedef struct {
   const char** switches;
   // The number of elements in |switches|.
   size_t switches_count;
+  // This is an experimental feature to support partial window.
+  void* custom_win;
 } FlutterDesktopEngineProperties;
 
 // Runs an instance of a Flutter engine with the given properties.

shell/platform/tizen/tizen_renderer.h

@@ -17,6 +17,9 @@ class TizenRenderer {
   class Delegate {
    public:
     virtual void OnOrientationChange(int32_t degree) = 0;
+    // This is an experimental feature to support partial window.
+    virtual bool hasCustomWindow() = 0;
+    virtual void* CustomWindow() = 0;
   };
 
   virtual ~TizenRenderer();

shell/platform/tizen/tizen_renderer_ecore_wl2.cc

@@ -14,9 +14,7 @@ TizenRendererEcoreWl2::TizenRendererEcoreWl2(TizenRenderer::Delegate& delegate)
   InitializeRenderer();
 }
 
-TizenRendererEcoreWl2::~TizenRendererEcoreWl2() {
-  DestroyRenderer();
-}
+TizenRendererEcoreWl2::~TizenRendererEcoreWl2() { DestroyRenderer(); }
 
 bool TizenRendererEcoreWl2::OnMakeCurrent() {
   if (!IsValid()) {
@@ -253,9 +251,7 @@ bool TizenRendererEcoreWl2::InitializeRenderer() {
   return true;
 }
 
-void TizenRendererEcoreWl2::Show() {
-  ecore_wl2_window_show(ecore_wl2_window_);
-}
+void TizenRendererEcoreWl2::Show() { ecore_wl2_window_show(ecore_wl2_window_); }
 
 void TizenRendererEcoreWl2::DestroyRenderer() {
   DestroyEglSurface();
@@ -285,13 +281,19 @@ bool TizenRendererEcoreWl2::SetupEcoreWlWindow(int32_t width, int32_t height) {
     FT_LOGE("Invalid screen size: %d x %d", width, height);
     return false;
   }
-  ecore_wl2_window_ =
-      ecore_wl2_window_new(ecore_wl2_display_, nullptr, 0, 0, width, height);
-  ecore_wl2_window_type_set(ecore_wl2_window_, ECORE_WL2_WINDOW_TYPE_TOPLEVEL);
-  ecore_wl2_window_alpha_set(ecore_wl2_window_, EINA_FALSE);
-  ecore_wl2_window_position_set(ecore_wl2_window_, 0, 0);
-  ecore_wl2_window_aux_hint_add(ecore_wl2_window_, 0,
-                                "wm.policy.win.user.geometry", "1");
+  if (delegate_.hasCustomWindow()) {
+    ecore_wl2_window_ =
+        reinterpret_cast<Ecore_Wl2_Window*>(delegate_.CustomWindow());
+  } else {
+    ecore_wl2_window_ =
+        ecore_wl2_window_new(ecore_wl2_display_, nullptr, 0, 0, width, height);
+    ecore_wl2_window_type_set(ecore_wl2_window_,
+                              ECORE_WL2_WINDOW_TYPE_TOPLEVEL);
+    ecore_wl2_window_alpha_set(ecore_wl2_window_, EINA_FALSE);
+    ecore_wl2_window_position_set(ecore_wl2_window_, 0, 0);
+    ecore_wl2_window_aux_hint_add(ecore_wl2_window_, 0,
+                                  "wm.policy.win.user.geometry", "1");
+  }
   int rotations[4] = {0, 90, 180, 270};
   ecore_wl2_window_available_rotations_set(ecore_wl2_window_, rotations,
                                            sizeof(rotations) / sizeof(int));
@@ -561,8 +563,7 @@ void TizenRendererEcoreWl2::DestroyEglSurface() {
   }
 }
 
-Eina_Bool TizenRendererEcoreWl2::RotationEventCb(void* data,
-                                                 int type,
+Eina_Bool TizenRendererEcoreWl2::RotationEventCb(void* data, int type,
                                                  void* event) {
   auto* self = reinterpret_cast<TizenRendererEcoreWl2*>(data);
   auto* ev = reinterpret_cast<Ecore_Wl2_Event_Window_Rotation*>(event);
@@ -575,10 +576,8 @@ void TizenRendererEcoreWl2::SetRotate(int angle) {
   received_rotation_ = true;
 }
 
-void TizenRendererEcoreWl2::ResizeWithRotation(int32_t x,
-                                               int32_t y,
-                                               int32_t width,
-                                               int32_t height,
+void TizenRendererEcoreWl2::ResizeWithRotation(int32_t x, int32_t y,
+                                               int32_t width, int32_t height,
                                                int32_t angle) {
   ecore_wl2_egl_window_resize_with_rotation(ecore_wl2_egl_window_, x, y, width,
                                             height, angle);

shell/platform/tizen/tizen_renderer_evas_gl.cc

@@ -20,9 +20,7 @@ TizenRendererEvasGL::TizenRendererEvasGL(TizenRenderer::Delegate& delegate)
   OnPresent();
 }
 
-TizenRendererEvasGL::~TizenRendererEvasGL() {
-  DestroyRenderer();
-}
+TizenRendererEvasGL::~TizenRendererEvasGL() { DestroyRenderer(); }
 
 void TizenRendererEvasGL::ClearColor(float r, float g, float b, float a) {
   glClearColor(r, g, b, a);
@@ -562,9 +560,7 @@ uintptr_t TizenRendererEvasGL::GetWindowId() {
       ecore_evas_ecore_evas_get(evas_object_evas_get(evas_window_)));
 }
 
-void* TizenRendererEvasGL::GetImageHandle() {
-  return (void*)graphics_adapter_;
-}
+void* TizenRendererEvasGL::GetImageHandle() { return (void*)graphics_adapter_; }
 
 bool TizenRendererEvasGL::InitializeRenderer() {
   if (!SetupEvasGL()) {
@@ -636,21 +632,25 @@ bool TizenRendererEvasGL::SetupEvasGL() {
 void* TizenRendererEvasGL::SetupEvasWindow(int32_t& width, int32_t& height) {
   elm_config_accel_preference_set("hw:opengl");
 
-  evas_window_ = elm_win_add(NULL, NULL, ELM_WIN_BASIC);
-  auto* ecore_evas =
-      ecore_evas_ecore_evas_get(evas_object_evas_get(evas_window_));
-  int32_t x, y;
-  ecore_evas_screen_geometry_get(ecore_evas, &x, &y, &width, &height);
-  if (width == 0 || height == 0) {
-    FT_LOGE("Invalid screen size: %d x %d", width, height);
-    return nullptr;
+  if (delegate_.hasCustomWindow()) {
+    evas_window_ = reinterpret_cast<Evas_Object*>(delegate_.CustomWindow());
+  } else {
+    evas_window_ = elm_win_add(NULL, NULL, ELM_WIN_BASIC);
+    auto* ecore_evas =
+        ecore_evas_ecore_evas_get(evas_object_evas_get(evas_window_));
+    int32_t x, y;
+    ecore_evas_screen_geometry_get(ecore_evas, &x, &y, &width, &height);
+    if (width == 0 || height == 0) {
+      FT_LOGE("Invalid screen size: %d x %d", width, height);
+      return nullptr;
+    }
+
+    elm_win_alpha_set(evas_window_, EINA_FALSE);
+    evas_object_move(evas_window_, 0, 0);
+    evas_object_resize(evas_window_, width, height);
+    evas_object_raise(evas_window_);
   }
 
-  elm_win_alpha_set(evas_window_, EINA_FALSE);
-  evas_object_move(evas_window_, 0, 0);
-  evas_object_resize(evas_window_, width, height);
-  evas_object_raise(evas_window_);
-
   Evas_Object* bg = elm_bg_add(evas_window_);
   evas_object_color_set(bg, 0x00, 0x00, 0x00, 0x00);
 
@@ -689,8 +689,7 @@ void TizenRendererEvasGL::DestroyEvasWindow() {
   evas_object_del(graphics_adapter_);
 }
 
-void TizenRendererEvasGL::RotationEventCb(void* data,
-                                          Evas_Object* obj,
+void TizenRendererEvasGL::RotationEventCb(void* data, Evas_Object* obj,
                                           void* event_info) {
   auto* self = reinterpret_cast<TizenRendererEvasGL*>(data);
   // TODO : Use current window rotation degree
@@ -703,10 +702,8 @@ void TizenRendererEvasGL::SetRotate(int angle) {
   received_rotation_ = true;
 }
 
-void TizenRendererEvasGL::ResizeWithRotation(int32_t x,
-                                             int32_t y,
-                                             int32_t width,
-                                             int32_t height,
+void TizenRendererEvasGL::ResizeWithRotation(int32_t x, int32_t y,
+                                             int32_t width, int32_t height,
                                              int32_t angle) {
   evas_object_move(evas_window_, x, y);
   evas_object_resize(evas_window_, width, height);