ZacharyZhang-NY/omarchycn
3
4
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Lift setting / vertical / barSize onto BarWidget

Browse Source 
Six widgets (clock, daytime, keyboardLayout, lockKeys, activeWindow,
media) shipped identical copies of `function setting(name, fallback)`.
Eight widgets reimplemented `readonly property bool vertical`, and
three reimplemented `readonly property int barSize`. Move all three
onto the BarWidget base so widgets read the same wiring everyone else
gets for free.

While in here, drop the dead `setting()` declaration on media.qml — it
was defined but never called.
This commit is contained in:
David Heinemeier Hansson
2026-05-20 19:50:10 +02:00
parent 4d58dfa27a
commit 16604c67b3
12 changed files with 23 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell/plugins/bar/widgets/lockKeys.qml
+2 -9
View File
@@ -14,11 +14,6 @@ BarWidget {
property bool scrollOn: false
property bool hideWhenOff: true
function setting(name, fallback) {
var value = settings ? settings[name] : undefined
return value === undefined || value === null ? fallback : value
}
Component.onCompleted: {
hideWhenOff = setting("hideWhenOff", true) === true
refresh()
@@ -58,10 +53,8 @@ BarWidget {
readonly property bool anyOn: capsOn || numOn || scrollOn
visible: ledsAvailable && (hideWhenOff ? anyOn : true)
readonly property bool vertical: bar ? bar.vertical : false
implicitWidth: vertical ? (bar ? bar.barSize : Style.bar.sizeVertical) : (lay.item ? lay.item.implicitWidth + Style.spacing.controlGap : 0)
implicitHeight: vertical ? (lay.item ? lay.item.implicitHeight + Style.spacing.controlGap : 0) : (bar ? bar.barSize : Style.bar.sizeHorizontal)
implicitWidth: vertical ? barSize : (lay.item ? lay.item.implicitWidth + Style.spacing.controlGap : 0)
implicitHeight: vertical ? (lay.item ? lay.item.implicitHeight + Style.spacing.controlGap : 0) : barSize
Loader {
id: lay