Skip to content

Commit b8a7c2f

Browse files
committed
fix(settings): resolve barIsVertical property assignment conflict
CustomButtonSettings now calculates barIsVertical from Settings directly instead of receiving it from parent, avoiding Loader.setSource() conflict.
1 parent 5c3b3a2 commit b8a7c2f

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

Modules/Panels/Settings/Bar/BarWidgetSettingsDialog.qml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ Popup {
186186
}
187187
settingsLoader.setSource(source, {
188188
"screen": screen,
189-
"barIsVertical": barIsVertical,
190189
"widgetData": currentWidgetData,
191190
"widgetMetadata": BarWidgetRegistry.widgetMetadata[widgetId]
192191
});

Modules/Panels/Settings/Bar/WidgetSettings/CustomButtonSettings.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ColumnLayout {
1717

1818
signal settingsChanged(var settings)
1919

20-
// Bar orientation (per-screen) - passed from parent
21-
property bool barIsVertical: false
20+
// Bar orientation (per-screen)
21+
property bool barIsVertical: (Settings.getBarPositionForScreen(screen?.name) === "left" || Settings.getBarPositionForScreen(screen?.name) === "right")
2222

2323
property string valueIcon: widgetData.icon !== undefined ? widgetData.icon : widgetMetadata.icon
2424
property string valueIconPosition: widgetData.iconPosition !== undefined ? widgetData.iconPosition : widgetMetadata.iconPosition

0 commit comments

Comments
 (0)