Account for taskbar size when resizing to DS

Gold872 · Jan 21, 2024 · 92c0b0b · 92c0b0b
1 parent 6b83eab
commit 92c0b0b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -78,8 +78,8 @@ void main() async {
   await FieldImages.loadFields('assets/fields/');
 
   Display primaryDisplay = await screenRetriever.getPrimaryDisplay();
-  Size screenSize =
-      primaryDisplay.size * (primaryDisplay.scaleFactor?.toDouble() ?? 1.0);
+  Size screenSize = (primaryDisplay.visibleSize ?? primaryDisplay.size) *
+      (primaryDisplay.scaleFactor?.toDouble() ?? 1.0);
 
   await windowManager.setMinimumSize(screenSize * 0.60);
   await windowManager.setTitleBarStyle(TitleBarStyle.hidden,

diff --git a/lib/pages/dashboard_page.dart b/lib/pages/dashboard_page.dart
@@ -933,7 +933,8 @@ class _DashboardPageState extends State<DashboardPage> with WindowListener {
   void _onDriverStationDocked() async {
     Display primaryDisplay = await screenRetriever.getPrimaryDisplay();
     double pixelRatio = primaryDisplay.scaleFactor?.toDouble() ?? 1.0;
-    Size screenSize = primaryDisplay.size * pixelRatio;
+    Size screenSize =
+        (primaryDisplay.visibleSize ?? primaryDisplay.size) * pixelRatio;
 
     await windowManager.unmaximize();