From 7c02548285fa53ef484632352b4b626e507905e0 Mon Sep 17 00:00:00 2001 From: Hydrus Network Developer Date: Wed, 28 Feb 2024 16:45:00 -0600 Subject: [PATCH] macOS Menubar fix This hopefully fixes the un-anchored macOS MenuBar --- hydrus/client/gui/ClientGUI.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/hydrus/client/gui/ClientGUI.py b/hydrus/client/gui/ClientGUI.py index 90e41e69..622cb981 100644 --- a/hydrus/client/gui/ClientGUI.py +++ b/hydrus/client/gui/ClientGUI.py @@ -2268,15 +2268,24 @@ class FrameGUI( CAC.ApplicationCommandProcessorMixin, ClientGUITopLevelWindows.M def _InitialiseMenubar( self ): - self._menubar = QW.QMenuBar() - use_native_menubar = CG.client_controller.new_options.GetBoolean( 'use_native_menubar' ) - self._menubar.setNativeMenuBar( use_native_menubar ) - - if not self._menubar.isNativeMenuBar(): + if use_native_menubar: - self._menubar.setParent( self ) + self._menubar = QW.QMenuBar() + + self._menubar.setNativeMenuBar( True ) + + if not self._menubar.isNativeMenuBar(): + + self._menubar.setParent( self ) + + + else: + + self._menubar = QW.QMenuBar( self ) + + self._menubar.setNativeMenuBar( False ) self._menu_updater_file = self._InitialiseMenubarGetMenuUpdaterFile()