Add FlutterDesktopWindowProperties to the public API

Author: swift-kim

shell/platform/tizen/flutter_tizen.cc

@@ -26,12 +26,17 @@ static FlutterDesktopEngineRef HandleForEngine(
 }
 
 FlutterDesktopEngineRef FlutterDesktopRunEngine(
-    const FlutterDesktopEngineProperties& engine_properties,
-    bool headed) {
+    const FlutterDesktopWindowProperties& window_properties,
+    const FlutterDesktopEngineProperties& engine_properties) {
   flutter::StartLogging();
 
   flutter::FlutterProjectBundle project(engine_properties);
-  auto engine = std::make_unique<flutter::FlutterTizenEngine>(project, headed);
+  auto engine = std::make_unique<flutter::FlutterTizenEngine>(project);
+  if (window_properties.headed) {
+    engine->InitializeRenderer(window_properties.x, window_properties.y,
+                               window_properties.width,
+                               window_properties.height);
+  }
   if (!engine->RunEngine()) {
     FT_LOGE("Failed to run the Flutter engine.");
     return nullptr;

shell/platform/tizen/flutter_tizen_engine.cc

@@ -33,8 +33,7 @@ constexpr double kProfileFactor = 1.0;
 
 }  // namespace
 
-FlutterTizenEngine::FlutterTizenEngine(const FlutterProjectBundle& project,
-                                       bool headed)
+FlutterTizenEngine::FlutterTizenEngine(const FlutterProjectBundle& project)
     : project_(std::make_unique<FlutterProjectBundle>(project)),
       aot_data_(nullptr, nullptr) {
   embedder_api_.struct_size = sizeof(FlutterEngineProcTable);
@@ -58,19 +57,20 @@ FlutterTizenEngine::FlutterTizenEngine(const FlutterProjectBundle& project,
 
   plugin_registrar_ = std::make_unique<FlutterDesktopPluginRegistrar>();
   plugin_registrar_->engine = this;
-
-  if (headed) {
-    InitializeRenderer();
-  }
 }
 
 FlutterTizenEngine::~FlutterTizenEngine() {
   renderer = nullptr;
 }
 
-void FlutterTizenEngine::InitializeRenderer() {
+void FlutterTizenEngine::InitializeRenderer(int32_t x,
+                                            int32_t y,
+                                            int32_t width,
+                                            int32_t height) {
+  TizenRenderer::WindowGeometry geometry = {x, y, width, height};
+
 #ifdef TIZEN_RENDERER_EVAS_GL
-  renderer = std::make_unique<TizenRendererEvasGL>(*this);
+  renderer = std::make_unique<TizenRendererEvasGL>(geometry, *this);
 
   render_loop_ = std::make_unique<TizenRenderEventLoop>(
       std::this_thread::get_id(),  // main thread
@@ -81,7 +81,7 @@ void FlutterTizenEngine::InitializeRenderer() {
       },
       renderer.get());
 #else
-  renderer = std::make_unique<TizenRendererEcoreWl2>(*this);
+  renderer = std::make_unique<TizenRendererEcoreWl2>(geometry, *this);
 
   tizen_vsync_waiter_ = std::make_unique<TizenVsyncWaiter>(this);
 #endif
@@ -340,7 +340,7 @@ void FlutterTizenEngine::SetWindowOrientation(int32_t degree) {
   renderer->SetRotate(degree);
   // Compute renderer transformation based on the angle of rotation.
   double rad = (360 - degree) * M_PI / 180;
-  auto geometry = renderer->GetGeometry();
+  auto geometry = renderer->GetCurrentGeometry();
   double width = geometry.w;
   double height = geometry.h;
 

shell/platform/tizen/flutter_tizen_engine.h

@@ -51,7 +51,7 @@ namespace flutter {
 class FlutterTizenEngine : public TizenRenderer::Delegate {
  public:
   // Creates a new Flutter engine object configured to run |project|.
-  explicit FlutterTizenEngine(const FlutterProjectBundle& project, bool headed);
+  explicit FlutterTizenEngine(const FlutterProjectBundle& project);
 
   virtual ~FlutterTizenEngine();
 
@@ -60,7 +60,7 @@ class FlutterTizenEngine : public TizenRenderer::Delegate {
   FlutterTizenEngine& operator=(FlutterTizenEngine const&) = delete;
 
   // Sets up an instance of TizenRenderer.
-  void InitializeRenderer();
+  void InitializeRenderer(int32_t x, int32_t y, int32_t width, int32_t height);
 
   // Starts running the engine.
   bool RunEngine();

shell/platform/tizen/public/flutter_tizen.h

@@ -21,6 +21,21 @@ extern "C" {
 struct FlutterDesktopEngine;
 typedef struct FlutterDesktopEngine* FlutterDesktopEngineRef;
 
+// Properties for configuring the initial settings of a Flutter window.
+typedef struct {
+  // Whether the app is headed or headless. Other properties are ignored if
+  // this value is set to false.
+  bool headed;
+  // The x-coordinate of the top left corner of the window.
+  int32_t x;
+  // The y-coordinate of the top left corner of the window.
+  int32_t y;
+  // The width of the window, or the maximum width if the value is zero.
+  int32_t width;
+  // The height of the window, or the maximum height if the value is zero.
+  int32_t height;
+} FlutterDesktopWindowProperties;
+
 // Properties for configuring a Flutter engine instance.
 typedef struct {
   // The path to the flutter_assets folder for the application to be run.
@@ -41,9 +56,9 @@ typedef struct {
 // Runs an instance of a Flutter engine with the given properties.
 //
 // If |headed| is false, the engine is run in headless mode.
-FLUTTER_EXPORT FlutterDesktopEngineRef
-FlutterDesktopRunEngine(const FlutterDesktopEngineProperties& engine_properties,
-                        bool headed);
+FLUTTER_EXPORT FlutterDesktopEngineRef FlutterDesktopRunEngine(
+    const FlutterDesktopWindowProperties& window_properties,
+    const FlutterDesktopEngineProperties& engine_properties);
 
 // Shuts down the given engine instance.
 //

shell/platform/tizen/tizen_renderer.cc

@@ -6,8 +6,8 @@
 
 namespace flutter {
 
-TizenRenderer::TizenRenderer(TizenRenderer::Delegate& delegate)
-    : delegate_(delegate) {}
+TizenRenderer::TizenRenderer(WindowGeometry geometry, Delegate& delegate)
+    : initial_geometry_(geometry), delegate_(delegate) {}
 
 TizenRenderer::~TizenRenderer() = default;
 

shell/platform/tizen/tizen_renderer.h

@@ -12,7 +12,7 @@ namespace flutter {
 
 class TizenRenderer {
  public:
-  struct TizenWindowGeometry {
+  struct WindowGeometry {
     int32_t x{0}, y{0}, w{0}, h{0};
   };
 
@@ -32,7 +32,7 @@ class TizenRenderer {
   virtual uint32_t OnGetFBO() = 0;
   virtual void* OnProcResolver(const char* name) = 0;
 
-  virtual TizenWindowGeometry GetGeometry() = 0;
+  virtual WindowGeometry GetCurrentGeometry() = 0;
   virtual int32_t GetDpi() = 0;
   virtual uintptr_t GetWindowId() = 0;
 
@@ -45,12 +45,13 @@ class TizenRenderer {
   virtual void SetPreferredOrientations(const std::vector<int>& rotations) = 0;
 
  protected:
-  explicit TizenRenderer(TizenRenderer::Delegate& delegate);
+  explicit TizenRenderer(WindowGeometry geometry, Delegate& delegate);
 
-  bool is_valid_ = false;
+  WindowGeometry initial_geometry_;
+  Delegate& delegate_;
 
-  bool received_rotation_{false};
-  TizenRenderer::Delegate& delegate_;
+  bool is_valid_ = false;
+  bool received_rotation_ = false;
 };
 
 }  // namespace flutter

shell/platform/tizen/tizen_renderer_ecore_wl2.cc

@@ -11,8 +11,9 @@
 
 namespace flutter {
 
-TizenRendererEcoreWl2::TizenRendererEcoreWl2(TizenRenderer::Delegate& delegate)
-    : TizenRenderer(delegate) {
+TizenRendererEcoreWl2::TizenRendererEcoreWl2(WindowGeometry geometry,
+                                             Delegate& delegate)
+    : TizenRenderer(geometry, delegate) {
   InitializeRenderer();
 }
 
@@ -211,8 +212,8 @@ void* TizenRendererEcoreWl2::OnProcResolver(const char* name) {
   return nullptr;
 }
 
-TizenRenderer::TizenWindowGeometry TizenRendererEcoreWl2::GetGeometry() {
-  TizenWindowGeometry result;
+TizenRenderer::WindowGeometry TizenRendererEcoreWl2::GetCurrentGeometry() {
+  WindowGeometry result;
   ecore_wl2_window_geometry_get(ecore_wl2_window_, &result.x, &result.y,
                                 &result.w, &result.h);
   return result;
@@ -233,20 +234,20 @@ uintptr_t TizenRendererEcoreWl2::GetWindowId() {
 
 bool TizenRendererEcoreWl2::InitializeRenderer() {
   int32_t width, height;
-  if (!SetupDisplay(width, height)) {
-    FT_LOGE("SetupDisplay fail");
+  if (!SetupDisplay(&width, &height)) {
+    FT_LOGE("SetupDisplay failed.");
     return false;
   }
   if (!SetupEcoreWlWindow(width, height)) {
-    FT_LOGE("SetupEcoreWlWindow fail");
+    FT_LOGE("SetupEcoreWlWindow failed.");
     return false;
   }
   if (!SetupEglWindow(width, height)) {
-    FT_LOGE("SetupEglWindow fail");
+    FT_LOGE("SetupEglWindow failed.");
     return false;
   }
   if (!SetupEglSurface()) {
-    FT_LOGE("SetupEglSurface fail");
+    FT_LOGE("SetupEglSurface failed.");
     return false;
   }
   Show();
@@ -265,38 +266,50 @@ void TizenRendererEcoreWl2::DestroyRenderer() {
   ShutdownDisplay();
 }
 
-bool TizenRendererEcoreWl2::SetupDisplay(int32_t& width, int32_t& height) {
+bool TizenRendererEcoreWl2::SetupDisplay(int32_t* width, int32_t* height) {
   if (!ecore_wl2_init()) {
-    FT_LOGE("Could not initialize ecore_wl2");
+    FT_LOGE("Could not initialize ecore_wl2.");
     return false;
   }
   ecore_wl2_display_ = ecore_wl2_display_connect(nullptr);
   if (ecore_wl2_display_ == nullptr) {
-    FT_LOGE("Display not found");
+    FT_LOGE("Display not found.");
     return false;
   }
-
   ecore_wl2_sync();
-  ecore_wl2_display_screen_size_get(ecore_wl2_display_, &width, &height);
+
+  ecore_wl2_display_screen_size_get(ecore_wl2_display_, width, height);
+  if (*width == 0 || *height == 0) {
+    FT_LOGE("Invalid screen size: %d x %d", *width, *height);
+    return false;
+  }
+  if (initial_geometry_.w > 0) {
+    *width = initial_geometry_.w;
+  }
+  if (initial_geometry_.h > 0) {
+    *height = initial_geometry_.h;
+  }
+
   return true;
 }
 
 bool TizenRendererEcoreWl2::SetupEcoreWlWindow(int32_t width, int32_t height) {
-  if (width == 0 || height == 0) {
-    FT_LOGE("Invalid screen size: %d x %d", width, height);
-    return false;
-  }
+  int32_t x = initial_geometry_.x;
+  int32_t y = initial_geometry_.y;
+
   ecore_wl2_window_ =
-      ecore_wl2_window_new(ecore_wl2_display_, nullptr, 0, 0, width, height);
+      ecore_wl2_window_new(ecore_wl2_display_, nullptr, x, y, 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_position_set(ecore_wl2_window_, x, y);
   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));
   ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_ROTATE, RotationEventCb, this);
+
   return true;
 }
 

shell/platform/tizen/tizen_renderer_ecore_wl2.h

@@ -15,7 +15,7 @@ namespace flutter {
 
 class TizenRendererEcoreWl2 : public TizenRenderer {
  public:
-  explicit TizenRendererEcoreWl2(TizenRenderer::Delegate& delegate);
+  explicit TizenRendererEcoreWl2(WindowGeometry geometry, Delegate& delegate);
   virtual ~TizenRendererEcoreWl2();
 
   bool OnMakeCurrent() override;
@@ -25,7 +25,7 @@ class TizenRendererEcoreWl2 : public TizenRenderer {
   uint32_t OnGetFBO() override;
   void* OnProcResolver(const char* name) override;
 
-  TizenWindowGeometry GetGeometry() override;
+  WindowGeometry GetCurrentGeometry() override;
   int32_t GetDpi() override;
   uintptr_t GetWindowId() override;
 
@@ -42,7 +42,7 @@ class TizenRendererEcoreWl2 : public TizenRenderer {
   void Show();
   void DestroyRenderer();
 
-  bool SetupDisplay(int32_t& width, int32_t& height);
+  bool SetupDisplay(int32_t* width, int32_t* height);
   bool SetupEcoreWlWindow(int32_t width, int32_t height);
   bool SetupEglWindow(int32_t width, int32_t height);
   EGLDisplay GetEGLDisplay();