lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

TaskBar: fixed desktop actions and other stuff

Browse Source
This commit is contained in:
Lemmy
2025-12-12 19:55:08 -05:00
parent 0d4f38f401
commit d06d58d7bb
2 changed files with 78 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Bar/Widgets/Taskbar.qml
+19 -49
View File
@@ -352,6 +352,11 @@ Rectangle {
return items;
}
onTriggered: (action, item) => {
var popupMenuWindow = PanelService.getPopupMenuWindow(screen);
if (popupMenuWindow) {
popupMenuWindow.close();
}
if (action === "focus" && selectedWindow) {
CompositorService.focusWindow(selectedWindow);
} else if (action === "pin" && selectedWindow) {
@@ -366,11 +371,6 @@ Rectangle {
}
selectedWindow = null;
selectedAppName = "";
// Close the popup menu window after handling the action
var popupMenuWindow = PanelService.getPopupMenuWindow(screen);
if (popupMenuWindow) {
popupMenuWindow.close();
}
}
}
@@ -562,9 +562,8 @@ Rectangle {
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
acceptedButtons: Qt.LeftButton | Qt.RightButton
preventStealing: true
onPressed: function (mouse) {
onClicked: function (mouse) {
if (!modelData)
return;
if (mouse.button === Qt.LeftButton) {
@@ -579,27 +578,13 @@ Rectangle {
// Pinned app not running - launch it
root.launchPinnedApp(modelData.appId);
}
}
}
onReleased: function (mouse) {
if (!modelData)
return;
if (mouse.button === Qt.RightButton) {
mouse.accepted = true;
} else if (mouse.button === Qt.RightButton) {
TooltipService.hide();
// Only show context menu for running apps
if (isRunning && modelData.window) {
root.selectedWindow = modelData.window;
root.selectedAppName = CompositorService.getCleanAppName(modelData.appId, modelData.title);
// Store position and size for timer callback
const globalPos = taskbarItem.mapToItem(root, 0, 0);
contextMenuOpenTimer.globalX = globalPos.x;
contextMenuOpenTimer.globalY = globalPos.y;
contextMenuOpenTimer.itemWidth = taskbarItem.width;
contextMenuOpenTimer.itemHeight = taskbarItem.height;
contextMenuOpenTimer.restart();
root.openTaskbarContextMenu(taskbarItem);
}
}
}
@@ -616,17 +601,8 @@ Rectangle {
}
}
Timer {
id: contextMenuOpenTimer
interval: 10
repeat: false
property real globalX: 0
property real globalY: 0
property real itemWidth: 0
property real itemHeight: 0
onTriggered: {
// Directly build and set model as a new array (bypass binding issues)
function openTaskbarContextMenu(item) {
// Build menu model directly
var items = [];
if (root.selectedWindow) {
// Focus item (for running apps)
@@ -635,10 +611,8 @@ Rectangle {
"action": "focus",
"icon": "eye"
});
}
// Pin/Unpin item (always available when right-clicking an app)
if (root.selectedWindow) {
// Pin/Unpin item
const appId = root.selectedWindow.appId;
const isPinned = root.isAppPinned(appId);
items.push({
@@ -646,10 +620,8 @@ Rectangle {
"action": "pin",
"icon": !isPinned ? "pin" : "unpin"
});
}
if (root.selectedWindow) {
// Close item (for running apps)
// Close item
items.push({
"label": I18n.tr("dock.menu.close"),
"action": "close",
@@ -657,8 +629,7 @@ Rectangle {
});
// Add desktop entry actions (like "New Window", "Private Window", etc.)
if (typeof DesktopEntries !== 'undefined' && DesktopEntries.byId && root.selectedWindow?.appId) {
const appId = root.selectedWindow.appId;
if (typeof DesktopEntries !== 'undefined' && DesktopEntries.byId && root.selectedWindow.appId) {
const entry = (DesktopEntries.heuristicLookup) ? DesktopEntries.heuristicLookup(appId) : DesktopEntries.byId(appId);
if (entry != null && entry.actions) {
entry.actions.forEach(function (action) {
@@ -686,26 +657,25 @@ Rectangle {
popupMenuWindow.open();
// Calculate menu position
const globalPos = item.mapToItem(root, 0, 0);
let menuX, menuY;
if (root.barPosition === "top") {
menuX = globalX + (itemWidth / 2) - (contextMenu.implicitWidth / 2);
menuX = globalPos.x + (item.width / 2) - (contextMenu.implicitWidth / 2);
menuY = Style.barHeight + Style.marginS;
} else if (root.barPosition === "bottom") {
const menuHeight = 12 + contextMenu.model.length * contextMenu.itemHeight;
menuX = globalX + (itemWidth / 2) - (contextMenu.implicitWidth / 2);
menuX = globalPos.x + (item.width / 2) - (contextMenu.implicitWidth / 2);
menuY = -menuHeight - Style.marginS;
} else if (root.barPosition === "left") {
menuX = Style.barHeight + Style.marginS;
menuY = globalY + (itemHeight / 2) - (contextMenu.implicitHeight / 2);
menuY = globalPos.y + (item.height / 2) - (contextMenu.implicitHeight / 2);
} else {
// right
menuX = -contextMenu.implicitWidth - Style.marginS;
menuY = globalY + (itemHeight / 2) - (contextMenu.implicitHeight / 2);
menuY = globalPos.y + (item.height / 2) - (contextMenu.implicitHeight / 2);
}
popupMenuWindow.showContextMenu(contextMenu);
contextMenu.openAtItem(root, menuX, menuY);
popupMenuWindow.contentItem = contextMenu;
}
}
}
}
Widgets/NPopupContextMenu.qml
+2 -2
View File
@@ -20,7 +20,7 @@ PopupWindow {
property real anchorY: 0
property real calculatedWidth: 180
signal triggered(string action)
signal triggered(string action, var item)
implicitWidth: calculatedWidth
implicitHeight: Math.min(600, flickable.contentHeight + (Style.marginS * 2))
@@ -197,7 +197,7 @@ PopupWindow {
onClicked: {
if (menuItem.modelData.enabled !== false) {
root.triggered(menuItem.modelData.action || menuItem.modelData.key || menuItem.index.toString());
root.triggered(menuItem.modelData.action || menuItem.modelData.key || menuItem.index.toString(), menuItem.modelData);
// Don't call root.close() here - let the parent PopupMenuWindow handle closing
}
}