#55: fill height with title, vertical alignment option for title, use…

… padding instead of margins
antroids · Sep 24, 2024 · a99e7aa · a99e7aa
1 parent 9976f27
commit a99e7aa
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/package/contents/config/main.xml b/package/contents/config/main.xml
@@ -109,6 +109,14 @@
             </choices>
             <default>0</default>
         </entry>
+        <entry name="windowTitleVerticalAlignment" type="Enum">
+            <choices>
+                <choice name="Top" />
+                <choice name="Bottom" />
+                <choice name="Center" />
+            </choices>
+            <default>2</default>
+        </entry>
         <entry name="windowTitleHideEmpty" type="Bool">
             <default>false</default>
         </entry>

diff --git a/package/contents/ui/config/ConfigAppearance.qml b/package/contents/ui/config/ConfigAppearance.qml
@@ -34,6 +34,7 @@ KCM.SimpleKCM {
     property alias cfg_windowTitleFontSizeMode: windowTitleFontSizeMode.currentIndex
     property alias cfg_windowTitleSource: windowTitleSource.currentIndex
     property alias cfg_windowTitleHorizontalAlignment: windowTitleHorizontalAlignment.currentIndex
+    property alias cfg_windowTitleVerticalAlignment: windowTitleVerticalAlignment.currentIndex
     property alias cfg_windowTitleHideEmpty: windowTitleHideEmpty.checked
     property alias cfg_windowTitleUndefined: windowTitleUndefined.text
     property alias cfg_windowTitleMarginsLeft: windowTitleMarginsLeft.value
@@ -346,6 +347,13 @@ You can install more of regular Aurorae themes for window decorations in System
             model: [i18n("Left"), i18n("Right"), i18n("Center"), i18n("Justify")]
         }
 
+        ComboBox {
+            id: windowTitleVerticalAlignment
+
+            Kirigami.FormData.label: i18n("Vertical alignment:")
+            model: [i18n("Top"), i18n("Bottom"), i18n("Center")]
+        }
+
         RowLayout {
             Kirigami.FormData.label: i18n("Window title margins:")
 

diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
@@ -184,21 +184,19 @@ PlasmoidItem {
             id: windowTitleLabel
 
             readonly property var horizontalAlignmentValues: [Text.AlignLeft, Text.AlignRight, Text.AlignHCenter, Text.AlignJustify]
+            readonly property var verticalAlignmentValues: [Text.AlignTop, Text.AlignBottom, Text.AlignVCenter]
 
             property var modelData
             property bool empty: text === undefined || text === ""
             property bool hideEmpty: empty && plasmoid.configuration.windowTitleHideEmpty
             property int windowTitleSource: plasmoid.configuration.overrideElementsMaximized && tasksModel.activeWindow.maximized ? plasmoid.configuration.windowTitleSourceMaximized : plasmoid.configuration.windowTitleSource
             property var titleTextReplacements: []
 
-            Layout.leftMargin: !hideEmpty ? plasmoid.configuration.windowTitleMarginsLeft : 0
-            Layout.topMargin: !hideEmpty ? plasmoid.configuration.windowTitleMarginsTotitleReplacementsTypesp : 0
-            Layout.bottomMargin: !hideEmpty ? plasmoid.configuration.windowTitleMarginsBottom : 0
-            Layout.rightMargin: !hideEmpty ? plasmoid.configuration.windowTitleMarginsRight : 0
             Layout.minimumWidth: plasmoid.configuration.windowTitleMinimumWidth
             Layout.maximumWidth: !hideEmpty ? plasmoid.configuration.windowTitleMaximumWidth : 0
             Layout.alignment: root.widgetAlignment
             Layout.fillWidth: plasmoid.configuration.widgetFillWidth
+            Layout.fillHeight: true
             Layout.preferredWidth: textMetrics.advanceWidth + leftPadding + rightPadding + 1 // Magic number
             text: titleText(windowTitleSource) || plasmoid.configuration.windowTitleUndefined
             font.pointSize: plasmoid.configuration.windowTitleFontSize
@@ -209,6 +207,12 @@ PlasmoidItem {
             wrapMode: Text.WrapAnywhere
             enabled: tasksModel.hasActiveWindow
             horizontalAlignment: horizontalAlignmentValues[plasmoid.configuration.windowTitleHorizontalAlignment]
+            verticalAlignment: verticalAlignmentValues[plasmoid.configuration.windowTitleVerticalAlignment]
+
+            bottomPadding: !hideEmpty ? plasmoid.configuration.windowTitleMarginsBottom : 0
+            leftPadding: !hideEmpty ? plasmoid.configuration.windowTitleMarginsLeft : 0
+            rightPadding: !hideEmpty ? plasmoid.configuration.windowTitleMarginsRight : 0
+            topPadding: !hideEmpty ? plasmoid.configuration.windowTitleMarginsTop : 0
 
             Accessible.role: Accessible.TitleBar
             Accessible.name: text