config: fix overwrite on startup
This commit is contained in:
parent
cf1180df7b
commit
c9f1d4138f
9 changed files with 16 additions and 19 deletions
|
|
@ -1,9 +1,6 @@
|
|||
import "root:/services"
|
||||
import Quickshell.Io
|
||||
import QtQuick
|
||||
|
||||
JsonObject {
|
||||
property color colour: Colours.palette.m3surface
|
||||
property int thickness: Appearance.padding.normal
|
||||
property int rounding: Appearance.rounding.large
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ ShapePath {
|
|||
property real sideRounding: startX > 0 ? -1 : 1
|
||||
|
||||
strokeWidth: -1
|
||||
fillColor: Config.border.colour
|
||||
fillColor: Colours.palette.m3surface
|
||||
|
||||
PathArc {
|
||||
relativeX: root.roundingX
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import "root:/services"
|
||||
import "root:/config"
|
||||
import QtQuick
|
||||
import QtQuick.Shapes
|
||||
import "root:/config"
|
||||
import "root:/services"
|
||||
|
||||
ShapePath {
|
||||
id: root
|
||||
|
|
@ -12,7 +12,7 @@ ShapePath {
|
|||
readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
|
||||
|
||||
strokeWidth: -1
|
||||
fillColor: Config.border.colour
|
||||
fillColor: Colours.palette.m3surface
|
||||
|
||||
PathArc {
|
||||
relativeX: root.rounding
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ Item {
|
|||
id: rect
|
||||
|
||||
anchors.fill: parent
|
||||
color: Colours.alpha(Config.border.colour, false)
|
||||
color: Colours.alpha(Colours.palette.m3surface, false)
|
||||
visible: false
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ ShapePath {
|
|||
readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
|
||||
|
||||
strokeWidth: -1
|
||||
fillColor: Config.border.colour
|
||||
fillColor: Colours.palette.m3surface
|
||||
|
||||
PathArc {
|
||||
relativeX: root.rounding
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ Item {
|
|||
id: base
|
||||
|
||||
anchors.fill: parent
|
||||
color: Colours.alpha(Config.border.colour, false)
|
||||
color: Colours.alpha(Colours.palette.m3surface, false)
|
||||
visible: false
|
||||
}
|
||||
|
||||
|
|
@ -86,7 +86,7 @@ Item {
|
|||
readonly property real roundingY: flatten ? height / 2 : rounding
|
||||
|
||||
strokeWidth: -1
|
||||
fillColor: Config.border.colour
|
||||
fillColor: Colours.palette.m3surface
|
||||
|
||||
startX: (innerMask.width - width) / 2 - rounding
|
||||
|
||||
|
|
@ -153,7 +153,7 @@ Item {
|
|||
readonly property real roundingY: flatten ? height / 2 : rounding
|
||||
|
||||
strokeWidth: -1
|
||||
fillColor: Config.border.colour
|
||||
fillColor: Colours.palette.m3surface
|
||||
|
||||
startX: (innerMask.width - width) / 2 - rounding
|
||||
startY: Math.ceil(innerMask.height)
|
||||
|
|
@ -221,7 +221,7 @@ Item {
|
|||
readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding
|
||||
|
||||
strokeWidth: -1
|
||||
fillColor: Config.border.colour
|
||||
fillColor: Colours.palette.m3surface
|
||||
|
||||
startY: Math.ceil(innerMask.height) - height - roundingY
|
||||
|
||||
|
|
@ -286,7 +286,7 @@ Item {
|
|||
readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding
|
||||
|
||||
strokeWidth: -1
|
||||
fillColor: root.isNormal ? Config.border.colour : "transparent"
|
||||
fillColor: root.isNormal ? Colours.palette.m3surface : "transparent"
|
||||
|
||||
startX: root.isLarge ? 0 : Math.ceil(innerMask.width)
|
||||
startY: root.isLarge ? height + roundingY : Math.ceil(innerMask.height) - height - roundingY
|
||||
|
|
@ -351,7 +351,7 @@ Item {
|
|||
readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding
|
||||
|
||||
strokeWidth: -1
|
||||
fillColor: root.isLarge ? Config.border.colour : "transparent"
|
||||
fillColor: root.isLarge ? Colours.palette.m3surface : "transparent"
|
||||
|
||||
startX: Math.ceil(innerMask.width)
|
||||
startY: Math.ceil(innerMask.height) - height - rounding
|
||||
|
|
@ -416,7 +416,7 @@ Item {
|
|||
readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding
|
||||
|
||||
strokeWidth: -1
|
||||
fillColor: root.isLarge ? Config.border.colour : "transparent"
|
||||
fillColor: root.isLarge ? Colours.palette.m3surface : "transparent"
|
||||
|
||||
startX: Math.ceil(innerMask.width)
|
||||
startY: height + rounding
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ ShapePath {
|
|||
property real fullHeightRounding: wrapper.height >= QsWindow.window?.height - Config.border.thickness * 2 ? -rounding : rounding
|
||||
|
||||
strokeWidth: -1
|
||||
fillColor: Config.border.colour
|
||||
fillColor: Colours.palette.m3surface
|
||||
|
||||
PathLine {
|
||||
relativeX: -(root.wrapper.width + root.rounding)
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ ShapePath {
|
|||
readonly property real roundingX: flatten ? wrapper.width / 2 : rounding
|
||||
|
||||
strokeWidth: -1
|
||||
fillColor: Config.border.colour
|
||||
fillColor: Colours.palette.m3surface
|
||||
|
||||
PathArc {
|
||||
relativeX: -root.roundingX
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ ShapePath {
|
|||
readonly property real roundingX: flatten ? wrapper.width / 2 : rounding
|
||||
|
||||
strokeWidth: -1
|
||||
fillColor: Config.border.colour
|
||||
fillColor: Colours.palette.m3surface
|
||||
|
||||
PathArc {
|
||||
relativeX: -root.roundingX
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue