mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-18 01:47:29 +01:00
Merge bitcoin/bitcoin#26523: [24.x] GUI backports
39af5f2164Fixes bitcoin#26490 by preventing notifications (John Moffett) Pull request description: Backports: - bitcoin-core/gui#680 ACKs for top commit: jarolrod: ACK39af5f2164Tree-SHA512: 1c84703395cc750611922aa2c59dc2e2f2e98c92845859f9f57e30ee5371c9a31690318230ab514f2d9b71e75a716a30280aa1e585b6da31e45fd970017bc74e
This commit is contained in:
@@ -512,7 +512,7 @@ void BitcoinGUI::createMenuBar()
|
|||||||
connect(minimize_action, &QAction::triggered, [] {
|
connect(minimize_action, &QAction::triggered, [] {
|
||||||
QApplication::activeWindow()->showMinimized();
|
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);
|
minimize_action->setEnabled(window != nullptr && (window->flags() & Qt::Dialog) != Qt::Dialog && window->windowState() != Qt::WindowMinimized);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -527,7 +527,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);
|
zoom_action->setEnabled(window != nullptr);
|
||||||
});
|
});
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user