diff --git a/applets/taskmanager/package/contents/code/layout.js b/applets/taskmanager/package/contents/code/layout.js --- a/applets/taskmanager/package/contents/code/layout.js +++ b/applets/taskmanager/package/contents/code/layout.js @@ -132,7 +132,8 @@ } function preferredMaxHeight() { - return verticalMargins() + Math.min(units.iconSizes.small * 3, theme.mSize(theme.defaultFont).height * 3); + var maxLabelLines = plasmoid.configuration.maxLabelLines + return verticalMargins() + Math.min(units.iconSizes.small * maxLabelLines, theme.mSize(theme.defaultFont).height * maxLabelLines); } function taskWidth() { 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 @@ -93,6 +93,16 @@ true + + + 3 + 1 + + + + 5 + 1 + diff --git a/applets/taskmanager/package/contents/ui/ConfigGeneral.qml b/applets/taskmanager/package/contents/ui/ConfigGeneral.qml --- a/applets/taskmanager/package/contents/ui/ConfigGeneral.qml +++ b/applets/taskmanager/package/contents/ui/ConfigGeneral.qml @@ -32,6 +32,8 @@ readonly property bool plasmaPaAvailable: Qt.createComponent("PulseAudio.qml").status === Component.Ready property alias cfg_forceStripes: forceStripes.checked + property alias cfg_maxLabelLines: maxLabelLines.value + property alias cfg_minLabelLineLength: minLabelLineLength.value property alias cfg_showToolTips: showToolTips.checked property alias cfg_wheelEnabled: wheelEnabled.checked property alias cfg_highlightWindows: highlightWindows.checked @@ -83,6 +85,37 @@ GroupBox { Layout.fillWidth: true + title: i18n("Task Buttons") + flat: true + + GridLayout { + columns: 2 + Layout.fillWidth: true + + Label { + text: i18n("Maximum text lines:") + } + + SpinBox { + id: maxLabelLines + minimumValue: 1 + } + + Label { + text: i18n("Minimum characters per line:") + } + + SpinBox { + id: minLabelLineLength + minimumValue: 1 + } + + } + } + + GroupBox { + Layout.fillWidth: true + title: i18n("Behavior") flat: true 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 @@ -462,7 +462,7 @@ id: label visible: (inPopup || !iconsOnly && model.IsLauncher !== true - && (parent.width - iconBox.height - units.smallSpacing) >= (theme.mSize(theme.defaultFont).width * 5)) + && (parent.width - iconBox.height - units.smallSpacing) >= (theme.mSize(theme.defaultFont).width * plasmoid.configuration.minLabelLineLength)) anchors { fill: parent