Skip to content

Commit 79b6ed8

Browse files
committed
fix: only force even widget spacing if islands feature is used
I forgot to add the actual check in 10c3aa4 LOL refs: #122
1 parent 25cf47e commit 79b6ed8

8 files changed

Lines changed: 9 additions & 9 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ Fully-featured widget to bring Latte-Dock and WM status bar customization featur
103103
- Opacity (Plasma 6.3.0)
104104
- *EXPERIMENTAL* Sow/hide panel "AKA toggle panel" with D-Bus, stays hidden when hovering on screen edges
105105
106-
**Unified background (islands)**
106+
**Widget Islands**
107107
108-
- Join one or more widgets to make them visually connected
108+
- Join two or more widgets to make them visually connected
109109
110110
**Configuration overrides**
111111

package/contents/config/config.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ConfigModel {
2929
ConfigCategory {
3030
name: i18n("Widget Islands")
3131
icon: "distribute-horizontal-margin-symbolic"
32-
source: "configUnifiedBackground.qml"
32+
source: "configWidgetIslands.qml"
3333
}
3434

3535
ConfigCategory {

package/contents/ui/components/CustomBackground.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ Rectangle {
756756
id: dropShadow
757757
anchors.fill: parent
758758
// we need to compensate because we now space widgets with margins
759-
// instead of the layout spacing for the unified background feature
759+
// instead of the layout spacing for the widget islands feature
760760
// can't anchor to center because we can also add different margin
761761
// on each side, the shadow position is off otherwise
762762
anchors.leftMargin: rect.horizontal ? rect.marginLeft : undefined

package/contents/ui/components/FormWidgetSettings.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ ColumnLayout {
477477
Button {
478478
visible: spacingCheckbox.value % 2 !== 0 && spacingCheckbox.visible
479479
icon.name: "dialog-warning-symbolic"
480-
ToolTip.text: i18n("<strong>Odd</strong> values are automatically converted to <strong>evens</strong> if <strong>Unified Background</strong> feature is used.")
480+
ToolTip.text: i18n("<strong>Odd spacing</strong> values will be automatically converted to <strong>evens</strong> if <strong>Widget Islands</strong> feature is used.")
481481
highlighted: true
482482
hoverEnabled: true
483483
ToolTip.visible: hovered
File renamed without changes.
File renamed without changes.

package/contents/ui/configUnifiedBackground.qml renamed to package/contents/ui/configWidgetIslands.qml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,21 +125,21 @@ KCM.SimpleKCM {
125125
}
126126

127127
Button {
128-
text: i18n("Remove all unified areas")
128+
text: i18n("Remove all islands")
129129
icon.name: "kt-restore-defaults-symbolic"
130130
onClicked: {
131131
root.restoreSettings();
132132
}
133133
Layout.fillWidth: true
134134
}
135135

136-
Components.WidgetUnifiedHint {
136+
Components.WidgetIslandsHint {
137137
Layout.alignment: Qt.AlignHCenter
138138
}
139139

140140
Repeater {
141141
model: widgetsModel
142-
Components.WidgetCardUnifiedBg {
142+
Components.WidgetCardIslands {
143143
required property int index
144144
required property string name
145145
required property var model

package/contents/ui/main.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ PlasmoidItem {
148148
property var trayWidgetSettings: cfg.trayWidgets
149149
property var stockPanelSettings: cfg.stockPanelSettings
150150
property var widgetsSpacing: {
151-
if (true) {
151+
if (unifiedBackgroundSettings.length) {
152152
return Utils.makeEven(widgetSettings?.normal?.spacing ?? 4);
153153
} else {
154154
return widgetSettings?.normal?.spacing ?? 4;

0 commit comments

Comments
 (0)