fullscreen: don't use native menubar in the first place

mixxxdj · Mar 2, 2023 · 1a4d335 · 1a4d335
1 parent e3bad53
commit 1a4d335
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -123,6 +123,10 @@ int main(int argc, char * argv[]) {
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif
 
+#ifndef __APPLE__
+    QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
+#endif
+
     // workaround for https://bugreports.qt.io/browse/QTBUG-84363
 #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) && QT_VERSION < QT_VERSION_CHECK(5, 15, 1)
     qputenv("QV4_FORCE_INTERPRETER", QByteArrayLiteral("1"));

diff --git a/src/mixxxmainwindow.cpp b/src/mixxxmainwindow.cpp
@@ -1144,10 +1144,10 @@ bool MixxxMainWindow::eventFilter(QObject* obj, QEvent* event) {
             } else {
                 qWarning() << "     $ WindowStateChange: leave fullscreen";
             }
-#ifdef __LINUX__
-            createMenuBar();
-            connectMenuBar();
-#endif
+            //#ifdef __LINUX__
+            //            createMenuBar();
+            //            connectMenuBar();
+            //#endif
             qWarning() << "     > emit fullScreenChanged(" << isFullScreen() << ")";
             qWarning() << "     .";
 

diff --git a/src/widget/wmainmenubar.cpp b/src/widget/wmainmenubar.cpp
@@ -699,11 +699,11 @@ void WMainMenuBar::onFullScreenStateChange(bool fullscreen) {
 #ifdef __LINUX__
         // Menu bar has been recreated and reconnected, which is a requirement
         // to setNativeMenuBar() without issues (reported on Ubuntu with Unity desktop)
-        if (isNativeMenuBar()) {
-            qWarning() << "     > is native, move to window";
-            // move the menu bar to the window
-            setNativeMenuBar(false);
-        }
+        //        if (isNativeMenuBar()) {
+        //            qWarning() << "     > is native, move to window";
+        //            // move the menu bar to the window
+        //            setNativeMenuBar(false);
+        //        }
 #endif
 
 #ifndef __APPLE__