From 9caed10c238a12427f209ece12b51cf49c06a742 Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Mon, 10 Jul 2023 07:46:50 +0800
Subject: [PATCH] ui: cleanup setMainWindow (#28768)

* cleanup

* revert that

---------

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 289fd32699a2be0cac06a026d07ba1da2db38c6e
---
 selfdrive/ui/qt/qt_window.cc | 10 +++++-----
 selfdrive/ui/qt/qt_window.h  |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/selfdrive/ui/qt/qt_window.cc b/selfdrive/ui/qt/qt_window.cc
index b83db70671..f71cea04e9 100644
--- a/selfdrive/ui/qt/qt_window.cc
+++ b/selfdrive/ui/qt/qt_window.cc
@@ -1,15 +1,15 @@
 #include "selfdrive/ui/qt/qt_window.h"
 
 void setMainWindow(QWidget *w) {
+  const float scale = util::getenv("SCALE", 1.0f);
   const QSize sz = QGuiApplication::primaryScreen()->size();
-  if (Hardware::PC() && sz.width() <= 1920 && sz.height() <= 1080 && getenv("SCALE") == nullptr) {
+
+  if (Hardware::PC() && scale == 1.0 && !(sz - DEVICE_SCREEN_SIZE).isValid()) {
     w->setMinimumSize(QSize(640, 480)); // allow resize smaller than fullscreen
-    w->setMaximumSize(QSize(2160, 1080));
+    w->setMaximumSize(DEVICE_SCREEN_SIZE);
     w->resize(sz);
   } else {
-    const float scale = util::getenv("SCALE", 1.0f);
-    const bool wide = (sz.width() >= WIDE_WIDTH) ^ (getenv("INVERT_WIDTH") != NULL);
-    w->setFixedSize(QSize(wide ? WIDE_WIDTH : 1920, 1080) * scale);
+    w->setFixedSize(DEVICE_SCREEN_SIZE * scale);
   }
   w->show();
 
diff --git a/selfdrive/ui/qt/qt_window.h b/selfdrive/ui/qt/qt_window.h
index 02d127e7ff..6f16e00957 100644
--- a/selfdrive/ui/qt/qt_window.h
+++ b/selfdrive/ui/qt/qt_window.h
@@ -15,7 +15,6 @@
 #include "system/hardware/hw.h"
 
 const QString ASSET_PATH = ":/";
-
-const int WIDE_WIDTH = 2160;
+const QSize DEVICE_SCREEN_SIZE = {2160, 1080};
 
 void setMainWindow(QWidget *w);