More pointSize cleanup

This commit is contained in:
ItsLemmy
2025-09-30 07:44:03 -04:00
parent 0a893f9c5f
commit 43dee793de
33 changed files with 68 additions and 67 deletions
@@ -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)
}
+3 -3
View File
@@ -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 {
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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)
+7 -6
View File
@@ -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
}
+2 -2
View File
@@ -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
}
+6 -6
View File
@@ -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
+3 -3
View File
@@ -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
}
+2 -2
View File
@@ -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 {
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
}
+5 -5
View File
@@ -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
}
@@ -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
}
+2 -2
View File
@@ -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 {
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -91,7 +91,7 @@ ColumnLayout {
NIcon {
icon: "download"
font.pointSize: Style.fontSizeXXL * scaling
pointSize: Style.fontSizeXXL * scaling
color: updateArea.containsMouse ? Color.mSurface : Color.mPrimary
}
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
}
+3 -3
View File
@@ -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
}
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
}
+1 -1
View File
@@ -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
}
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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 {
+1 -1
View File
@@ -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
+6 -6
View File
@@ -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
}
+1 -1
View File
@@ -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
+1 -1
View File
@@ -58,7 +58,7 @@ Rectangle {
sourceComponent: NIcon {
anchors.centerIn: parent
icon: fallbackIcon
font.pointSize: fallbackIconSize
pointSize: fallbackIconSize
z: 0
}
}
+1 -1
View File
@@ -78,7 +78,7 @@ Rectangle {
sourceComponent: NIcon {
anchors.centerIn: parent
icon: fallbackIcon
font.pointSize: fallbackIconSize
pointSize: fallbackIconSize
z: 0
}
}
+1 -1
View File
@@ -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 {
+2 -2
View File
@@ -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
}