From 082386a188374612dde16f6c2db2ed53833db356 Mon Sep 17 00:00:00 2001 From: Loren Eteval Date: Fri, 15 Sep 2023 00:34:49 +0800 Subject: [PATCH] Fix GOLDEN_RATIO Signed-off-by: Loren Eteval --- Furious/Utility/Constants.py | 2 +- Furious/Widget/AssetViewer.py | 2 +- Furious/Widget/ConnectingProgressBar.py | 4 ++-- Furious/Widget/EditConfiguration.py | 7 +++---- Furious/Widget/EditRouting.py | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Furious/Utility/Constants.py b/Furious/Utility/Constants.py index 19d678e..b2174bb 100644 --- a/Furious/Utility/Constants.py +++ b/Furious/Utility/Constants.py @@ -43,7 +43,7 @@ PLATFORM = platform.system() LOCAL_SERVER_NAME = '891ad49d-8996-43cb-820c-d9baf42a04de' -GOLDEN_RATIO = (math.sqrt(5) - 1) / 2 +GOLDEN_RATIO = (math.sqrt(5) + 1) / 2 SYSTEM_LANGUAGE = QtCore.QLocale().name()[:2].upper() diff --git a/Furious/Widget/AssetViewer.py b/Furious/Widget/AssetViewer.py index ff3100f..d6848c5 100644 --- a/Furious/Widget/AssetViewer.py +++ b/Furious/Widget/AssetViewer.py @@ -219,7 +219,7 @@ class AssetViewerWidget(SupportThemeChangedCallback, MainWindow): self.setWidthAndHeight() def setWidthAndHeight(self): - self.setGeometry(100, 100, 512 * GOLDEN_RATIO, 512) + self.setGeometry(100, 100, 360, 360 * GOLDEN_RATIO) moveToCenter(self) diff --git a/Furious/Widget/ConnectingProgressBar.py b/Furious/Widget/ConnectingProgressBar.py index e7992e4..dfb67d6 100644 --- a/Furious/Widget/ConnectingProgressBar.py +++ b/Furious/Widget/ConnectingProgressBar.py @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from Furious.Utility.Constants import APPLICATION_NAME, GOLDEN_RATIO, Color +from Furious.Utility.Constants import APPLICATION_NAME, Color from Furious.Utility.Utility import ( bootstrapIcon, StateContext, @@ -33,7 +33,7 @@ class ConnectingProgressBar(Translatable, SupportConnectedCallback, QWidget): self.setWindowTitle(_(APPLICATION_NAME)) self.setWindowIcon(bootstrapIcon('rocket-takeoff-window.svg')) - self.setFixedSize(280, int(100 * GOLDEN_RATIO)) + self.setFixedSize(280, 61) @QtCore.Slot() def updateProgressBar(): diff --git a/Furious/Widget/EditConfiguration.py b/Furious/Widget/EditConfiguration.py index 2d15cc4..0724fcc 100644 --- a/Furious/Widget/EditConfiguration.py +++ b/Furious/Widget/EditConfiguration.py @@ -41,7 +41,6 @@ from Furious.Utility.Constants import ( APPLICATION_REPO_OWNER_NAME, APPLICATION_REPO_NAME, PLATFORM, - GOLDEN_RATIO, Color, ) from Furious.Utility.Utility import ( @@ -1767,8 +1766,8 @@ class EditConfigurationWidget(MainWindow): self.splitter = QSplitter(QtCore.Qt.Orientation.Horizontal) self.splitter.addWidget(self.serverTab) self.splitter.addWidget(self.editorTab) - self.splitter.setStretchFactor(0, 1) - self.splitter.setStretchFactor(1, 1) + self.splitter.setStretchFactor(0, 8) + self.splitter.setStretchFactor(1, 5) self.fakeCentralWidget = QWidget() @@ -1877,7 +1876,7 @@ class EditConfigurationWidget(MainWindow): except Exception: # Any non-exit exceptions - self.setGeometry(100, 100, 1568, 1568 * GOLDEN_RATIO) + self.setGeometry(100, 100, 1800, 960) moveToCenter(self) diff --git a/Furious/Widget/EditRouting.py b/Furious/Widget/EditRouting.py index 28ffecc..a5f170f 100644 --- a/Furious/Widget/EditRouting.py +++ b/Furious/Widget/EditRouting.py @@ -1275,7 +1275,7 @@ class EditRoutingWidget(MainWindow): except Exception: # Any non-exit exceptions - self.setGeometry(100, 100, 640, 640 * GOLDEN_RATIO) + self.setGeometry(100, 100, 360 * GOLDEN_RATIO, 360) moveToCenter(self)