Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-06 05:25:41 -05:00
Code Packages Releases Activity

fix spacer sizes

Browse Source
This commit is contained in:
bbedward
2025-08-24 00:26:19 -04:00
parent afa60696c8
commit b504bf1617
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Modules/Settings/TopBarTab.qml
View File

@@ -288,7 +288,7 @@ Item {
SettingsData.setTopBarRightWidgets(newOrder) SettingsData.setTopBarRightWidgets(newOrder)
} }
function handleSpacerSizeChanged(sectionId, itemId, newSize) { function handleSpacerSizeChanged(sectionId, widgetIndex, newSize) {
var widgets = [] var widgets = []
if (sectionId === "left") if (sectionId === "left")
widgets = SettingsData.topBarLeftWidgets.slice() widgets = SettingsData.topBarLeftWidgets.slice()
@@ -296,12 +296,13 @@ Item {
widgets = SettingsData.topBarCenterWidgets.slice() widgets = SettingsData.topBarCenterWidgets.slice()
else if (sectionId === "right") else if (sectionId === "right")
widgets = SettingsData.topBarRightWidgets.slice() 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 var widgetId = typeof widget === "string" ? widget : widget.id
if (widgetId === itemId && widgetId === "spacer") { if (widgetId === "spacer") {
if (typeof widget === "string") { if (typeof widget === "string") {
widgets[i] = { widgets[widgetIndex] = {
"id": widget, "id": widget,
"enabled": true, "enabled": true,
"size": newSize "size": newSize
@@ -321,11 +322,11 @@ Item {
newWidget.showBluetoothIcon = widget.showBluetoothIcon !== undefined ? widget.showBluetoothIcon : true newWidget.showBluetoothIcon = widget.showBluetoothIcon !== undefined ? widget.showBluetoothIcon : true
newWidget.showAudioIcon = widget.showAudioIcon !== undefined ? widget.showAudioIcon : true newWidget.showAudioIcon = widget.showAudioIcon !== undefined ? widget.showAudioIcon : true
} }
widgets[i] = newWidget widgets[widgetIndex] = newWidget
} }
break
} }
} }
if (sectionId === "left") if (sectionId === "left")
SettingsData.setTopBarLeftWidgets(widgets) SettingsData.setTopBarLeftWidgets(widgets)
else if (sectionId === "center") else if (sectionId === "center")
@@ -923,9 +924,9 @@ Item {
topBarTab.removeWidgetFromSection( topBarTab.removeWidgetFromSection(
sectionId, widgetIndex) sectionId, widgetIndex)
} }
onSpacerSizeChanged: (sectionId, itemId, newSize) => { onSpacerSizeChanged: (sectionId, widgetIndex, newSize) => {
topBarTab.handleSpacerSizeChanged( topBarTab.handleSpacerSizeChanged(
sectionId, itemId, newSize) sectionId, widgetIndex, newSize)
} }
onCompactModeChanged: (widgetId, value) => { onCompactModeChanged: (widgetId, value) => {
if (widgetId === "clock") { if (widgetId === "clock") {
@@ -993,9 +994,9 @@ Item {
topBarTab.removeWidgetFromSection( topBarTab.removeWidgetFromSection(
sectionId, widgetIndex) sectionId, widgetIndex)
} }
onSpacerSizeChanged: (sectionId, itemId, newSize) => { onSpacerSizeChanged: (sectionId, widgetIndex, newSize) => {
topBarTab.handleSpacerSizeChanged( topBarTab.handleSpacerSizeChanged(
sectionId, itemId, newSize) sectionId, widgetIndex, newSize)
} }
onCompactModeChanged: (widgetId, value) => { onCompactModeChanged: (widgetId, value) => {
if (widgetId === "clock") { if (widgetId === "clock") {
@@ -1063,9 +1064,9 @@ Item {
topBarTab.removeWidgetFromSection( topBarTab.removeWidgetFromSection(
sectionId, widgetIndex) sectionId, widgetIndex)
} }
onSpacerSizeChanged: (sectionId, itemId, newSize) => { onSpacerSizeChanged: (sectionId, widgetIndex, newSize) => {
topBarTab.handleSpacerSizeChanged( topBarTab.handleSpacerSizeChanged(
sectionId, itemId, newSize) sectionId, widgetIndex, newSize)
} }
onCompactModeChanged: (widgetId, value) => { onCompactModeChanged: (widgetId, value) => {
if (widgetId === "clock") { if (widgetId === "clock") {

6
Modules/Settings/WidgetsTabSection.qml
View File

@@ -17,7 +17,7 @@ Column {
signal itemOrderChanged(var newOrder) signal itemOrderChanged(var newOrder)
signal addWidget(string sectionId) signal addWidget(string sectionId)
signal removeWidget(string sectionId, int widgetIndex) 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 compactModeChanged(string widgetId, var value)
signal gpuSelectionChanged(string sectionId, int widgetIndex, int selectedIndex) signal gpuSelectionChanged(string sectionId, int widgetIndex, int selectedIndex)
signal controlCenterSettingChanged(string sectionId, int widgetIndex, string settingName, bool value) signal controlCenterSettingChanged(string sectionId, int widgetIndex, string settingName, bool value)
@@ -419,7 +419,7 @@ Column {
var currentSize = modelData.size || 20 var currentSize = modelData.size || 20
var newSize = Math.max(5, currentSize - 5) var newSize = Math.max(5, currentSize - 5)
root.spacerSizeChanged(root.sectionId, root.spacerSizeChanged(root.sectionId,
modelData.id, index,
newSize) newSize)
} }
} }
@@ -441,7 +441,7 @@ Column {
var newSize = Math.min(5000, var newSize = Math.min(5000,
currentSize + 5) currentSize + 5)
root.spacerSizeChanged(root.sectionId, root.spacerSizeChanged(root.sectionId,
modelData.id, index,
newSize) newSize)
} }
} }