Replace various subline pixel font size with one small pt based size

Signed-off-by: Claudio Cambra <[email protected]>
nextcloud · Nov 19, 2024 · 2785ed5 · 2785ed5
1 parent 41c9113
commit 2785ed5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml
@@ -149,7 +149,7 @@ RowLayout {
                 height: (text === "") ? 0 : implicitHeight
 
                 text: root.activityData.dateTime
-                font.pixelSize: Style.subLinePixelSize
+                font.pointSize: Style.smallFontPtSize
                 visible: text !== ""
             }
 
@@ -220,7 +220,7 @@ RowLayout {
                 elide: Text.ElideRight
                 wrapMode: Text.Wrap
                 maximumLineCount: 2
-                font.pixelSize: Style.subLinePixelSize
+                font.pointSize: Style.smallFontPtSize
                 visible: text !== ""
             }
 

diff --git a/src/gui/tray/ListItemLineAndSubline.qml b/src/gui/tray/ListItemLineAndSubline.qml
@@ -27,7 +27,7 @@ ColumnLayout {
     property string sublineText: ""
 
     property int titleFontSize: Style.unifiedSearchResultTitleFontSize
-    property int sublineFontSize: Style.unifiedSearchResultSublineFontSize
+    property int sublineFontSize: Style.smallFontPtSize
 
     property color titleColor: palette.windowText
     property color sublineColor: palette.midlight

diff --git a/src/gui/tray/SyncStatus.qml b/src/gui/tray/SyncStatus.qml
@@ -80,7 +80,7 @@ RowLayout {
 
             text: syncStatus.syncStatusDetailString
             visible: syncStatus.syncStatusDetailString !== ""
-            font.pixelSize: Style.subLinePixelSize
+            font.pointSize: Style.smallFontPtSize
             wrapMode: Text.Wrap
         }
     }

diff --git a/src/gui/tray/UnifiedSearchResultItem.qml b/src/gui/tray/UnifiedSearchResultItem.qml
@@ -33,7 +33,7 @@ RowLayout {
 
     property int iconWidth: iconsIsThumbnail && icons !== "" ? Style.unifiedSearchResultIconWidth : Style.unifiedSearchResultSmallIconWidth
     property int titleFontSize: Style.unifiedSearchResultTitleFontSize
-    property int sublineFontSize: Style.unifiedSearchResultSublineFontSize
+    property int sublineFontSize: Style.smallFontPtSize
 
     property color titleColor: palette.buttonText
     property color sublineColor: palette.midlight

diff --git a/src/gui/tray/UnifiedSearchResultItemSkeleton.qml b/src/gui/tray/UnifiedSearchResultItemSkeleton.qml
@@ -23,7 +23,7 @@ RowLayout {
 
     property int iconWidth: Style.unifiedSearchResultIconWidth
     property int titleFontSize: Style.unifiedSearchResultTitleFontSize
-    property int sublineFontSize: Style.unifiedSearchResultSublineFontSize
+    readonly property int sublineFontSize: Style.smallFontPtSize
 
     Accessible.role: Accessible.ListItem
     Accessible.name: qsTr("Search result skeleton.").arg(model.index)

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
@@ -29,11 +29,11 @@ QtObject {
 
     // Fonts
     // We are using pixel size because this is cross platform comparable, point size isn't
-    readonly property int subLinePixelSize: pixelSize - 2
     readonly property int defaultFontPtSize: fontMetrics.font.pointSize
     readonly property int subheaderFontPtSize: defaultFontPtSize + 2
     readonly property int headerFontPtSize: defaultFontPtSize + 4
     readonly property int titleFontPtSize: defaultFontPtSize + 8
+    readonly property int smallFontPtSize: defaultFontPtSize - 2
 
     // Dimensions and sizes
     property int trayWindowWidth: variableSize(400)
@@ -135,7 +135,6 @@ QtObject {
     readonly property int unifiedSearchResultSmallIconWidth: trayListItemIconSize * (1 - thumbnailImageSizeReduction * 2)
     readonly property int unifiedSearchResultIconLeftMargin: 12
     readonly property int unifiedSearchResultTitleFontSize: pixelSize
-    readonly property int unifiedSearchResultSublineFontSize: subLinePixelSize
     readonly property int unifiedSearchResultSectionItemLeftPadding: 16
     readonly property int unifiedSearchResultSectionItemVerticalPadding: 8
     readonly property int unifiedSearchResultNothingFoundHorizontalMargin: 10