mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-24 21:42:51 -05:00
Merge branch 'master' of github.com:bbedward/DankMaterialShell
This commit is contained in:
@@ -277,7 +277,11 @@ Item {
|
||||
|
||||
anchors.centerIn: parent
|
||||
implicitSize: 40
|
||||
source: Quickshell.iconPath(DesktopEntries.byId(Paths.moddedAppId(appData.appId)).icon, true)
|
||||
source: {
|
||||
if (appData.appId === "__SEPARATOR__") return ""
|
||||
var desktopEntry = DesktopEntries.byId(Paths.moddedAppId(appData.appId))
|
||||
return desktopEntry && desktopEntry.icon ? Quickshell.iconPath(desktopEntry.icon, true) : ""
|
||||
}
|
||||
mipmap: true
|
||||
smooth: true
|
||||
asynchronous: true
|
||||
|
||||
@@ -95,12 +95,13 @@ Item {
|
||||
title = title.substring(0, 47) + "..."
|
||||
}
|
||||
var uniqueId = toplevel.title + "|" + (toplevel.appId || "") + "|" + index
|
||||
|
||||
items.push({
|
||||
"type": "window",
|
||||
"appId": toplevel.appId || "",
|
||||
"appId": toplevel.appId,
|
||||
"windowId": index,
|
||||
"windowTitle": title,
|
||||
"workspaceId": -1, // Will be handled by sorting
|
||||
"workspaceId": -1,
|
||||
"isPinned": false,
|
||||
"isRunning": true,
|
||||
"uniqueId": uniqueId
|
||||
|
||||
@@ -252,8 +252,14 @@ Rectangle {
|
||||
anchors.centerIn: parent
|
||||
text: {
|
||||
if (CompositorService.isHyprland) {
|
||||
if (modelData && modelData.id === -1) {
|
||||
return index + 1
|
||||
}
|
||||
return modelData && modelData.id ? modelData.id : ""
|
||||
}
|
||||
if (modelData === -1) {
|
||||
return index + 1
|
||||
}
|
||||
return modelData - 1
|
||||
}
|
||||
color: isActive ? Qt.rgba(
|
||||
|
||||
Reference in New Issue
Block a user