From 5b3b7ecd23b71bb7efa9d1d8ee550ca5d219a93b Mon Sep 17 00:00:00 2001 From: Gold87 <91761103+Gold872@users.noreply.github.com> Date: Mon, 3 Feb 2025 09:28:54 -0500 Subject: [PATCH 1/2] Don't use pixel ratio for DS resize --- lib/pages/dashboard_page.dart | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/pages/dashboard_page.dart b/lib/pages/dashboard_page.dart index 755f60a7..20db8c1c 100644 --- a/lib/pages/dashboard_page.dart +++ b/lib/pages/dashboard_page.dart @@ -1577,7 +1577,7 @@ class _DashboardPageState extends State with WindowListener { }, onResizeToDSChanged: (value) async { setState(() { - if (value && widget.ntConnection.dsClient.driverStationDocked) { + if (value && true) { _onDriverStationDocked(); } else { _onDriverStationUndocked(); @@ -1712,15 +1712,11 @@ class _DashboardPageState extends State with WindowListener { void _onDriverStationDocked() async { Display primaryDisplay = await screenRetriever.getPrimaryDisplay(); - double pixelRatio = primaryDisplay.scaleFactor?.toDouble() ?? 1.0; - Size screenSize = - (primaryDisplay.visibleSize ?? primaryDisplay.size) * pixelRatio; + Size screenSize = primaryDisplay.visibleSize ?? primaryDisplay.size; await windowManager.unmaximize(); - Size newScreenSize = - Size(screenSize.width, (screenSize.height) - (200 * pixelRatio)) / - pixelRatio; + Size newScreenSize = Size(screenSize.width, screenSize.height - 200); await windowManager.setSize(newScreenSize); @@ -1739,8 +1735,10 @@ class _DashboardPageState extends State with WindowListener { await windowManager.setResizable(true); // Re-adds the window frame, window manager's API for this is weird - await windowManager.setTitleBarStyle(TitleBarStyle.hidden, - windowButtonVisibility: false); + await windowManager.setTitleBarStyle( + TitleBarStyle.hidden, + windowButtonVisibility: false, + ); } void _showWindowCloseConfirmation(BuildContext context) { From 13120a9be45272907a85367be170b7eeb806d475 Mon Sep 17 00:00:00 2001 From: Gold87 <91761103+Gold872@users.noreply.github.com> Date: Mon, 3 Feb 2025 09:31:31 -0500 Subject: [PATCH 2/2] Only resize when docked --- lib/pages/dashboard_page.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pages/dashboard_page.dart b/lib/pages/dashboard_page.dart index 20db8c1c..abb77f1f 100644 --- a/lib/pages/dashboard_page.dart +++ b/lib/pages/dashboard_page.dart @@ -1577,7 +1577,7 @@ class _DashboardPageState extends State with WindowListener { }, onResizeToDSChanged: (value) async { setState(() { - if (value && true) { + if (value && widget.ntConnection.dsClient.driverStationDocked) { _onDriverStationDocked(); } else { _onDriverStationUndocked();