fix(desktop): set initial and minimum window sizes

JagandeepBrar · Mar 26, 2022 · dd30c3a · dd30c3a
1 parent 12fab1d
commit dd30c3a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/lib/core/system/window_manager/platform/window_manager_io.dart b/lib/core/system/window_manager/platform/window_manager_io.dart
@@ -22,12 +22,7 @@ class IO implements LunaWindowManager {
   Future<void> initialize() async {
     await windowManager.ensureInitialized();
     windowManager.waitUntilReadyToShow().then((_) async {
-      const Size minSize = Size(
-        LunaWindowManager.MINIMUM_WINDOW_SIZE,
-        LunaWindowManager.MINIMUM_WINDOW_SIZE,
-      );
-
-      await windowManager.setMinimumSize(minSize);
+      setWindowSize();
       setWindowTitle('LunaSea');
 
       windowManager.show();
@@ -40,4 +35,17 @@ class IO implements LunaWindowManager {
         .waitUntilReadyToShow()
         .then((_) async => await windowManager.setTitle(title));
   }
+
+  Future<void> setWindowSize() async {
+    const min = LunaWindowManager.MINIMUM_WINDOW_SIZE;
+    const init = LunaWindowManager.INITIAL_WINDOW_SIZE;
+    const minSize = Size(min, min);
+    const initSize = Size(init, init);
+
+    await windowManager.setSize(initSize);
+    // Currently broken on Linux
+    if (!LunaPlatform().isLinux) {
+      await windowManager.setMinimumSize(minSize);
+    }
+  }
 }
diff --git a/lib/core/system/window_manager/window_manager.dart b/lib/core/system/window_manager/window_manager.dart
@@ -3,7 +3,9 @@ import 'platform/window_manager_stub.dart'
     if (dart.library.html) 'platform/window_manager_html.dart';
 
 abstract class LunaWindowManager {
-  static const double MINIMUM_WINDOW_SIZE = 400;
+  // Need to change `windows/runner/main.cpp` and `linux/my_application.cc` manually if this wants to be changed
+  static const double INITIAL_WINDOW_SIZE = 700;
+  static const double MINIMUM_WINDOW_SIZE = 500;
 
   static bool get isSupported => isPlatformSupported();
   factory LunaWindowManager() => getWindowManager();

diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp
@@ -26,7 +26,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
 
   FlutterWindow window(project);
   Win32Window::Point origin(10, 10);
-  Win32Window::Size size(1280, 720);
+  Win32Window::Size size(700, 700);
   if (!window.CreateAndShow(L"lunasea", origin, size)) {
     return EXIT_FAILURE;
   }