mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
fix(settings): resolve barIsVertical property assignment conflict
CustomButtonSettings now calculates barIsVertical from Settings directly instead of receiving it from parent, avoiding Loader.setSource() conflict.
This commit is contained in:
@@ -186,7 +186,6 @@ Popup {
|
||||
}
|
||||
settingsLoader.setSource(source, {
|
||||
"screen": screen,
|
||||
"barIsVertical": barIsVertical,
|
||||
"widgetData": currentWidgetData,
|
||||
"widgetMetadata": BarWidgetRegistry.widgetMetadata[widgetId]
|
||||
});
|
||||
|
||||
@@ -17,8 +17,8 @@ ColumnLayout {
|
||||
|
||||
signal settingsChanged(var settings)
|
||||
|
||||
// Bar orientation (per-screen) - passed from parent
|
||||
property bool barIsVertical: false
|
||||
// Bar orientation (per-screen)
|
||||
property bool barIsVertical: (Settings.getBarPositionForScreen(screen?.name) === "left" || Settings.getBarPositionForScreen(screen?.name) === "right")
|
||||
|
||||
property string valueIcon: widgetData.icon !== undefined ? widgetData.icon : widgetMetadata.icon
|
||||
property string valueIconPosition: widgetData.iconPosition !== undefined ? widgetData.iconPosition : widgetMetadata.iconPosition
|
||||
|
||||
Reference in New Issue
Block a user