mirror of
https://github.com/Mahdi-zarei/nekoray.git
synced 2025-12-21 07:10:06 +08:00
fix tray menu on linux/mac
This commit is contained in:
parent
3a6f43499e
commit
0284dc974e
@ -311,9 +311,13 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
|
|||||||
trayMenu->addAction(ui->actionRestart_Program);
|
trayMenu->addAction(ui->actionRestart_Program);
|
||||||
trayMenu->addAction(ui->menu_exit);
|
trayMenu->addAction(ui->menu_exit);
|
||||||
tray->show();
|
tray->show();
|
||||||
|
#ifndef Q_OS_WIN
|
||||||
|
tray->setContextMenu(trayMenu);
|
||||||
|
#else
|
||||||
// popup once so that its height is calculated
|
// popup once so that its height is calculated
|
||||||
trayMenu->popup(QCursor::pos());
|
trayMenu->popup(QCursor::pos());
|
||||||
trayMenu->hide();
|
trayMenu->hide();
|
||||||
|
#endif
|
||||||
connect(tray, &QSystemTrayIcon::activated, qApp, [=](QSystemTrayIcon::ActivationReason reason) {
|
connect(tray, &QSystemTrayIcon::activated, qApp, [=](QSystemTrayIcon::ActivationReason reason) {
|
||||||
if (reason == QSystemTrayIcon::Context)
|
if (reason == QSystemTrayIcon::Context)
|
||||||
{
|
{
|
||||||
@ -321,8 +325,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
|
|||||||
int mh = trayMenu->geometry().height();
|
int mh = trayMenu->geometry().height();
|
||||||
auto cPos = QCursor::pos();
|
auto cPos = QCursor::pos();
|
||||||
trayMenu->popup({cPos.x(), cPos.y()-mh});
|
trayMenu->popup({cPos.x(), cPos.y()-mh});
|
||||||
#else
|
|
||||||
trayMenu->popup(QCursor::pos());
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
if (reason == QSystemTrayIcon::Trigger) {
|
if (reason == QSystemTrayIcon::Trigger) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user