From e705cdfdd70b73421087668a2fad00fcd18c9664 Mon Sep 17 00:00:00 2001 From: Loren Eteval Date: Sat, 30 Sep 2023 20:43:28 +0800 Subject: [PATCH] Fix macOS bug Signed-off-by: Loren Eteval --- Furious/Widget/EditConfiguration.py | 16 +++++++++++----- Furious/Widget/Widget.py | 2 ++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Furious/Widget/EditConfiguration.py b/Furious/Widget/EditConfiguration.py index d5a0295..e8f1884 100644 --- a/Furious/Widget/EditConfiguration.py +++ b/Furious/Widget/EditConfiguration.py @@ -2322,8 +2322,12 @@ class ServerWidget(Translatable, SupportConnectedCallback, TableWidget): return if APP().tray.ConnectAction.isConnecting(): - # Show the MessageBox asynchronously - self.progressWaitBox.open() + if PLATFORM != 'Darwin': + # Show the MessageBox asynchronously + self.progressWaitBox.open() + else: + # Show the MessageBox and wait for user to close it + self.progressWaitBox.exec() return @@ -2454,9 +2458,6 @@ class EditConfigurationWidget(MainWindow): # Note: Set tab text later self.editorTab.addTab(self.serverEditorTabWidget, '') - if APP().HideEditor == Switch.ON_: - self.editorTab.hide() - self.serverWidget = ServerWidget(parent=self) # Buttons @@ -2499,6 +2500,11 @@ class EditConfigurationWidget(MainWindow): self.splitter.setStretchFactor(0, 8) self.splitter.setStretchFactor(1, 5) + if APP().HideEditor == Switch.ON_: + APP().processEvents() + + self.editorTab.hide() + self.fakeCentralWidget = QWidget() self.fakeCentralWidgetLayout = QHBoxLayout(self.fakeCentralWidget) diff --git a/Furious/Widget/Widget.py b/Furious/Widget/Widget.py index 0121ad5..dc8e5cb 100644 --- a/Furious/Widget/Widget.py +++ b/Furious/Widget/Widget.py @@ -175,6 +175,8 @@ class MainWindow(Translatable, SupportConnectedCallback, NeedSyncSettings, QMain super().show() if PLATFORM == 'Darwin': + APP().processEvents() + self.setWidthAndHeight() moveToCenter(self)