dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix showing error dialog minimized when main window is not active

Browse Source 
Fixes #1739
This commit is contained in:
Jonas Kvinge
2025-09-07 15:46:26 +02:00
parent 5fac9a1c8d
commit 92c58b0b60
4 changed files with 53 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/core/mainwindow.cpp
View File

@@ -2,7 +2,7 @@
* Strawberry Music Player
* This file was part of Clementine.
* Copyright 2010, David Sansome <me@davidsansome.com>
* Copyright 2013-2021, Jonas Kvinge <jonas@jkvinge.net>
* Copyright 2013-2025, Jonas Kvinge <jonas@jkvinge.net>
*
* Strawberry is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -296,6 +296,9 @@ MainWindow::MainWindow(Application *app,
#ifdef HAVE_DISCORD_RPC
discord_rich_presence_(discord_rich_presence),
#endif
error_dialog_([this]() {
return new ErrorDialog(this);
}),
console_([app, this]() {
Console *console = new Console(app->database());
QObject::connect(console, &Console::Error, this, &MainWindow::ShowErrorDialog);
@@ -1684,17 +1687,6 @@ void MainWindow::StopAfterCurrent() {
Q_EMIT StopAfterToggled(app_->playlist_manager()->active()->stop_after_current());
}
void MainWindow::showEvent(QShowEvent *e) {
if (error_dialog_ && error_dialog_->isVisible() && error_dialog_->isMinimized()) {
error_dialog_->raise();
error_dialog_->activateWindow();
}
QMainWindow::showEvent(e);
}
void MainWindow::hideEvent(QHideEvent *e) {
// Some window managers don't remember maximized state between
@@ -1717,6 +1709,16 @@ void MainWindow::closeEvent(QCloseEvent *e) {
}
void MainWindow::changeEvent(QEvent *e) {
if (e->type() == QEvent::Show || e->type() == QEvent::WindowStateChange || e->type() == QEvent::WindowActivate) {
CheckShowErrorDialog();
}
QMainWindow::changeEvent(e);
}
void MainWindow::SetHiddenInTray(const bool hidden) {
if (hidden && isVisible()) {
@@ -1737,6 +1739,7 @@ void MainWindow::SetHiddenInTray(const bool hidden) {
else {
show();
}
CheckShowErrorDialog();
}
}
@@ -2990,6 +2993,14 @@ void MainWindow::ShowErrorDialog(const QString &message) {
error_dialog_->ShowMessage(message);
}
void MainWindow::CheckShowErrorDialog() {
if (isVisible() && !isMinimized() && error_dialog_ && error_dialog_->isVisible() && !error_dialog_->isActiveWindow()) {
error_dialog_->ShowDialog();
}
}
void MainWindow::CheckFullRescanRevisions() {
int from = app_->database()->startup_schema_version();

7
src/core/mainwindow.h
View File

@@ -2,7 +2,7 @@
* Strawberry Music Player
* This file was part of Clementine.
* Copyright 2010, David Sansome <me@davidsansome.com>
* Copyright 2013-2021, Jonas Kvinge <jonas@jkvinge.net>
* Copyright 2013-2025, Jonas Kvinge <jonas@jkvinge.net>
*
* Strawberry is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -124,9 +124,9 @@ class MainWindow : public QMainWindow, public PlatformInterface {
void CommandlineOptionsReceived(const CommandlineOptions &options);
protected:
void showEvent(QShowEvent *e) override;
void hideEvent(QHideEvent *e) override;
void closeEvent(QCloseEvent *e) override;
void changeEvent(QEvent *e) override;
void keyPressEvent(QKeyEvent *e) override;
#ifdef Q_OS_WIN32
bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
@@ -236,6 +236,7 @@ class MainWindow : public QMainWindow, public PlatformInterface {
void ShowAboutDialog();
void ShowErrorDialog(const QString &message);
void CheckShowErrorDialog();
void ShowTranscodeDialog();
SettingsDialog *CreateSettingsDialog();
EditTagDialog *CreateEditTagDialog();
@@ -315,6 +316,7 @@ class MainWindow : public QMainWindow, public PlatformInterface {
#ifdef HAVE_DISCORD_RPC
discord::RichPresence *discord_rich_presence_;
#endif
Lazy<ErrorDialog> error_dialog_;
Lazy<About> about_dialog_;
Lazy<Console> console_;
Lazy<EditTagDialog> edit_tag_dialog_;
@@ -329,7 +331,6 @@ class MainWindow : public QMainWindow, public PlatformInterface {
PlaylistListContainer *playlist_list_;
QueueView *queue_view_;
Lazy<ErrorDialog> error_dialog_;
Lazy<SettingsDialog> settings_dialog_;
Lazy<AlbumCoverManager> cover_manager_;
SharedPtr<Equalizer> equalizer_;