Merge pull request #37 from KizKizz/backend-rework

win10 blank fix
KizKizz · Oct 9, 2022 · 7cc3194 · 7cc3194
2 parents 990ff87 + faec95c
commit 7cc3194
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/app_version_check/app_version.json b/app_version_check/app_version.json
@@ -1,8 +1,8 @@
 {
     "name": "PSO2NGS Mod Manager",
-    "version": "1.4.9",
+    "version": "1.5.0",
     "description": [
-        "Minor fix for the app not running after upgrading Windows 11 to 22H2 version"
+        "Fixed blank white screen on Windows 10 (temporary)"
     ],
     "windows_file": "",
     "linux_file": ""

diff --git a/lib/home_page.dart b/lib/home_page.dart
@@ -95,7 +95,7 @@ class HomePage extends StatefulWidget {
 class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
   final MultiSplitViewController _viewsController = MultiSplitViewController(areas: [Area(weight: 0.285), Area(weight: 0.335)]);
   final MultiSplitViewController _viewsControllerNoPreview = MultiSplitViewController(areas: [Area(weight: 0.30), Area(weight: 0.5)]);
-  final MultiSplitViewController _verticalViewsController = MultiSplitViewController(areas: [Area(weight: 0.5)]);
+  final MultiSplitViewController _verticalViewsController = MultiSplitViewController(areas: [Area(weight: 0.4)]);
   String modsViewAppBarName = '';
   List<int> selectedIndex = List.generate(cateList.length, (index) => -1);
   List<int> searchListSelectedIndex = List.generate(cateListSearchResult.length, (index) => -1);

diff --git a/lib/main.dart b/lib/main.dart
@@ -65,7 +65,15 @@ Future<void> main() async {
   doWhenWindowReady(() {
     Size initialSize = Size(windowsWidth, windowsHeight);
     appWindow.minSize = const Size(1280, 500);
-    appWindow.size = initialSize;
+    //Temp fix for windows 10 white screen, remove when conflicts solved
+    if (Platform.isWindows) {
+      WidgetsBinding.instance.scheduleFrameCallback((timeStamp) {
+        appWindow.size = initialSize + const Offset(0, 1);
+      });
+    } else {
+      appWindow.size = initialSize;
+    }
+    //appWindow.size = initialSize;
     appWindow.alignment = Alignment.center;
     appWindow.title = 'PSO2NGS Mod Manager';
     appWindow.show();
@@ -628,4 +636,4 @@ class _MyHomePageState extends State<MyHomePage> with WindowListener {
       ),
     );
   }
-}
+}
diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc
@@ -63,13 +63,13 @@ IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
 #ifdef FLUTTER_BUILD_NUMBER
 #define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
 #else
-#define VERSION_AS_NUMBER 1,4,9
+#define VERSION_AS_NUMBER 1,5,0
 #endif
 
 #ifdef FLUTTER_BUILD_NAME
 #define VERSION_AS_STRING #FLUTTER_BUILD_NAME
 #else
-#define VERSION_AS_STRING "1.4.9"
+#define VERSION_AS_STRING "1.5.0"
 #endif
 
 VS_VERSION_INFO VERSIONINFO