nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

config: fix overwrite on startup

Browse source
This commit is contained in:
2 * r + 2 * t 2025-06-28 18:57:51 +10:00
parent cf1180df7b
commit c9f1d4138f
9 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/BorderConfig.qml
View file

@ -1,9 +1,6 @@
import "root:/services"
import Quickshell.Io import Quickshell.Io
import QtQuick
JsonObject { JsonObject {
property color colour: Colours.palette.m3surface
property int thickness: Appearance.padding.normal property int thickness: Appearance.padding.normal
property int rounding: Appearance.rounding.large property int rounding: Appearance.rounding.large
} }

2
modules/bar/popouts/Background.qml
View file

@ -16,7 +16,7 @@ ShapePath {
property real sideRounding: startX > 0 ? -1 : 1 property real sideRounding: startX > 0 ? -1 : 1
strokeWidth: -1 strokeWidth: -1
fillColor: Config.border.colour fillColor: Colours.palette.m3surface
PathArc { PathArc {
relativeX: root.roundingX relativeX: root.roundingX

6
modules/dashboard/Background.qml
View file

@ -1,7 +1,7 @@
import "root:/services"
import "root:/config"
import QtQuick import QtQuick
import QtQuick.Shapes import QtQuick.Shapes
import "root:/config"
import "root:/services"
ShapePath { ShapePath {
id: root id: root
@ -12,7 +12,7 @@ ShapePath {
readonly property real roundingY: flatten ? wrapper.height / 2 : rounding readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
strokeWidth: -1 strokeWidth: -1
fillColor: Config.border.colour fillColor: Colours.palette.m3surface
PathArc { PathArc {
relativeX: root.rounding relativeX: root.rounding

2
modules/drawers/Border.qml
View file

@ -16,7 +16,7 @@ Item {
id: rect id: rect
anchors.fill: parent anchors.fill: parent
color: Colours.alpha(Config.border.colour, false) color: Colours.alpha(Colours.palette.m3surface, false)
visible: false visible: false
} }

2
modules/launcher/Background.qml
View file

@ -12,7 +12,7 @@ ShapePath {
readonly property real roundingY: flatten ? wrapper.height / 2 : rounding readonly property real roundingY: flatten ? wrapper.height / 2 : rounding
strokeWidth: -1 strokeWidth: -1
fillColor: Config.border.colour fillColor: Colours.palette.m3surface
PathArc { PathArc {
relativeX: root.rounding relativeX: root.rounding

14
modules/lock/Backgrounds.qml
View file

@ -35,7 +35,7 @@ Item {
id: base id: base
anchors.fill: parent anchors.fill: parent
color: Colours.alpha(Config.border.colour, false) color: Colours.alpha(Colours.palette.m3surface, false)
visible: false visible: false
} }
@ -86,7 +86,7 @@ Item {
readonly property real roundingY: flatten ? height / 2 : rounding readonly property real roundingY: flatten ? height / 2 : rounding
strokeWidth: -1 strokeWidth: -1
fillColor: Config.border.colour fillColor: Colours.palette.m3surface
startX: (innerMask.width - width) / 2 - rounding startX: (innerMask.width - width) / 2 - rounding
@ -153,7 +153,7 @@ Item {
readonly property real roundingY: flatten ? height / 2 : rounding readonly property real roundingY: flatten ? height / 2 : rounding
strokeWidth: -1 strokeWidth: -1
fillColor: Config.border.colour fillColor: Colours.palette.m3surface
startX: (innerMask.width - width) / 2 - rounding startX: (innerMask.width - width) / 2 - rounding
startY: Math.ceil(innerMask.height) startY: Math.ceil(innerMask.height)
@ -221,7 +221,7 @@ Item {
readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding
strokeWidth: -1 strokeWidth: -1
fillColor: Config.border.colour fillColor: Colours.palette.m3surface
startY: Math.ceil(innerMask.height) - height - roundingY startY: Math.ceil(innerMask.height) - height - roundingY
@ -286,7 +286,7 @@ Item {
readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding
strokeWidth: -1 strokeWidth: -1
fillColor: root.isNormal ? Config.border.colour : "transparent" fillColor: root.isNormal ? Colours.palette.m3surface : "transparent"
startX: root.isLarge ? 0 : Math.ceil(innerMask.width) startX: root.isLarge ? 0 : Math.ceil(innerMask.width)
startY: root.isLarge ? height + roundingY : Math.ceil(innerMask.height) - height - roundingY 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 readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding
strokeWidth: -1 strokeWidth: -1
fillColor: root.isLarge ? Config.border.colour : "transparent" fillColor: root.isLarge ? Colours.palette.m3surface : "transparent"
startX: Math.ceil(innerMask.width) startX: Math.ceil(innerMask.width)
startY: Math.ceil(innerMask.height) - height - rounding startY: Math.ceil(innerMask.height) - height - rounding
@ -416,7 +416,7 @@ Item {
readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding readonly property real roundingY: height < rounding * 2 ? height / 2 : rounding
strokeWidth: -1 strokeWidth: -1
fillColor: root.isLarge ? Config.border.colour : "transparent" fillColor: root.isLarge ? Colours.palette.m3surface : "transparent"
startX: Math.ceil(innerMask.width) startX: Math.ceil(innerMask.width)
startY: height + rounding startY: height + rounding

2
modules/notifications/Background.qml
View file

@ -14,7 +14,7 @@ ShapePath {
property real fullHeightRounding: wrapper.height >= QsWindow.window?.height - Config.border.thickness * 2 ? -rounding : rounding property real fullHeightRounding: wrapper.height >= QsWindow.window?.height - Config.border.thickness * 2 ? -rounding : rounding
strokeWidth: -1 strokeWidth: -1
fillColor: Config.border.colour fillColor: Colours.palette.m3surface
PathLine { PathLine {
relativeX: -(root.wrapper.width + root.rounding) relativeX: -(root.wrapper.width + root.rounding)

2
modules/osd/Background.qml
View file

@ -12,7 +12,7 @@ ShapePath {
readonly property real roundingX: flatten ? wrapper.width / 2 : rounding readonly property real roundingX: flatten ? wrapper.width / 2 : rounding
strokeWidth: -1 strokeWidth: -1
fillColor: Config.border.colour fillColor: Colours.palette.m3surface
PathArc { PathArc {
relativeX: -root.roundingX relativeX: -root.roundingX

2
modules/session/Background.qml
View file

@ -12,7 +12,7 @@ ShapePath {
readonly property real roundingX: flatten ? wrapper.width / 2 : rounding readonly property real roundingX: flatten ? wrapper.width / 2 : rounding
strokeWidth: -1 strokeWidth: -1
fillColor: Config.border.colour fillColor: Colours.palette.m3surface
PathArc { PathArc {
relativeX: -root.roundingX relativeX: -root.roundingX