From 43dee793de19308927cfb3027ccadcff4b4754be Mon Sep 17 00:00:00 2001 From: ItsLemmy Date: Tue, 30 Sep 2025 07:44:03 -0400 Subject: [PATCH] More pointSize cleanup --- Modules/Bar/Bluetooth/BluetoothDevicesList.qml | 4 ++-- Modules/Bar/Bluetooth/BluetoothPanel.qml | 6 +++--- Modules/Bar/Extras/BarPillHorizontal.qml | 2 +- Modules/Bar/Extras/BarPillVertical.qml | 2 +- Modules/Bar/Extras/TrayMenu.qml | 2 +- Modules/Bar/WiFi/WiFiPanel.qml | 13 +++++++------ Modules/Bar/Widgets/MediaMini.qml | 4 ++-- Modules/Bar/Widgets/SystemMonitor.qml | 12 ++++++------ Modules/ControlCenter/Cards/MediaCard.qml | 6 +++--- Modules/ControlCenter/Cards/WeatherCard.qml | 4 ++-- Modules/Dock/Dock.qml | 2 +- Modules/Dock/DockMenu.qml | 6 +++--- Modules/LockScreen/LockScreen.qml | 10 +++++----- Modules/Notification/NotificationHistoryPanel.qml | 4 ++-- Modules/OSD/OSD.qml | 4 ++-- Modules/SessionMenu/SessionMenu.qml | 2 +- Modules/Settings/SettingsPanel.qml | 4 ++-- Modules/Settings/Tabs/AboutTab.qml | 2 +- Modules/Settings/Tabs/ColorSchemeTab.qml | 2 +- Modules/Toast/SimpleToast.qml | 2 +- Modules/Wallpaper/WallpaperPanel.qml | 6 +++--- Widgets/NButton.qml | 2 +- Widgets/NCheckbox.qml | 2 +- Widgets/NCircleStat.qml | 2 +- Widgets/NCollapsible.qml | 2 +- Widgets/NComboBox.qml | 2 +- Widgets/NContextMenu.qml | 2 +- Widgets/NFilePicker.qml | 12 ++++++------ Widgets/NIconButton.qml | 2 +- Widgets/NImageCircled.qml | 2 +- Widgets/NImageRounded.qml | 2 +- Widgets/NSearchableComboBox.qml | 2 +- Widgets/NSpinBox.qml | 4 ++-- 33 files changed, 68 insertions(+), 67 deletions(-) diff --git a/Modules/Bar/Bluetooth/BluetoothDevicesList.qml b/Modules/Bar/Bluetooth/BluetoothDevicesList.qml index 5e6a71092..f40b13e1b 100644 --- a/Modules/Bar/Bluetooth/BluetoothDevicesList.qml +++ b/Modules/Bar/Bluetooth/BluetoothDevicesList.qml @@ -67,7 +67,7 @@ ColumnLayout { // One device BT icon NIcon { icon: BluetoothService.getDeviceIcon(modelData) - font.pointSize: Style.fontSizeXXL * scaling + pointSize: Style.fontSizeXXL * scaling color: getContentColor(Color.mOnSurface) Layout.alignment: Qt.AlignVCenter } @@ -110,7 +110,7 @@ ColumnLayout { NIcon { visible: modelData.signalStrength > 0 && !modelData.pairing && !modelData.blocked text: BluetoothService.getSignalIcon(modelData) - font.pointSize: Style.fontSizeXS * scaling + pointSize: Style.fontSizeXS * scaling color: getContentColor(Color.mOnSurface) } diff --git a/Modules/Bar/Bluetooth/BluetoothPanel.qml b/Modules/Bar/Bluetooth/BluetoothPanel.qml index 46ad20467..c11d38eb7 100644 --- a/Modules/Bar/Bluetooth/BluetoothPanel.qml +++ b/Modules/Bar/Bluetooth/BluetoothPanel.qml @@ -30,7 +30,7 @@ NPanel { NIcon { icon: "bluetooth" - font.pointSize: Style.fontSizeXXL * scaling + pointSize: Style.fontSizeXXL * scaling color: Color.mPrimary } @@ -88,7 +88,7 @@ NPanel { NIcon { icon: "bluetooth-off" - font.pointSize: 64 * scaling + pointSize: 64 * scaling color: Color.mOnSurfaceVariant Layout.alignment: Qt.AlignHCenter } @@ -186,7 +186,7 @@ NPanel { NIcon { icon: "refresh" - font.pointSize: Style.fontSizeXXL * 1.5 * scaling + pointSize: Style.fontSizeXXL * 1.5 * scaling color: Color.mPrimary RotationAnimation on rotation { diff --git a/Modules/Bar/Extras/BarPillHorizontal.qml b/Modules/Bar/Extras/BarPillHorizontal.qml index 2bdd1f1dd..95f95b157 100644 --- a/Modules/Bar/Extras/BarPillHorizontal.qml +++ b/Modules/Bar/Extras/BarPillHorizontal.qml @@ -126,7 +126,7 @@ Item { NIcon { icon: root.icon - font.pointSize: iconSize + pointSize: iconSize color: hovered ? Color.mOnTertiary : Color.mOnSurface // Center horizontally x: (iconCircle.width - width) / 2 diff --git a/Modules/Bar/Extras/BarPillVertical.qml b/Modules/Bar/Extras/BarPillVertical.qml index 5bdf75c39..d37f454d8 100644 --- a/Modules/Bar/Extras/BarPillVertical.qml +++ b/Modules/Bar/Extras/BarPillVertical.qml @@ -151,7 +151,7 @@ Item { NIcon { icon: root.icon - font.pointSize: iconSize + pointSize: iconSize color: hovered ? Color.mOnTertiary : Color.mOnSurface // Center horizontally x: (iconCircle.width - width) / 2 diff --git a/Modules/Bar/Extras/TrayMenu.qml b/Modules/Bar/Extras/TrayMenu.qml index b78e31230..415333fd4 100644 --- a/Modules/Bar/Extras/TrayMenu.qml +++ b/Modules/Bar/Extras/TrayMenu.qml @@ -175,7 +175,7 @@ PopupWindow { NIcon { icon: modelData?.hasChildren ? "menu" : "" - font.pointSize: Style.fontSizeS * scaling + pointSize: Style.fontSizeS * scaling verticalAlignment: Text.AlignVCenter visible: modelData?.hasChildren ?? false color: (mouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface) diff --git a/Modules/Bar/WiFi/WiFiPanel.qml b/Modules/Bar/WiFi/WiFiPanel.qml index e205e8bea..4bd32b475 100644 --- a/Modules/Bar/WiFi/WiFiPanel.qml +++ b/Modules/Bar/WiFi/WiFiPanel.qml @@ -35,7 +35,7 @@ NPanel { NIcon { icon: Settings.data.network.wifiEnabled ? "wifi" : "wifi-off" - font.pointSize: Style.fontSizeXXL * scaling + pointSize: Style.fontSizeXXL * scaling color: Settings.data.network.wifiEnabled ? Color.mPrimary : Color.mOnSurfaceVariant } @@ -92,7 +92,7 @@ NPanel { NIcon { icon: "warning" - font.pointSize: Style.fontSizeL * scaling + pointSize: Style.fontSizeL * scaling color: Color.mError } @@ -130,7 +130,7 @@ NPanel { NIcon { icon: "wifi-off" - font.pointSize: 64 * scaling + pointSize: 64 * scaling color: Color.mOnSurfaceVariant Layout.alignment: Qt.AlignHCenter } @@ -242,7 +242,7 @@ NPanel { NIcon { icon: NetworkService.signalIcon(modelData.signal) - font.pointSize: Style.fontSizeXXL * scaling + pointSize: Style.fontSizeXXL * scaling color: modelData.connected ? Color.mPrimary : Color.mOnSurface } @@ -439,6 +439,7 @@ NPanel { anchors.verticalCenter: parent.verticalCenter anchors.margins: Style.marginS * scaling text: passwordInput + font.family: Settings.data.ui.fontFixed font.pointSize: Style.fontSizeS * scaling color: Color.mOnSurface echoMode: TextInput.Password @@ -508,7 +509,7 @@ NPanel { RowLayout { NIcon { icon: "trash" - font.pointSize: Style.fontSizeL * scaling + pointSize: Style.fontSizeL * scaling color: Color.mError } @@ -557,7 +558,7 @@ NPanel { NIcon { icon: "search" - font.pointSize: 64 * scaling + pointSize: 64 * scaling color: Color.mOnSurfaceVariant Layout.alignment: Qt.AlignHCenter } diff --git a/Modules/Bar/Widgets/MediaMini.qml b/Modules/Bar/Widgets/MediaMini.qml index 98aadcddf..f1a32669a 100644 --- a/Modules/Bar/Widgets/MediaMini.qml +++ b/Modules/Bar/Widgets/MediaMini.qml @@ -157,7 +157,7 @@ Item { NIcon { id: windowIcon icon: MediaService.isPlaying ? "media-pause" : "media-play" - font.pointSize: Style.fontSizeL * scaling + pointSize: Style.fontSizeL * scaling verticalAlignment: Text.AlignVCenter Layout.alignment: Qt.AlignVCenter visible: !showAlbumArt && getTitle() !== "" && !trackArt.visible @@ -342,7 +342,7 @@ Item { id: mediaIconVertical anchors.fill: parent icon: MediaService.isPlaying ? "media-pause" : "media-play" - font.pointSize: Style.fontSizeL * scaling + pointSize: Style.fontSizeL * scaling verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter } diff --git a/Modules/Bar/Widgets/SystemMonitor.qml b/Modules/Bar/Widgets/SystemMonitor.qml index a10909366..2d18b8b5e 100644 --- a/Modules/Bar/Widgets/SystemMonitor.qml +++ b/Modules/Bar/Widgets/SystemMonitor.qml @@ -106,7 +106,7 @@ Rectangle { NIcon { icon: "cpu-usage" - font.pointSize: iconSize + pointSize: iconSize Layout.alignment: Qt.AlignCenter Layout.row: isVertical ? 1 : 0 Layout.column: 0 @@ -147,7 +147,7 @@ Rectangle { NIcon { icon: "cpu-temperature" - font.pointSize: iconSize + pointSize: iconSize Layout.alignment: Qt.AlignCenter Layout.row: isVertical ? 1 : 0 Layout.column: 0 @@ -188,7 +188,7 @@ Rectangle { NIcon { icon: "memory" - font.pointSize: iconSize + pointSize: iconSize Layout.alignment: Qt.AlignCenter Layout.row: isVertical ? 1 : 0 Layout.column: 0 @@ -229,7 +229,7 @@ Rectangle { NIcon { icon: "download-speed" - font.pointSize: iconSize + pointSize: iconSize Layout.alignment: Qt.AlignCenter Layout.row: isVertical ? 1 : 0 Layout.column: 0 @@ -270,7 +270,7 @@ Rectangle { NIcon { icon: "upload-speed" - font.pointSize: iconSize + pointSize: iconSize Layout.alignment: Qt.AlignCenter Layout.row: isVertical ? 1 : 0 Layout.column: 0 @@ -311,7 +311,7 @@ Rectangle { NIcon { icon: "storage" - font.pointSize: iconSize + pointSize: iconSize Layout.alignment: Qt.AlignCenter Layout.row: isVertical ? 1 : 0 Layout.column: 0 diff --git a/Modules/ControlCenter/Cards/MediaCard.qml b/Modules/ControlCenter/Cards/MediaCard.qml index da223e5be..be99ef13d 100644 --- a/Modules/ControlCenter/Cards/MediaCard.qml +++ b/Modules/ControlCenter/Cards/MediaCard.qml @@ -28,7 +28,7 @@ NBox { NIcon { icon: "disc" - font.pointSize: Style.fontSizeXXXL * 3 * scaling + pointSize: Style.fontSizeXXXL * 3 * scaling color: Color.mPrimary Layout.alignment: Qt.AlignHCenter } @@ -68,7 +68,7 @@ NBox { NIcon { icon: "caret-down" - font.pointSize: Style.fontSizeXXL * scaling + pointSize: Style.fontSizeXXL * scaling color: Color.mOnSurfaceVariant } @@ -147,7 +147,7 @@ NBox { NIcon { icon: "disc" color: Color.mPrimary - font.pointSize: Style.fontSizeXXXL * 3 * scaling + pointSize: Style.fontSizeXXXL * 3 * scaling visible: !trackArt.visible anchors.centerIn: parent } diff --git a/Modules/ControlCenter/Cards/WeatherCard.qml b/Modules/ControlCenter/Cards/WeatherCard.qml index 1bda1b822..778d277b5 100644 --- a/Modules/ControlCenter/Cards/WeatherCard.qml +++ b/Modules/ControlCenter/Cards/WeatherCard.qml @@ -24,7 +24,7 @@ NBox { NIcon { Layout.alignment: Qt.AlignVCenter icon: weatherReady ? LocationService.weatherSymbolFromCode(LocationService.data.weather.current_weather.weathercode) : "" - font.pointSize: Style.fontSizeXXXL * 1.75 * scaling + pointSize: Style.fontSizeXXXL * 1.75 * scaling color: Color.mPrimary } @@ -96,7 +96,7 @@ NBox { NIcon { Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter icon: LocationService.weatherSymbolFromCode(LocationService.data.weather.daily.weathercode[index]) - font.pointSize: Style.fontSizeXXL * 1.6 * scaling + pointSize: Style.fontSizeXXL * 1.6 * scaling color: Color.mPrimary } NText { diff --git a/Modules/Dock/Dock.qml b/Modules/Dock/Dock.qml index 4d2158c06..57df42ec8 100644 --- a/Modules/Dock/Dock.qml +++ b/Modules/Dock/Dock.qml @@ -417,7 +417,7 @@ Variants { anchors.centerIn: parent visible: !appIcon.visible icon: "question-mark" - font.pointSize: iconSize * 0.7 + pointSize: iconSize * 0.7 color: appButton.isActive ? Color.mPrimary : Color.mOnSurfaceVariant opacity: appButton.isRunning ? 1.0 : 0.6 scale: appButton.hovered ? 1.15 : 1.0 diff --git a/Modules/Dock/DockMenu.qml b/Modules/Dock/DockMenu.qml index 90388e3ad..30de31e47 100644 --- a/Modules/Dock/DockMenu.qml +++ b/Modules/Dock/DockMenu.qml @@ -189,7 +189,7 @@ PopupWindow { NIcon { icon: "eye" - font.pointSize: Style.fontSizeL * scaling + pointSize: Style.fontSizeL * scaling color: root.hoveredItem === 0 ? Color.mOnTertiary : Color.mOnSurfaceVariant Layout.alignment: Qt.AlignVCenter } @@ -222,7 +222,7 @@ PopupWindow { return "pin" return root.isAppPinned(root.toplevel.appId) ? "unpin" : "pin" } - font.pointSize: Style.fontSizeL * scaling + pointSize: Style.fontSizeL * scaling color: root.hoveredItem === 1 ? Color.mOnTertiary : Color.mOnSurfaceVariant Layout.alignment: Qt.AlignVCenter } @@ -255,7 +255,7 @@ PopupWindow { NIcon { icon: "close" - font.pointSize: Style.fontSizeL * scaling + pointSize: Style.fontSizeL * scaling color: root.hoveredItem === 2 ? Color.mOnTertiary : Color.mOnSurfaceVariant Layout.alignment: Qt.AlignVCenter } diff --git a/Modules/LockScreen/LockScreen.qml b/Modules/LockScreen/LockScreen.qml index de7bdc212..70868d85f 100644 --- a/Modules/LockScreen/LockScreen.qml +++ b/Modules/LockScreen/LockScreen.qml @@ -400,7 +400,7 @@ Loader { } NIcon { icon: "keyboard" - font.pointSize: Style.fontSizeM * scaling + pointSize: Style.fontSizeM * scaling color: Color.mOnSurface } } @@ -410,7 +410,7 @@ Loader { visible: batteryIndicator.batteryVisible NIcon { icon: BatteryService.getIcon(batteryIndicator.percent, batteryIndicator.charging, batteryIndicator.isReady) - font.pointSize: Style.fontSizeM * scaling + pointSize: Style.fontSizeM * scaling color: batteryIndicator.charging ? Color.mPrimary : Color.mOnSurface rotation: -90 } @@ -882,7 +882,7 @@ Loader { id: iconPower anchors.centerIn: parent icon: "shutdown" - font.pointSize: Style.fontSizeXXXL * scaling + pointSize: Style.fontSizeXXXL * scaling color: powerButtonArea.containsMouse ? Color.mOnError : Color.mError } @@ -934,7 +934,7 @@ Loader { id: iconReboot anchors.centerIn: parent icon: "reboot" - font.pointSize: Style.fontSizeXXXL * scaling + pointSize: Style.fontSizeXXXL * scaling color: restartButtonArea.containsMouse ? Color.mOnPrimary : Color.mPrimary } @@ -987,7 +987,7 @@ Loader { id: iconSuspend anchors.centerIn: parent icon: "suspend" - font.pointSize: Style.fontSizeXXXL * scaling + pointSize: Style.fontSizeXXXL * scaling color: suspendButtonArea.containsMouse ? Color.mOnSecondary : Color.mSecondary } diff --git a/Modules/Notification/NotificationHistoryPanel.qml b/Modules/Notification/NotificationHistoryPanel.qml index 5b0f56273..3bdcdbd4c 100644 --- a/Modules/Notification/NotificationHistoryPanel.qml +++ b/Modules/Notification/NotificationHistoryPanel.qml @@ -32,7 +32,7 @@ NPanel { NIcon { icon: "bell" - font.pointSize: Style.fontSizeXXL * scaling + pointSize: Style.fontSizeXXL * scaling color: Color.mPrimary } @@ -88,7 +88,7 @@ NPanel { NIcon { icon: "bell-off" - font.pointSize: 64 * scaling + pointSize: 64 * scaling color: Color.mOnSurfaceVariant Layout.alignment: Qt.AlignHCenter } diff --git a/Modules/OSD/OSD.qml b/Modules/OSD/OSD.qml index 8b33101bb..605aea37e 100644 --- a/Modules/OSD/OSD.qml +++ b/Modules/OSD/OSD.qml @@ -253,7 +253,7 @@ Variants { NIcon { icon: root.getIcon() color: root.getIconColor() - font.pointSize: Style.fontSizeXL * root.scaling + pointSize: Style.fontSizeXL * root.scaling Layout.alignment: Qt.AlignVCenter Behavior on color { @@ -389,7 +389,7 @@ Variants { NIcon { icon: root.getIcon() color: root.getIconColor() - font.pointSize: Style.fontSizeXL * root.scaling + pointSize: Style.fontSizeXL * root.scaling Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom Layout.bottomMargin: vMargin + Math.round(Style.marginM * root.scaling) + balanceDelta Behavior on color { diff --git a/Modules/SessionMenu/SessionMenu.qml b/Modules/SessionMenu/SessionMenu.qml index 7fda6a035..039c2c985 100644 --- a/Modules/SessionMenu/SessionMenu.qml +++ b/Modules/SessionMenu/SessionMenu.qml @@ -385,7 +385,7 @@ NPanel { return Color.mOnTertiary return Color.mOnSurface } - font.pointSize: Style.fontSizeXXXL * scaling + pointSize: Style.fontSizeXXXL * scaling width: Style.baseWidgetSize * 0.6 * scaling horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter diff --git a/Modules/Settings/SettingsPanel.qml b/Modules/Settings/SettingsPanel.qml index 4a5706b8e..6b7a66190 100644 --- a/Modules/Settings/SettingsPanel.qml +++ b/Modules/Settings/SettingsPanel.qml @@ -396,7 +396,7 @@ NPanel { NIcon { icon: modelData.icon color: tabTextColor - font.pointSize: Style.fontSizeXL * scaling + pointSize: Style.fontSizeXL * scaling } // Tab label @@ -456,7 +456,7 @@ NPanel { NIcon { icon: root.tabsModel[currentTabIndex]?.icon color: Color.mPrimary - font.pointSize: Style.fontSizeXXL * scaling + pointSize: Style.fontSizeXXL * scaling } // Main title diff --git a/Modules/Settings/Tabs/AboutTab.qml b/Modules/Settings/Tabs/AboutTab.qml index 22566118e..fb2eaafff 100644 --- a/Modules/Settings/Tabs/AboutTab.qml +++ b/Modules/Settings/Tabs/AboutTab.qml @@ -91,7 +91,7 @@ ColumnLayout { NIcon { icon: "download" - font.pointSize: Style.fontSizeXXL * scaling + pointSize: Style.fontSizeXXL * scaling color: updateArea.containsMouse ? Color.mSurface : Color.mPrimary } diff --git a/Modules/Settings/Tabs/ColorSchemeTab.qml b/Modules/Settings/Tabs/ColorSchemeTab.qml index b57f0041c..5855d7551 100644 --- a/Modules/Settings/Tabs/ColorSchemeTab.qml +++ b/Modules/Settings/Tabs/ColorSchemeTab.qml @@ -326,7 +326,7 @@ ColumnLayout { NIcon { icon: "check" - font.pointSize: Style.fontSizeM * scaling + pointSize: Style.fontSizeM * scaling font.weight: Style.fontWeightBold color: Color.mOnSecondary anchors.centerIn: parent diff --git a/Modules/Toast/SimpleToast.qml b/Modules/Toast/SimpleToast.qml index cde497ce4..339e09c64 100644 --- a/Modules/Toast/SimpleToast.qml +++ b/Modules/Toast/SimpleToast.qml @@ -100,7 +100,7 @@ Rectangle { return Color.mOnSurface } } - font.pointSize: Style.fontSizeXXL * 1.5 * scaling + pointSize: Style.fontSizeXXL * 1.5 * scaling Layout.alignment: Qt.AlignVCenter } diff --git a/Modules/Wallpaper/WallpaperPanel.qml b/Modules/Wallpaper/WallpaperPanel.qml index 1d7095b9a..46c324172 100644 --- a/Modules/Wallpaper/WallpaperPanel.qml +++ b/Modules/Wallpaper/WallpaperPanel.qml @@ -52,7 +52,7 @@ NPanel { NIcon { icon: "settings-wallpaper-selector" - font.pointSize: Style.fontSizeXXL * scaling + pointSize: Style.fontSizeXXL * scaling color: Color.mPrimary } @@ -367,7 +367,7 @@ NPanel { NIcon { icon: "check" - font.pointSize: Style.fontSizeM * scaling + pointSize: Style.fontSizeM * scaling font.weight: Style.fontWeightBold color: Color.mOnSecondary anchors.centerIn: parent @@ -443,7 +443,7 @@ NPanel { } NIcon { icon: "folder-open" - font.pointSize: Style.fontSizeXXL * scaling + pointSize: Style.fontSizeXXL * scaling color: Color.mOnSurface Layout.alignment: Qt.AlignHCenter } diff --git a/Widgets/NButton.qml b/Widgets/NButton.qml index d6f6335eb..93390ce94 100644 --- a/Widgets/NButton.qml +++ b/Widgets/NButton.qml @@ -79,7 +79,7 @@ Rectangle { Layout.alignment: Qt.AlignVCenter visible: root.icon !== "" icon: root.icon - font.pointSize: root.iconSize + pointSize: root.iconSize color: { if (!root.enabled) return Color.mOnSurfaceVariant diff --git a/Widgets/NCheckbox.qml b/Widgets/NCheckbox.qml index b9c2ae64d..4ea76318d 100644 --- a/Widgets/NCheckbox.qml +++ b/Widgets/NCheckbox.qml @@ -60,7 +60,7 @@ RowLayout { anchors.horizontalCenterOffset: -1 * scaling icon: "check" color: root.activeOnColor - font.pointSize: Math.max(Style.fontSizeXS, root.baseSize * 0.5) * scaling + pointSize: Math.max(Style.fontSizeXS, root.baseSize * 0.5) * scaling font.weight: Style.fontWeightBold } diff --git a/Widgets/NCircleStat.qml b/Widgets/NCircleStat.qml index 074ea51d2..676681849 100644 --- a/Widgets/NCircleStat.qml +++ b/Widgets/NCircleStat.qml @@ -102,7 +102,7 @@ Rectangle { anchors.centerIn: parent icon: root.icon color: Color.mOnPrimary - font.pointSize: Style.fontSizeM * scaling + pointSize: Style.fontSizeM * scaling horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } diff --git a/Widgets/NCollapsible.qml b/Widgets/NCollapsible.qml index 6cc4b34bd..2efd3f012 100644 --- a/Widgets/NCollapsible.qml +++ b/Widgets/NCollapsible.qml @@ -82,7 +82,7 @@ ColumnLayout { NIcon { id: chevronIcon icon: "chevron-right" - font.pointSize: Style.fontSizeL * scaling + pointSize: Style.fontSizeL * scaling color: root.expanded ? Color.mOnSecondary : Color.mOnSurfaceVariant Layout.alignment: Qt.AlignVCenter diff --git a/Widgets/NComboBox.qml b/Widgets/NComboBox.qml index c8d746cd8..a7a054b5a 100644 --- a/Widgets/NComboBox.qml +++ b/Widgets/NComboBox.qml @@ -100,7 +100,7 @@ RowLayout { x: combo.width - width - Style.marginM * scaling y: combo.topPadding + (combo.availableHeight - height) / 2 icon: "caret-down" - font.pointSize: Style.fontSizeL * scaling + pointSize: Style.fontSizeL * scaling } popup: Popup { diff --git a/Widgets/NContextMenu.qml b/Widgets/NContextMenu.qml index e5bebeeed..55d0f6aef 100644 --- a/Widgets/NContextMenu.qml +++ b/Widgets/NContextMenu.qml @@ -62,7 +62,7 @@ Popup { NIcon { visible: modelData.icon !== undefined icon: modelData.icon || "" - font.pointSize: Style.fontSizeM * scaling + pointSize: Style.fontSizeM * scaling color: menuItem.hovered && menuItem.enabled ? Color.mOnTertiary : Color.mOnSurface Layout.leftMargin: root.itemPadding diff --git a/Widgets/NFilePicker.qml b/Widgets/NFilePicker.qml index 3a9e026c5..24922ec7a 100644 --- a/Widgets/NFilePicker.qml +++ b/Widgets/NFilePicker.qml @@ -191,7 +191,7 @@ Popup { NIcon { icon: "filepicker-folder" color: Color.mPrimary - font.pointSize: Style.fontSizeXXL * scaling + pointSize: Style.fontSizeXXL * scaling } NText { text: root.title @@ -357,7 +357,7 @@ Popup { NIcon { icon: "filepicker-search" color: Color.mOnSurfaceVariant - font.pointSize: Style.fontSizeS * scaling + pointSize: Style.fontSizeS * scaling } NTextInput { id: searchInput @@ -588,7 +588,7 @@ Popup { visible: thumbnail.status === Image.Loading NIcon { icon: "filepicker-photo" - font.pointSize: Style.fontSizeL * scaling + pointSize: Style.fontSizeL * scaling color: Color.mOnSurfaceVariant anchors.centerIn: parent } @@ -597,7 +597,7 @@ Popup { NIcon { icon: model.fileIsDir ? "filepicker-folder" : root.getFileIcon(model.fileName) - font.pointSize: Style.fontSizeXXL * 2 * scaling + pointSize: Style.fontSizeXXL * 2 * scaling color: { if (isSelected) return Color.mSecondary @@ -623,7 +623,7 @@ Popup { visible: isSelected NIcon { icon: "filepicker-check" - font.pointSize: Style.fontSizeS * scaling + pointSize: Style.fontSizeS * scaling font.weight: Style.fontWeightBold color: Color.mOnSecondary anchors.centerIn: parent @@ -728,7 +728,7 @@ Popup { NIcon { icon: model.fileIsDir ? "filepicker-folder" : root.getFileIcon(model.fileName) - font.pointSize: Style.fontSizeL * scaling + pointSize: Style.fontSizeL * scaling color: model.fileIsDir ? (filePickerPanel.currentSelection.includes(model.filePath) ? Color.mOnSecondary : Color.mPrimary) : Color.mOnSurfaceVariant } diff --git a/Widgets/NIconButton.qml b/Widgets/NIconButton.qml index 290fb00be..d533153cc 100644 --- a/Widgets/NIconButton.qml +++ b/Widgets/NIconButton.qml @@ -48,7 +48,7 @@ Rectangle { NIcon { icon: root.icon - font.pointSize: Math.max(1, root.compact ? root.width * 0.65 : root.width * 0.48) + pointSize: Math.max(1, root.compact ? root.width * 0.65 : root.width * 0.48) color: root.enabled && root.hovering ? colorFgHover : colorFg // Center horizontally x: (root.width - width) / 2 diff --git a/Widgets/NImageCircled.qml b/Widgets/NImageCircled.qml index 57ff3db41..eb0ee9bd8 100644 --- a/Widgets/NImageCircled.qml +++ b/Widgets/NImageCircled.qml @@ -58,7 +58,7 @@ Rectangle { sourceComponent: NIcon { anchors.centerIn: parent icon: fallbackIcon - font.pointSize: fallbackIconSize + pointSize: fallbackIconSize z: 0 } } diff --git a/Widgets/NImageRounded.qml b/Widgets/NImageRounded.qml index d73069581..ff55a571d 100644 --- a/Widgets/NImageRounded.qml +++ b/Widgets/NImageRounded.qml @@ -78,7 +78,7 @@ Rectangle { sourceComponent: NIcon { anchors.centerIn: parent icon: fallbackIcon - font.pointSize: fallbackIconSize + pointSize: fallbackIconSize z: 0 } } diff --git a/Widgets/NSearchableComboBox.qml b/Widgets/NSearchableComboBox.qml index 736511a38..3175f1268 100644 --- a/Widgets/NSearchableComboBox.qml +++ b/Widgets/NSearchableComboBox.qml @@ -149,7 +149,7 @@ RowLayout { x: combo.width - width - Style.marginM * scaling y: combo.topPadding + (combo.availableHeight - height) / 2 icon: "caret-down" - font.pointSize: Style.fontSizeL * scaling + pointSize: Style.fontSizeL * scaling } popup: Popup { diff --git a/Widgets/NSpinBox.qml b/Widgets/NSpinBox.qml index b84f3ec7c..697cb056b 100644 --- a/Widgets/NSpinBox.qml +++ b/Widgets/NSpinBox.qml @@ -154,7 +154,7 @@ RowLayout { anchors.leftMargin: parent.width * 0.25 anchors.verticalCenter: parent.verticalCenter icon: "chevron-left" - font.pointSize: Style.fontSizeS * scaling + pointSize: Style.fontSizeS * scaling color: decreaseArea.containsMouse ? Color.mOnTertiary : Color.mPrimary } @@ -250,7 +250,7 @@ RowLayout { anchors.rightMargin: parent.width * 0.25 anchors.verticalCenter: parent.verticalCenter icon: "chevron-right" - font.pointSize: Style.fontSizeS * scaling + pointSize: Style.fontSizeS * scaling color: increaseArea.containsMouse ? Color.mOnTertiary : Color.mPrimary }