Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(fix) menubar: don't show 'hide' dialog when switching skins #14254

Merged
merged 1 commit into from
Jan 28, 2025
Merged

(fix) menubar: don't show 'hide' dialog when switching skins #14254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/mixxxmainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ MixxxMainWindow::MixxxMainWindow(std::shared_ptr<mixxx::CoreServices> pCoreServi
#ifdef __LINUX__
m_supportsGlobalMenuBar(supportsGlobalMenu()),
#endif
m_inRebootMixxxView(false),
m_pDeveloperToolsDlg(nullptr),
m_pPrefDlg(nullptr),
m_toolTipsCfg(mixxx::preferences::Tooltips::On) {
Expand Down Expand Up @@ -1159,6 +1160,7 @@ void MixxxMainWindow::slotTooltipModeChanged(mixxx::preferences::Tooltips tt) {

void MixxxMainWindow::rebootMixxxView() {
qDebug() << "Now in rebootMixxxView...";
m_inRebootMixxxView = true;

ScopedWaitCursor cursor;
// safe geometry for later restoration
Expand Down Expand Up @@ -1192,6 +1194,7 @@ void MixxxMainWindow::rebootMixxxView() {
QMessageBox::critical(this,
tr("Error in skin file"),
tr("The selected skin cannot be loaded."));
m_inRebootMixxxView = false;
// m_pWidgetParent is NULL, we can't continue.
return;
}
Expand Down Expand Up @@ -1220,6 +1223,7 @@ void MixxxMainWindow::rebootMixxxView() {
setGeometry(initGeometry);
}

m_inRebootMixxxView = false;
qDebug() << "rebootMixxxView DONE";
}

Expand Down Expand Up @@ -1310,7 +1314,9 @@ bool MixxxMainWindow::eventFilter(QObject* obj, QEvent* event) {
if (!m_supportsGlobalMenuBar || isFullScreenNow)
#endif
{
alwaysHideMenuBarDlg();
if (!m_inRebootMixxxView) {
alwaysHideMenuBarDlg();
}
slotUpdateMenuBarAltKeyConnection();
}
#endif
Expand Down
1 change: 1 addition & 0 deletions src/mixxxmainwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ class MixxxMainWindow : public QMainWindow {
#ifdef __LINUX__
const bool m_supportsGlobalMenuBar;
#endif
bool m_inRebootMixxxView;

DlgDeveloperTools* m_pDeveloperToolsDlg;

Expand Down
Loading