Skip to content

Commit ec1201a

Browse files
committed
Don't use systray icon on inappropriate systems
Prevent a user from losing access to the main window by minimizing it to the tray on some systems (e.g. GNOME 3.26+).
1 parent d799efe commit ec1201a

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

src/qt/bitcoingui.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
131131
createToolBars();
132132

133133
// Create system tray icon and notification
134-
createTrayIcon(networkStyle);
134+
if (QSystemTrayIcon::isSystemTrayAvailable()) {
135+
createTrayIcon(networkStyle);
136+
}
135137

136138
// Create status bar
137139
statusBar();
@@ -585,6 +587,8 @@ void BitcoinGUI::setWalletActionsEnabled(bool enabled)
585587

586588
void BitcoinGUI::createTrayIcon(const NetworkStyle *networkStyle)
587589
{
590+
assert(QSystemTrayIcon::isSystemTrayAvailable());
591+
588592
#ifndef Q_OS_MAC
589593
trayIcon = new QSystemTrayIcon(this);
590594
QString toolTip = tr("%1 client").arg(tr(PACKAGE_NAME)) + " " + networkStyle->getTitleAddText();

src/qt/optionsdialog.cpp

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <QIntValidator>
2424
#include <QLocale>
2525
#include <QMessageBox>
26+
#include <QSystemTrayIcon>
2627
#include <QTimer>
2728

2829
OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
@@ -126,6 +127,13 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
126127
connect(ui->proxyIpTor, &QValidatedLineEdit::validationDidChange, this, &OptionsDialog::updateProxyValidationState);
127128
connect(ui->proxyPort, &QLineEdit::textChanged, this, &OptionsDialog::updateProxyValidationState);
128129
connect(ui->proxyPortTor, &QLineEdit::textChanged, this, &OptionsDialog::updateProxyValidationState);
130+
131+
if (!QSystemTrayIcon::isSystemTrayAvailable()) {
132+
ui->hideTrayIcon->setChecked(true);
133+
ui->hideTrayIcon->setEnabled(false);
134+
ui->minimizeToTray->setChecked(false);
135+
ui->minimizeToTray->setEnabled(false);
136+
}
129137
}
130138

131139
OptionsDialog::~OptionsDialog()
@@ -211,8 +219,10 @@ void OptionsDialog::setMapper()
211219

212220
/* Window */
213221
#ifndef Q_OS_MAC
214-
mapper->addMapping(ui->hideTrayIcon, OptionsModel::HideTrayIcon);
215-
mapper->addMapping(ui->minimizeToTray, OptionsModel::MinimizeToTray);
222+
if (QSystemTrayIcon::isSystemTrayAvailable()) {
223+
mapper->addMapping(ui->hideTrayIcon, OptionsModel::HideTrayIcon);
224+
mapper->addMapping(ui->minimizeToTray, OptionsModel::MinimizeToTray);
225+
}
216226
mapper->addMapping(ui->minimizeOnClose, OptionsModel::MinimizeOnClose);
217227
#endif
218228

0 commit comments

Comments
 (0)