From b504bf1617ac1409f63ff82896e661bc2b9aa335 Mon Sep 17 00:00:00 2001 From: bbedward Date: Sun, 24 Aug 2025 00:26:19 -0400 Subject: [PATCH] fix spacer sizes --- Modules/Settings/TopBarTab.qml | 27 +++++++++++++------------- Modules/Settings/WidgetsTabSection.qml | 6 +++--- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Modules/Settings/TopBarTab.qml b/Modules/Settings/TopBarTab.qml index eea18ddc..bcaf4d4c 100644 --- a/Modules/Settings/TopBarTab.qml +++ b/Modules/Settings/TopBarTab.qml @@ -288,7 +288,7 @@ Item { SettingsData.setTopBarRightWidgets(newOrder) } - function handleSpacerSizeChanged(sectionId, itemId, newSize) { + function handleSpacerSizeChanged(sectionId, widgetIndex, newSize) { var widgets = [] if (sectionId === "left") widgets = SettingsData.topBarLeftWidgets.slice() @@ -296,12 +296,13 @@ Item { widgets = SettingsData.topBarCenterWidgets.slice() else if (sectionId === "right") widgets = SettingsData.topBarRightWidgets.slice() - for (var i = 0; i < widgets.length; i++) { - var widget = widgets[i] + + if (widgetIndex >= 0 && widgetIndex < widgets.length) { + var widget = widgets[widgetIndex] var widgetId = typeof widget === "string" ? widget : widget.id - if (widgetId === itemId && widgetId === "spacer") { + if (widgetId === "spacer") { if (typeof widget === "string") { - widgets[i] = { + widgets[widgetIndex] = { "id": widget, "enabled": true, "size": newSize @@ -321,11 +322,11 @@ Item { newWidget.showBluetoothIcon = widget.showBluetoothIcon !== undefined ? widget.showBluetoothIcon : true newWidget.showAudioIcon = widget.showAudioIcon !== undefined ? widget.showAudioIcon : true } - widgets[i] = newWidget + widgets[widgetIndex] = newWidget } - break } } + if (sectionId === "left") SettingsData.setTopBarLeftWidgets(widgets) else if (sectionId === "center") @@ -923,9 +924,9 @@ Item { topBarTab.removeWidgetFromSection( sectionId, widgetIndex) } - onSpacerSizeChanged: (sectionId, itemId, newSize) => { + onSpacerSizeChanged: (sectionId, widgetIndex, newSize) => { topBarTab.handleSpacerSizeChanged( - sectionId, itemId, newSize) + sectionId, widgetIndex, newSize) } onCompactModeChanged: (widgetId, value) => { if (widgetId === "clock") { @@ -993,9 +994,9 @@ Item { topBarTab.removeWidgetFromSection( sectionId, widgetIndex) } - onSpacerSizeChanged: (sectionId, itemId, newSize) => { + onSpacerSizeChanged: (sectionId, widgetIndex, newSize) => { topBarTab.handleSpacerSizeChanged( - sectionId, itemId, newSize) + sectionId, widgetIndex, newSize) } onCompactModeChanged: (widgetId, value) => { if (widgetId === "clock") { @@ -1063,9 +1064,9 @@ Item { topBarTab.removeWidgetFromSection( sectionId, widgetIndex) } - onSpacerSizeChanged: (sectionId, itemId, newSize) => { + onSpacerSizeChanged: (sectionId, widgetIndex, newSize) => { topBarTab.handleSpacerSizeChanged( - sectionId, itemId, newSize) + sectionId, widgetIndex, newSize) } onCompactModeChanged: (widgetId, value) => { if (widgetId === "clock") { diff --git a/Modules/Settings/WidgetsTabSection.qml b/Modules/Settings/WidgetsTabSection.qml index edcb2740..e7340d06 100644 --- a/Modules/Settings/WidgetsTabSection.qml +++ b/Modules/Settings/WidgetsTabSection.qml @@ -17,7 +17,7 @@ Column { signal itemOrderChanged(var newOrder) signal addWidget(string sectionId) signal removeWidget(string sectionId, int widgetIndex) - signal spacerSizeChanged(string sectionId, string itemId, int newSize) + signal spacerSizeChanged(string sectionId, int widgetIndex, int newSize) signal compactModeChanged(string widgetId, var value) signal gpuSelectionChanged(string sectionId, int widgetIndex, int selectedIndex) signal controlCenterSettingChanged(string sectionId, int widgetIndex, string settingName, bool value) @@ -419,7 +419,7 @@ Column { var currentSize = modelData.size || 20 var newSize = Math.max(5, currentSize - 5) root.spacerSizeChanged(root.sectionId, - modelData.id, + index, newSize) } } @@ -441,7 +441,7 @@ Column { var newSize = Math.min(5000, currentSize + 5) root.spacerSizeChanged(root.sectionId, - modelData.id, + index, newSize) } }