diff options
| author | Tim Hämisch <tim@thaemisch.net> | 2025-06-15 13:40:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-15 13:40:47 +0200 |
| commit | 68874082b4cfee63feaecc0640646ad0ba753da7 (patch) | |
| tree | 815a1113a4bd83373283253a35f0220a08a8cfe6 /modules/osd | |
| parent | launcher: use standard logout command (diff) | |
| parent | dashboard: fix uptime (diff) | |
| download | caelestia-shell-68874082b4cfee63feaecc0640646ad0ba753da7.tar.gz caelestia-shell-68874082b4cfee63feaecc0640646ad0ba753da7.tar.bz2 caelestia-shell-68874082b4cfee63feaecc0640646ad0ba753da7.zip | |
Merge branch 'main' into betteractions
Diffstat (limited to 'modules/osd')
| -rw-r--r-- | modules/osd/Background.qml | 4 | ||||
| -rw-r--r-- | modules/osd/Content.qml | 8 | ||||
| -rw-r--r-- | modules/osd/Interactions.qml | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/modules/osd/Background.qml b/modules/osd/Background.qml index 551637b..12cce6a 100644 --- a/modules/osd/Background.qml +++ b/modules/osd/Background.qml @@ -7,12 +7,12 @@ ShapePath { id: root required property Wrapper wrapper - readonly property real rounding: BorderConfig.rounding + readonly property real rounding: Config.border.rounding readonly property bool flatten: wrapper.width < rounding * 2 readonly property real roundingX: flatten ? wrapper.width / 2 : rounding strokeWidth: -1 - fillColor: BorderConfig.colour + fillColor: Config.border.colour PathArc { relativeX: -root.roundingX diff --git a/modules/osd/Content.qml b/modules/osd/Content.qml index 6814966..4bd43af 100644 --- a/modules/osd/Content.qml +++ b/modules/osd/Content.qml @@ -28,8 +28,8 @@ Column { value: Audio.volume onMoved: Audio.setVolume(value) - implicitWidth: OsdConfig.sizes.sliderWidth - implicitHeight: OsdConfig.sizes.sliderHeight + implicitWidth: Config.osd.sizes.sliderWidth + implicitHeight: Config.osd.sizes.sliderHeight } VerticalSlider { @@ -37,7 +37,7 @@ Column { value: root.monitor?.brightness ?? 0 onMoved: root.monitor?.setBrightness(value) - implicitWidth: OsdConfig.sizes.sliderWidth - implicitHeight: OsdConfig.sizes.sliderHeight + implicitWidth: Config.osd.sizes.sliderWidth + implicitHeight: Config.osd.sizes.sliderHeight } } diff --git a/modules/osd/Interactions.qml b/modules/osd/Interactions.qml index eecf0b6..fa75aa0 100644 --- a/modules/osd/Interactions.qml +++ b/modules/osd/Interactions.qml @@ -39,7 +39,7 @@ Scope { Timer { id: timer - interval: OsdConfig.hideDelay + interval: Config.osd.hideDelay onTriggered: { if (!root.hovered) root.visibilities.osd = false; |