Skip to content
Merged
Changes from all commits
Commits
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
40 changes: 21 additions & 19 deletions quickshell/Modules/Dock/DockAppButton.qml
Original file line number Diff line number Diff line change
Expand Up @@ -186,28 +186,28 @@ Item {
return true;
}

function cycleGroupedToplevels() {
const toplevels = getGroupedToplevels();
if (toplevels.length === 0)
return;

let currentIndex = -1;
function getActiveGroupedToplevelIndex(toplevels) {
for (let i = 0; i < toplevels.length; i++) {
if (toplevels[i].activated) {
currentIndex = i;
break;
}
if (toplevels[i].activated)
return i;
}

if (currentIndex < 0 && CompositorService.isNiri && NiriService.inOverview && NiriService.lastFocusedWindowId !== null) {
if (CompositorService.isNiri && NiriService.inOverview && NiriService.lastFocusedWindowId !== null) {
for (let i = 0; i < toplevels.length; i++) {
if (toplevels[i].niriWindowId === NiriService.lastFocusedWindowId) {
currentIndex = i;
break;
}
if (toplevels[i].niriWindowId === NiriService.lastFocusedWindowId)
return i;
}
}

return -1;
}

function cycleGroupedToplevels() {
const toplevels = getGroupedToplevels();
if (toplevels.length === 0)
return;

const currentIndex = getActiveGroupedToplevelIndex(toplevels);
const nextToplevel = toplevels[(currentIndex + 1) % toplevels.length];
if (restoreSpecialWorkspaceWindow(nextToplevel))
return;
Expand Down Expand Up @@ -434,10 +434,12 @@ Item {
appData.toplevel?.close();
break;
case "grouped":
if (contextMenu) {
const shouldHidePin = appData.appId === "org.quickshell" || appData.appId === "com.danklinux.dms";
contextMenu.showForButton(root, appData, root.height, shouldHidePin, cachedDesktopEntry, parentDockScreen, dockApps);
}
const groupedToplevels = getGroupedToplevels();
if (groupedToplevels.length === 0)
return;
const activeIndex = getActiveGroupedToplevelIndex(groupedToplevels);
const groupedToplevelToClose = groupedToplevels[activeIndex >= 0 ? activeIndex : 0];
groupedToplevelToClose?.close();
break;
default:
if (!appData.appId)
Expand Down
Loading