mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-02 14:37:42 -03:00
Merge bitcoin/bitcoin#26522: [23.x] GUI backports
e54a4deff8
Fixes bitcoin#26490 by preventing notifications (John Moffett) Pull request description: Backports: - bitcoin-core/gui#680 ACKs for top commit: jarolrod: ACKe54a4deff8
Tree-SHA512: b81c73ece3f3c1e1d1c81bd0bb5b80a47488bca1fa43bbed25bab859cd063cd9b3acc1cff76f07961c3bd01276fab2fad8ea10b9d06e18965a198e78ff1f6705
This commit is contained in:
commit
d14dc8e2c6
1 changed files with 2 additions and 2 deletions
|
@ -476,7 +476,7 @@ void BitcoinGUI::createMenuBar()
|
|||
connect(minimize_action, &QAction::triggered, [] {
|
||||
QApplication::activeWindow()->showMinimized();
|
||||
});
|
||||
connect(qApp, &QApplication::focusWindowChanged, [minimize_action] (QWindow* window) {
|
||||
connect(qApp, &QApplication::focusWindowChanged, this, [minimize_action] (QWindow* window) {
|
||||
minimize_action->setEnabled(window != nullptr && (window->flags() & Qt::Dialog) != Qt::Dialog && window->windowState() != Qt::WindowMinimized);
|
||||
});
|
||||
|
||||
|
@ -491,7 +491,7 @@ void BitcoinGUI::createMenuBar()
|
|||
}
|
||||
});
|
||||
|
||||
connect(qApp, &QApplication::focusWindowChanged, [zoom_action] (QWindow* window) {
|
||||
connect(qApp, &QApplication::focusWindowChanged, this, [zoom_action] (QWindow* window) {
|
||||
zoom_action->setEnabled(window != nullptr);
|
||||
});
|
||||
#endif
|
||||
|
|
Loading…
Add table
Reference in a new issue