quickshell: top cluster is one ink, accent stays inside panels
Logo, workspace pill and wallpaper button are three buttons in a column of buttons; two of them were accented, which put the only saturated colour on screen in the corner. All base05 now. Focus does not need the colour: the focused pill is 18px against 6px, so shape already says it. Launcher header logo follows the bar's, since it is the same mark.
This commit is contained in:
parent
bd320a34d9
commit
6e33811946
1 changed files with 12 additions and 6 deletions
|
|
@ -3313,7 +3313,7 @@ in
|
||||||
ColorOverlay {
|
ColorOverlay {
|
||||||
anchors.fill: launchLogo
|
anchors.fill: launchLogo
|
||||||
source: launchLogo
|
source: launchLogo
|
||||||
color: Theme.accent
|
color: Theme.base05
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -4119,9 +4119,11 @@ in
|
||||||
anchors.horizontalCenter: barBgRect.horizontalCenter
|
anchors.horizontalCenter: barBgRect.horizontalCenter
|
||||||
spacing: 12
|
spacing: 12
|
||||||
|
|
||||||
// NixOS snowflake, flattened to the theme accent with the
|
// NixOS snowflake, flattened with the same hidden-Image +
|
||||||
// same hidden-Image + ColorOverlay trick the tray uses
|
// ColorOverlay trick the tray uses (no icon font ships a
|
||||||
// (no icon font ships a NixOS logo).
|
// NixOS logo). base05, not the accent: it is a button in a
|
||||||
|
// column of buttons, and accenting it made it the one loud
|
||||||
|
// thing in the corner of the screen.
|
||||||
Item {
|
Item {
|
||||||
width: Theme.barWidth
|
width: Theme.barWidth
|
||||||
height: 24
|
height: 24
|
||||||
|
|
@ -4141,7 +4143,7 @@ in
|
||||||
ColorOverlay {
|
ColorOverlay {
|
||||||
anchors.fill: nixLogoImg
|
anchors.fill: nixLogoImg
|
||||||
source: nixLogoImg
|
source: nixLogoImg
|
||||||
color: Theme.accent
|
color: Theme.base05
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
|
|
@ -4175,7 +4177,11 @@ in
|
||||||
width: 6
|
width: 6
|
||||||
height: wsItem.modelData.focused ? 18 : 6
|
height: wsItem.modelData.focused ? 18 : 6
|
||||||
radius: 3
|
radius: 3
|
||||||
color: wsItem.modelData.focused ? Theme.accent
|
// The focused pill is 18px against 6px, so
|
||||||
|
// focus is already unmistakable from shape
|
||||||
|
// alone — colouring it too made the switcher
|
||||||
|
// the second loud thing up here.
|
||||||
|
color: wsItem.modelData.focused ? Theme.base05
|
||||||
: wsMa.containsMouse ? Theme.base04 : Theme.base03
|
: wsMa.containsMouse ? Theme.base04 : Theme.base03
|
||||||
Behavior on height {
|
Behavior on height {
|
||||||
NumberAnimation { duration: 200; easing.type: Easing.OutExpo }
|
NumberAnimation { duration: 200; easing.type: Easing.OutExpo }
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue