diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml index 8f206e4445f10..9f0f75f8dae9e 100644 --- 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 index 84a0f1c6a56ee..e681bf4a0a0bc 100644 --- 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 index 4762b76162004..9016d9452340c 100644 --- 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 index 3f034143bcb14..bb4217b8e6cd1 100644 --- 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 index f34862d838af6..ba78eb74f7c24 100644 --- 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 index e6fad592edad9..d7065e1a687a2 100644 --- 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