Skip to content

fix(tray): change the order in which the identifier for blacklist and pinned items is taken #2501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lombervid wants to merge 2 commits into
base: main
Choose a base branch
from
+27 −10
Open

fix(tray): change the order in which the identifier for blacklist and pinned items is taken #2501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
134b9ac
fix(tray): change the order in which the identifier for `blacklist` a…
lombervid Apr 19, 2026
0912933
feat(tray): add regex comparison for pinned items in tray menu
lombervid Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions Modules/Bar/Extras/TrayMenu.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,23 @@ PopupWindow {
// Derive menu from trayItem (only used for non-submenus)
readonly property QsMenuHandle menu: isSubMenu ? null : (trayItem ? trayItem.menu : null)

// Helper functions
function wildCardMatch(str, rule) {
if (!str || !rule)
return false;
if (str === rule)
return true;
const placeholder = '\uE000';
let processedRule = rule.replace(/\*/g, placeholder);
let escaped = processedRule.replace(/[.+?^${}()|[\]\\]/g, '\\$&');
let pattern = '^' + escaped.replace(new RegExp(placeholder, 'g'), '.*') + '$';
try {
return new RegExp(pattern, 'i').test(str);
} catch (e) {
return false;
}
}

// Compute if current tray item is pinned
readonly property bool isPinned: {
if (!trayItem || widgetSection === "" || widgetIndex < 0)
Expand All @@ -33,9 +50,9 @@ PopupWindow {
if (!widgetSettings || widgetSettings.id !== "Tray")
return false;
var pinnedList = widgetSettings.pinned || [];
const itemName = trayItem.tooltipTitle || trayItem.name || trayItem.id || "";
const itemName = trayItem.id || trayItem.title || trayItem.tooltipTitle || "";
for (var i = 0; i < pinnedList.length; i++) {
if (pinnedList[i] === itemName)
if (wildCardMatch(itemName, pinnedList[i]))
return true;
}
return false;
Expand Down Expand Up @@ -552,7 +569,7 @@ PopupWindow {
Logger.w("TrayMenu", "Cannot pin: missing tray item or widget info");
return;
}
const itemName = trayItem.tooltipTitle || trayItem.name || trayItem.id || "";
const itemName = trayItem.id || trayItem.title || trayItem.tooltipTitle || "";
if (!itemName) {
Logger.w("TrayMenu", "Cannot pin: tray item has no name");
return;
Expand Down Expand Up @@ -598,7 +615,7 @@ PopupWindow {
Logger.w("TrayMenu", "Cannot unpin: missing tray item or widget info");
return;
}
const itemName = trayItem.tooltipTitle || trayItem.name || trayItem.id || "";
const itemName = trayItem.id || trayItem.title || trayItem.tooltipTitle || "";
if (!itemName) {
Logger.w("TrayMenu", "Cannot unpin: tray item has no name");
return;
Expand All @@ -617,7 +634,7 @@ PopupWindow {
var pinnedList = widgetSettings.pinned || [];
var newPinned = [];
for (var i = 0; i < pinnedList.length; i++) {
if (pinnedList[i] !== itemName) {
if (!wildCardMatch(itemName, pinnedList[i])) {
newPinned.push(pinnedList[i]);
}
}
Expand Down
6 changes: 3 additions & 3 deletions Modules/Bar/Widgets/Tray.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Item {
continue;
}

const title = item.tooltipTitle || item.name || item.id || "";
const title = item.id || item.title || item.tooltipTitle || "";

// Skip passive items if hidePassive is enabled
if (root.hidePassive && item.status !== undefined && (item.status === SystemTray.Passive || item.status === 0)) {
Expand Down Expand Up @@ -179,7 +179,7 @@ Item {
let pinnedItems = [];
for (var k = 0; k < newItems.length; k++) {
const item2 = newItems[k];
const title2 = item2.tooltipTitle || item2.name || item2.id || "";
const title2 = item2.id || item2.title || item2.tooltipTitle || "";
for (var m = 0; m < pinned.length; m++) {
const rule2 = pinned[m];
if (wildCardMatch(title2, rule2)) {
Expand Down Expand Up @@ -470,7 +470,7 @@ Item {
popupMenuWindow.close();
}
root.hoveredItemIndex = trayDelegate.index;
TooltipService.show(tooltipAnchor, modelData.tooltipTitle || modelData.name || modelData.id || "Tray Item", BarService.getTooltipDirection(root.screen?.name));
TooltipService.show(tooltipAnchor, modelData.tooltipTitle || modelData.title || modelData.id || "Tray Item", BarService.getTooltipDirection(root.screen?.name));
} else if (root.hoveredItemIndex === trayDelegate.index) {
root.hoveredItemIndex = -1;
TooltipService.hide(tooltipAnchor);
Expand Down
4 changes: 2 additions & 2 deletions Modules/Panels/Tray/TrayDrawerPanel.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ SmartPanel {
function isPinned(item) {
if (!pinnedList || pinnedList.length === 0)
return false;
const title = item?.tooltipTitle || item?.name || item?.id || "";
const title = item?.id || item?.title || item?.tooltipTitle || "";
for (var i = 0; i < pinnedList.length; i++) {
if (wildCardMatch(title, pinnedList[i]))
return true;
Expand Down Expand Up @@ -277,7 +277,7 @@ SmartPanel {
if (panelContent.popupMenuWindow) {
panelContent.popupMenuWindow.close();
}
TooltipService.show(trayIcon, modelData.tooltipTitle || modelData.name || modelData.id || "Tray Item", BarService.getTooltipDirection(root.screen?.name));
TooltipService.show(trayIcon, modelData.tooltipTitle || modelData.title || modelData.id || "Tray Item", BarService.getTooltipDirection(root.screen?.name));
}
onExited: TooltipService.hide()
}
Expand Down