fix: mulit window bugs on windows

RPMTW · Apr 16, 2022 · a405e53 · a405e53
1 parent 33a9916
commit a405e53
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/lib/Screen/LauncherHome.dart b/lib/Screen/LauncherHome.dart
@@ -95,7 +95,7 @@ class _LauncherHomeState extends State<LauncherHome> {
                         navigator.pop();
                       }
                     }
-                    return null;
+                    return;
                   }),
                   RestartIntent: CallbackAction<RestartIntent>(
                       onInvoke: (RestartIntent intent) {
@@ -109,18 +109,22 @@ class _LauncherHomeState extends State<LauncherHome> {
                                 actions: const [OkClose()],
                               ));
                     });
-                    return null;
+                    return;
                   }),
                   FeedBackIntent: CallbackAction<FeedBackIntent>(
                       onInvoke: (FeedBackIntent intent) {
                     LauncherInfo.feedback(context);
-                    return null;
+                    return;
                   }),
                   FullScreenIntent: CallbackAction<FullScreenIntent>(
                       onInvoke: (FullScreenIntent intent) async {
+                    if (LauncherInfo.multiWindow && Platform.isWindows) {
+                      return;
+                    }
+
                     bool isFullScreen = await windowManager.isFullScreen();
                     await windowManager.setFullScreen(!isFullScreen);
-                    return null;
+                    return;
                   }),
                 },
                 builder: (BuildContext context, Widget? widget) {

diff --git a/lib/Utility/Data.dart b/lib/Utility/Data.dart
@@ -16,6 +16,8 @@ import 'package:rpmlauncher/Utility/LauncherInfo.dart';
 import 'package:rpmlauncher/Utility/Logger.dart';
 import 'package:rpmlauncher/Utility/RPMPath.dart';
 import 'package:rpmtw_dart_common_library/rpmtw_dart_common_library.dart';
+import 'package:window_manager/window_manager.dart';
+import 'package:window_size/window_size.dart';
 
 late bool isInit;
 late Analytics googleAnalytics;
@@ -38,8 +40,16 @@ class Data {
     argsInit();
     await RPMPath.init();
     await I18n.init();
+    if (!kTestMode) {
+      setWindowMinSize(const Size(960.0, 640.0));
+      setWindowMaxSize(Size.infinite);
+    }
 
     if (!LauncherInfo.multiWindow) {
+      if (!(LauncherInfo.multiWindow && Platform.isWindows)) {
+        await windowManager.ensureInitialized();
+      }
+
       DiscordRPC discordRPC = DiscordRPC(
           applicationId: 903883530822627370,
           libTempPath: Directory(join(dataHome.path, 'discord-rpc-library')));

diff --git a/lib/main.dart b/lib/main.dart
@@ -9,7 +9,6 @@ import 'package:system_info/system_info.dart';
 import 'package:rpmlauncher/Model/Account/Account.dart';
 import 'package:rpmlauncher_plugin/rpmlauncher_plugin.dart';
 import 'package:window_manager/window_manager.dart';
-import 'package:window_size/window_size.dart';
 
 import 'Utility/Config.dart';
 import 'Utility/Data.dart';
@@ -29,11 +28,6 @@ Future<void> run() async {
     LauncherInfo.startTime = DateTime.now();
     LauncherInfo.isDebugMode = kDebugMode;
     WidgetsFlutterBinding.ensureInitialized();
-    await windowManager.ensureInitialized();
-    if (!kTestMode) {
-      setWindowMinSize(const Size(960.0, 640.0));
-      setWindowMaxSize(Size.infinite);
-    }
     await Data.init();
     logger.info("Starting");
 
@@ -127,6 +121,10 @@ Future<void> run() async {
     logger.info("OS Version: ${await RPMLauncherPlugin.platformVersion}");
 
     if (LauncherInfo.autoFullScreen) {
+      if (LauncherInfo.multiWindow && Platform.isWindows) {
+        return;
+      }
+
       await windowManager.setFullScreen(true);
     }