diff --git a/applets/taskmanager/package/contents/config/main.xml b/applets/taskmanager/package/contents/config/main.xml --- a/applets/taskmanager/package/contents/config/main.xml +++ b/applets/taskmanager/package/contents/config/main.xml @@ -59,6 +59,16 @@ false + + + 0 + 0 + + + + 0 + 0 + true diff --git a/applets/taskmanager/package/contents/ui/ConfigAppearance.qml b/applets/taskmanager/package/contents/ui/ConfigAppearance.qml old mode 100644 new mode 100755 --- a/applets/taskmanager/package/contents/ui/ConfigAppearance.qml +++ b/applets/taskmanager/package/contents/ui/ConfigAppearance.qml @@ -38,6 +38,8 @@ property alias cfg_iconSize: iconSize.value property alias cfg_maxStripes: maxStripes.value property alias cfg_forceStripes: forceStripes.checked + property alias cfg_horizontalSpacing: horizontalSpacing.currentValue + property alias cfg_verticalSpacing: verticalSpacing.currentValue Kirigami.FormLayout { anchors.left: parent.left @@ -104,12 +106,44 @@ id: maxStripes Kirigami.FormData.label: plasmoidVertical ? i18n("Maximum columns:") : i18n("Maximum rows:") from: 1 - } + } CheckBox { id: forceStripes text: plasmoidVertical ? i18n("Always arrange tasks in rows of as many columns") : i18n("Always arrange tasks in columns of as many rows") enabled: maxStripes.value > 1 } + + Item { + Kirigami.FormData.isSection: true + } + + ComboBox { + id: horizontalSpacing + Kirigami.FormData.label: i18n("Spacing:") + textRole: "key" + valueRole: "value" + model: [ + { key: i18n("Narrow"), value: 0 }, + { key: i18n("Medium"), value: 8 }, + { key: i18n("Wide"), value: 16 }, + { key: i18n("Extra wide"), value: 24 } + ] + visible: !plasmoidVertical + } + + ComboBox { + id: verticalSpacing + Kirigami.FormData.label: i18n("Spacing:") + textRole: "key" + valueRole: "value" + model: [ + { key: i18n("Narrow"), value: 0 }, + { key: i18n("Medium"), value: 8 }, + { key: i18n("Wide"), value: 16 }, + { key: i18n("Extra wide"), value: 24 } + ] + visible: plasmoidVertical + } } } diff --git a/applets/taskmanager/package/contents/ui/Task.qml b/applets/taskmanager/package/contents/ui/Task.qml --- a/applets/taskmanager/package/contents/ui/Task.qml +++ b/applets/taskmanager/package/contents/ui/Task.qml @@ -440,6 +440,7 @@ active: task.highlighted enabled: true usesPlasmaTheme: false + roundToIconSize: false source: model.decoration } diff --git a/applets/taskmanager/package/contents/ui/code/layout.js b/applets/taskmanager/package/contents/ui/code/layout.js --- a/applets/taskmanager/package/contents/ui/code/layout.js +++ b/applets/taskmanager/package/contents/ui/code/layout.js @@ -20,11 +20,11 @@ var iconSizes = ["small", "smallMedium", "medium", "large", "huge", "enormous"]; function horizontalMargins() { - return taskFrame.margins.left + taskFrame.margins.right; + return taskFrame.margins.left + taskFrame.margins.right + plasmoid.configuration.horizontalSpacing; } function verticalMargins() { - return taskFrame.margins.top + taskFrame.margins.bottom; + return taskFrame.margins.top + taskFrame.margins.bottom + plasmoid.configuration.verticalSpacing; } function adjustMargin(height, margin) {