From 205047cbf658ad5638290d1afe07bdac5b7d6990 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Fri, 7 May 2021 10:56:06 +0200 Subject: [PATCH 1/2] MixxxMainWindow: Hide menubar during startup Right now, the style of the menu bar changes during startup. This doesn't look nice. This commit simply hides the menubar during that period. --- src/mixxx.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mixxx.cpp b/src/mixxx.cpp index 18df8b4df43..90f41795bec 100644 --- a/src/mixxx.cpp +++ b/src/mixxx.cpp @@ -211,6 +211,7 @@ MixxxMainWindow::MixxxMainWindow(QApplication* pApp, const CmdlineArgs& args) m_pSettingsManager->settings(), pApp, args.getLocale()); createMenuBar(); + m_pMenuBar->hide(); initializeWindow(); @@ -686,6 +687,7 @@ void MixxxMainWindow::initialize(QApplication* pApp, const CmdlineArgs& args) { &PlayerInfo::currentPlayingDeckChanged, this, &MixxxMainWindow::slotChangedPlayingDeck); + m_pMenuBar->show(); // this has to be after the OpenGL widgets are created or depending on a // million different variables the first waveform may be horribly From 1d3dea1f7252576159d64af9dba2c1849c954e6f Mon Sep 17 00:00:00 2001 From: ronso0 Date: Fri, 7 May 2021 17:59:43 +0200 Subject: [PATCH 2/2] show menubar when skin is loaded --- src/mixxx.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mixxx.cpp b/src/mixxx.cpp index 90f41795bec..2d7beaddf38 100644 --- a/src/mixxx.cpp +++ b/src/mixxx.cpp @@ -581,6 +581,7 @@ void MixxxMainWindow::initialize(QApplication* pApp, const CmdlineArgs& args) { } emit skinLoaded(); + m_pMenuBar->show(); // Wait until all other ControlObjects are set up before initializing // controllers @@ -687,7 +688,6 @@ void MixxxMainWindow::initialize(QApplication* pApp, const CmdlineArgs& args) { &PlayerInfo::currentPlayingDeckChanged, this, &MixxxMainWindow::slotChangedPlayingDeck); - m_pMenuBar->show(); // this has to be after the OpenGL widgets are created or depending on a // million different variables the first waveform may be horribly