hans/racket-webview-qt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

handle tray menu myself instead by tray icon

Browse Source
This commit is contained in:
Hans Dijkema
2026-04-30 13:42:57 +02:00
parent b53597396c
commit 85b5a29192
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rktwebview_qt.cpp
+11 -4
View File
@@ -583,6 +583,9 @@ void Rktwebview_qt::processCommand(Command *cmd)
} }
QMenu *menu = (has_menu) ? buildMenuFromJson(this, menu_json, tray_id) : nullptr; QMenu *menu = (has_menu) ? buildMenuFromJson(this, menu_json, tray_id) : nullptr;
_tray_menus[tray_id] = menu;
/*
if (menu == nullptr) { if (menu == nullptr) {
if (!has_menu) { if (!has_menu) {
INFO1("null menu, setting null menu on tray %d\n", tray_id); INFO1("null menu, setting null menu on tray %d\n", tray_id);
@@ -600,6 +603,7 @@ void Rktwebview_qt::processCommand(Command *cmd)
_tray_menus[tray_id] = menu; _tray_menus[tray_id] = menu;
_trays[tray_id]->setContextMenu(menu); _trays[tray_id]->setContextMenu(menu);
} }
*/
cmd->result = true; cmd->result = true;
cmd->done = true; cmd->done = true;
@@ -616,19 +620,22 @@ void Rktwebview_qt::processCommand(Command *cmd)
void Rktwebview_qt::handleTrayActivation(QSystemTrayIcon::ActivationReason reason) void Rktwebview_qt::handleTrayActivation(QSystemTrayIcon::ActivationReason reason)
{ {
QObject *obj = sender(); QObject *obj = sender();
int tray_wv = obj->property("tray-id").toInt();
QSystemTrayIcon *icn = qobject_cast<QSystemTrayIcon *>(obj); QSystemTrayIcon *icn = qobject_cast<QSystemTrayIcon *>(obj);
// If a context menu has been set, pop it up and leave. // If a context menu has been set, pop it up and leave.
/*if (reason == QSystemTrayIcon::ActivationReason::Context) { if (reason == QSystemTrayIcon::ActivationReason::Context) {
QMenu *mnu = icn->contextMenu(); QMenu *mnu = nullptr;
if (_tray_menus.contains(tray_wv)) {
mnu = _tray_menus[tray_wv];
}
if (mnu != nullptr) { if (mnu != nullptr) {
mnu->popup(QCursor::pos()); mnu->popup(QCursor::pos());
return; return;
} }
}*/ }
int tray_wv = obj->property("tray-id").toInt();
QString evt = "tray-activated"; QString evt = "tray-activated";
QString reason_str = activationReasonToString(reason); QString reason_str = activationReasonToString(reason);