Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-08 14:38:30 -04:00
Code Packages Releases Activity

fix(WorkspaceSwitcher): color handling w/animation transition

Browse Source 
- Fixes #2720
This commit is contained in:
purian23
2026-07-02 23:50:47 -04:00
parent d1eb655e46
commit 69d7c1fb13
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
+13 -2
View File
@@ -1283,6 +1283,13 @@ Item {
readonly property color quickshellIconActiveColor: getContrastingIconColor(activeColor) readonly property color quickshellIconActiveColor: getContrastingIconColor(activeColor)
readonly property color quickshellIconInactiveColor: getContrastingIconColor(unfocusedColor) readonly property color quickshellIconInactiveColor: getContrastingIconColor(unfocusedColor)
readonly property color requestedColor: isActive ? activeColor : isUrgent ? urgentColor : isPlaceholder ? Theme.surfaceTextLight : isHovered ? Theme.withAlpha(unfocusedColor, 0.7) : isOccupied ? occupiedColor : unfocusedColor
property color displayColor: requestedColor
property bool colorAnimationReady: false
onRequestedColorChanged: Qt.callLater(() => delegateRoot.displayColor = delegateRoot.requestedColor)
Item { Item {
id: dragHandler id: dragHandler
anchors.fill: parent anchors.fill: parent
@@ -1523,7 +1530,7 @@ Item {
x: root.isVertical ? (root.widgetHeight - width) / 2 : (parent.width - width) / 2 x: root.isVertical ? (root.widgetHeight - width) / 2 : (parent.width - width) / 2
y: root.isVertical ? (parent.height - height) / 2 : (root.widgetHeight - height) / 2 y: root.isVertical ? (parent.height - height) / 2 : (root.widgetHeight - height) / 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: isActive ? activeColor : isUrgent ? urgentColor : isPlaceholder ? Theme.surfaceTextLight : isHovered ? Theme.withAlpha(unfocusedColor, 0.7) : isOccupied ? occupiedColor : unfocusedColor color: delegateRoot.displayColor
opacity: dragHandler.dragging ? 0.8 : 1.0 opacity: dragHandler.dragging ? 0.8 : 1.0
border.width: dragHandler.dragging ? 2 : (isUrgent ? 2 : (isDropTarget ? 2 : 0)) border.width: dragHandler.dragging ? 2 : (isUrgent ? 2 : (isDropTarget ? 2 : 0))
@@ -1556,6 +1563,7 @@ Item {
} }
Behavior on color { Behavior on color {
enabled: delegateRoot.colorAnimationReady
ColorAnimation { ColorAnimation {
duration: Theme.mediumDuration duration: Theme.mediumDuration
easing.type: Theme.emphasizedEasing easing.type: Theme.emphasizedEasing
@@ -1950,7 +1958,10 @@ Item {
} }
} }
Component.onCompleted: updateAllData() Component.onCompleted: {
updateAllData();
delegateRoot.colorAnimationReady = true;
}
Connections { Connections {
target: CompositorService target: CompositorService