Use native menubar on macOS, not elsewhere (i.e. Linux)

AllYarnsAreBeautiful · Aug 1, 2024 · 127a205 · 127a205
1 parent 2e4adef
commit 127a205
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/python/main/ayab/menu.py b/src/main/python/main/ayab/menu.py
@@ -19,6 +19,7 @@
 #    https://github.com/AllYarnsAreBeautiful/ayab-desktop
 
 from __future__ import annotations
+from PySide6.QtCore import QSysInfo
 from PySide6.QtWidgets import QMenuBar
 
 from .menu_gui import Ui_MenuBar
@@ -38,6 +39,11 @@ class Menu(QMenuBar):
 
     def __init__(self, parent: GuiMain):
         super().__init__(parent)
+
+        # Use native menubar on macOS, not elsewhere (i.e. Linux)
+        if QSysInfo.productType() != "macos":
+            self.setNativeMenuBar(False)
+
         self.ui = Ui_MenuBar()
         self.ui.setupUi(self)
         self.setup()

diff --git a/src/main/python/main/ayab/menu_gui.ui b/src/main/python/main/ayab/menu_gui.ui
@@ -2,9 +2,6 @@
 <ui version="4.0">
  <class>MenuBar</class>
  <widget class="QMenuBar" name="menubar">
-  <property name="nativeMenuBar">
-   <bool>False</bool>
-  </property>
   <widget class="QMenu" name="menu_file">
    <property name="title">
     <string>File</string>