Fix settings widget dialog and fallback defaults
This commit is contained in:
@@ -139,24 +139,21 @@ Item {
|
|||||||
bar: {
|
bar: {
|
||||||
position: "top",
|
position: "top",
|
||||||
transparent: false,
|
transparent: false,
|
||||||
fontFamily: "monospace",
|
|
||||||
centerAnchor: "calendar",
|
centerAnchor: "calendar",
|
||||||
layout: {
|
layout: {
|
||||||
left: [{ id: "omarchy" }, { id: "workspaces" }, { id: "activeWindow" }],
|
left: [{ id: "omarchy" }, { id: "workspaces" }],
|
||||||
center: [
|
center: [
|
||||||
{ id: "media" },
|
{ id: "calendar", format: "dddd HH:mm", formatAlt: "dd MMMM 'W'ww yyyy", verticalFormat: "HH\n\u2014\nmm" },
|
||||||
{ id: "calendar", format: "dddd HH:mm", formatAlt: "dd MMMM 'W'ww yyyy", verticalFormat: "HH\n—\nmm" },
|
|
||||||
{ id: "weatherFlyout" }, { id: "update" }, { id: "voxtype" },
|
{ id: "weatherFlyout" }, { id: "update" }, { id: "voxtype" },
|
||||||
{ id: "screenRecording" }, { id: "idle" }, { id: "notifications" }
|
{ id: "screenRecording" }, { id: "idleInhibitor" }, { id: "notifications" }
|
||||||
],
|
],
|
||||||
right: [
|
right: [
|
||||||
{ id: "tray" }, { id: "systemStats" }, { id: "microphone" },
|
{ id: "tray" }, { id: "bluetoothPanel" }, { id: "networkPanel" },
|
||||||
{ id: "bluetoothPanel" }, { id: "networkPanel" }, { id: "audioPanel" },
|
{ id: "audioPanel" }, { id: "monitorPanel" }, { id: "battery" }
|
||||||
{ id: "monitorPanel" }, { id: "battery" }
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
plugins: []
|
plugins: [{ id: "omarchy.osd" }]
|
||||||
})
|
})
|
||||||
|
|
||||||
property var defaultConfig: builtinShellConfig
|
property var defaultConfig: builtinShellConfig
|
||||||
@@ -617,12 +614,16 @@ Item {
|
|||||||
color: Qt.rgba(0, 0, 0, 0.45)
|
color: Qt.rgba(0, 0, 0, 0.45)
|
||||||
z: 100
|
z: 100
|
||||||
|
|
||||||
|
focus: visible
|
||||||
|
onVisibleChanged: if (visible) Qt.callLater(forceActiveFocus)
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
onClicked: root.discardWidgetSettings()
|
onClicked: root.discardWidgetSettings()
|
||||||
acceptedButtons: Qt.LeftButton | Qt.RightButton
|
acceptedButtons: Qt.LeftButton | Qt.RightButton
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Keys.priority: Keys.BeforeItem
|
||||||
Keys.onPressed: function(event) {
|
Keys.onPressed: function(event) {
|
||||||
if (event.key === Qt.Key_Escape) {
|
if (event.key === Qt.Key_Escape) {
|
||||||
root.discardWidgetSettings()
|
root.discardWidgetSettings()
|
||||||
@@ -907,7 +908,11 @@ Item {
|
|||||||
foreground: root.foreground
|
foreground: root.foreground
|
||||||
accent: root.accent
|
accent: root.accent
|
||||||
fontFamily: root.fontFamily
|
fontFamily: root.fontFamily
|
||||||
onChanged: function(v) { if (v) root.addEntry(section.sectionKey, v) }
|
onChanged: function(v) {
|
||||||
|
if (!v) return
|
||||||
|
root.addEntry(section.sectionKey, v)
|
||||||
|
addPill.value = ""
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user