zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2026-08-15 18:43:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Scaling: Replaced all Theme.uiScale by Theme.scale(Screen) so stuff scale accordingly to the Screen used by the Item/component

Browse Source
This commit is contained in:
quadbyte
2025-08-07 14:09:18 -04:00
parent 3148dc62a0
commit cb74b6e5d5
50 changed files with 564 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Bar/Modules/ActiveWindow.qml
+2 -2
View File
@@ -17,7 +17,7 @@ PanelWindow {
visible: Settings.settings.showActiveWindow && !activeWindowWrapper.finallyHidden
implicitHeight: activeWindowTitleContainer.height
implicitWidth: 0
property int barHeight: 36 * Theme.uiScale
property int barHeight: 36 * Theme.scale(Screen)
color: "transparent"
function getIcon() {
@@ -127,7 +127,7 @@ PanelWindow {
Text {
id: activeWindowTitle
text: ToplevelManager?.activeToplevel?.title && ToplevelManager?.activeToplevel?.title.length > 60 ? ToplevelManager?.activeToplevel?.title.substring(0, 60) + "..." : ToplevelManager?.activeToplevel?.title || ""
font.pixelSize: 12 * Theme.uiScale
font.pixelSize: 12 * Theme.scale(Screen)
color: Theme.textSecondary
anchors.left: icon.right
anchors.leftMargin: Settings.settings.showActiveWindowIcon ? 4 : 6
Bar/Modules/Applauncher.qml
+7 -7
View File
@@ -532,7 +532,7 @@ PanelWithOverlay {
Text {
text: "search"
font.family: "Material Symbols Outlined"
font.pixelSize: Theme.fontSizeHeader * Theme.uiScale
font.pixelSize: Theme.fontSizeHeader * Theme.scale(Screen)
color: searchField.activeFocus ? Theme.accentPrimary : Theme.textSecondary
verticalAlignment: Text.AlignVCenter
Layout.alignment: Qt.AlignVCenter
@@ -545,7 +545,7 @@ PanelWithOverlay {
placeholderTextColor: Theme.textSecondary
background: null
font.family: Theme.fontFamily
font.pixelSize: Theme.fontSizeBody * Theme.uiScale
font.pixelSize: Theme.fontSizeBody * Theme.scale(Screen)
Layout.fillWidth: true
Layout.alignment: Qt.AlignVCenter
onTextChanged: root.updateFilter()
@@ -689,7 +689,7 @@ PanelWithOverlay {
visible: !modelData.isCalculator && !modelData.isClipboard && !modelData.isCommand && !parent.iconLoaded && modelData.type !== 'image'
text: "broken_image"
font.family: "Material Symbols Outlined"
font.pixelSize: Theme.fontSizeHeader * Theme.uiScale
font.pixelSize: Theme.fontSizeHeader * Theme.scale(Screen)
color: Theme.accentPrimary
}
}
@@ -702,7 +702,7 @@ PanelWithOverlay {
text: modelData.name
color: (hovered || isSelected) ? Theme.onAccent : (appLauncherPanel.isPinned(modelData) ? Theme.textPrimary : Theme.textPrimary)
font.family: Theme.fontFamily
font.pixelSize: Theme.fontSizeSmall * Theme.uiScale
font.pixelSize: Theme.fontSizeSmall * Theme.scale(Screen)
font.bold: hovered || isSelected
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
@@ -716,7 +716,7 @@ PanelWithOverlay {
(modelData.comment || modelData.genericName || "No description available")
color: (hovered || isSelected) ? Theme.onAccent : (appLauncherPanel.isPinned(modelData) ? Theme.textSecondary : Theme.textSecondary)
font.family: Theme.fontFamily
font.pixelSize: Theme.fontSizeCaption * Theme.uiScale
font.pixelSize: Theme.fontSizeCaption * Theme.scale(Screen)
font.italic: !(modelData.comment || modelData.genericName)
opacity: modelData.isClipboard ? 0.8 : modelData.isCommand ? 0.9 : ((modelData.comment || modelData.genericName) ? 1.0 : 0.6)
elide: Text.ElideRight
@@ -734,7 +734,7 @@ PanelWithOverlay {
Text {
text: modelData.isCalculator ? "content_copy" : "chevron_right"
font.family: "Material Symbols Outlined"
font.pixelSize: Theme.fontSizeBody * Theme.uiScale
font.pixelSize: Theme.fontSizeBody * Theme.scale(Screen)
color: (hovered || isSelected)
? Theme.onAccent
: (appLauncherPanel.isPinned(modelData) ? Theme.textPrimary : Theme.textSecondary)
@@ -818,7 +818,7 @@ PanelWithOverlay {
anchors.centerIn: parent
text: "star"
font.family: "Material Symbols Outlined"
font.pixelSize: Theme.fontSizeSmall * Theme.uiScale
font.pixelSize: Theme.fontSizeSmall * Theme.scale(Screen)
color: (parent.MouseArea.containsMouse || hovered || isSelected)
? Theme.onAccent
: (appLauncherPanel.isPinned(modelData) ? Theme.textPrimary : Theme.textDisabled)
Bar/Modules/AudioDeviceSelector.qml
+10 -10
View File
@@ -155,7 +155,7 @@ PanelWithOverlay {
Text {
text: "volume_up"
font.family: "Material Symbols Outlined"
font.pixelSize: 16 * Theme.uiScale
font.pixelSize: 16 * Theme.scale(Screen)
color: (Pipewire.defaultAudioSink && Pipewire.defaultAudioSink.id === modelData.id) ? Theme.accentPrimary : Theme.textPrimary
Layout.alignment: Qt.AlignVCenter
}
@@ -168,7 +168,7 @@ PanelWithOverlay {
Text {
text: modelData.nickname || modelData.description || modelData.name
font.bold: true
font.pixelSize: 12 * Theme.uiScale
font.pixelSize: 12 * Theme.scale(Screen)
color: (Pipewire.defaultAudioSink && Pipewire.defaultAudioSink.id === modelData.id) ? Theme.accentPrimary : Theme.textPrimary
elide: Text.ElideRight
maximumLineCount: 1
@@ -177,7 +177,7 @@ PanelWithOverlay {
Text {
text: modelData.description !== modelData.nickname ? modelData.description : ""
font.pixelSize: 10 * Theme.uiScale
font.pixelSize: 10 * Theme.scale(Screen)
color: Theme.textSecondary
elide: Text.ElideRight
maximumLineCount: 1
@@ -200,7 +200,7 @@ PanelWithOverlay {
anchors.centerIn: parent
text: "Set"
color: Theme.onAccent
font.pixelSize: 10 * Theme.uiScale
font.pixelSize: 10 * Theme.scale(Screen)
font.bold: true
}
@@ -216,7 +216,7 @@ PanelWithOverlay {
text: "(Current)"
visible: Pipewire.defaultAudioSink && Pipewire.defaultAudioSink.id === modelData.id
color: Theme.accentPrimary
font.pixelSize: 10 * Theme.uiScale
font.pixelSize: 10 * Theme.scale(Screen)
Layout.alignment: Qt.AlignVCenter
}
@@ -267,7 +267,7 @@ PanelWithOverlay {
Text {
text: "mic"
font.family: "Material Symbols Outlined"
font.pixelSize: 16 * Theme.uiScale
font.pixelSize: 16 * Theme.scale(Screen)
color: (Pipewire.defaultAudioSource && Pipewire.defaultAudioSource.id === modelData.id) ? Theme.accentPrimary : Theme.textPrimary
Layout.alignment: Qt.AlignVCenter
}
@@ -280,7 +280,7 @@ PanelWithOverlay {
Text {
text: modelData.nickname || modelData.description || modelData.name
font.bold: true
font.pixelSize: 12 * Theme.uiScale
font.pixelSize: 12 * Theme.scale(Screen)
color: (Pipewire.defaultAudioSource && Pipewire.defaultAudioSource.id === modelData.id) ? Theme.accentPrimary : Theme.textPrimary
elide: Text.ElideRight
maximumLineCount: 1
@@ -289,7 +289,7 @@ PanelWithOverlay {
Text {
text: modelData.description !== modelData.nickname ? modelData.description : ""
font.pixelSize: 10 * Theme.uiScale
font.pixelSize: 10 * Theme.scale(Screen)
color: Theme.textSecondary
elide: Text.ElideRight
maximumLineCount: 1
@@ -312,7 +312,7 @@ PanelWithOverlay {
anchors.centerIn: parent
text: "Set"
color: Theme.onAccent
font.pixelSize: 10 * Theme.uiScale
font.pixelSize: 10 * Theme.scale(Screen)
font.bold: true
}
@@ -328,7 +328,7 @@ PanelWithOverlay {
text: "(Current)"
visible: Pipewire.defaultAudioSource && Pipewire.defaultAudioSource.id === modelData.id
color: Theme.accentPrimary
font.pixelSize: 10 * Theme.uiScale
font.pixelSize: 10 * Theme.scale(Screen)
Layout.alignment: Qt.AlignVCenter
}
Bar/Modules/Bluetooth.qml
+7 -7
View File
@@ -45,7 +45,7 @@ Item {
}
}
font.family: mouseAreaBluetooth.containsMouse ? "Material Symbols Rounded" : "Material Symbols Outlined"
font.pixelSize: 16 * Theme.uiScale
font.pixelSize: 16 * Theme.scale(Screen)
color: mouseAreaBluetooth.containsMouse ? Theme.accentPrimary : Theme.textPrimary
}
@@ -125,13 +125,13 @@ Item {
Text {
text: "bluetooth"
font.family: "Material Symbols Outlined"
font.pixelSize: 24 * Theme.uiScale
font.pixelSize: 24 * Theme.scale(Screen)
color: Theme.accentPrimary
}
Text {
text: "Bluetooth Devices"
font.pixelSize: 18 * Theme.uiScale
font.pixelSize: 18 * Theme.scale(Screen)
font.bold: true
color: Theme.textPrimary
Layout.fillWidth: true
@@ -180,7 +180,7 @@ Item {
Text {
text: modelData.connected ? "bluetooth" : "bluetooth_disabled"
font.family: "Material Symbols Outlined"
font.pixelSize: 18 * Theme.uiScale
font.pixelSize: 18 * Theme.scale(Screen)
color: deviceMouseArea.containsMouse ? Theme.backgroundPrimary : (modelData.connected ? Theme.accentPrimary : Theme.textSecondary)
}
@@ -199,7 +199,7 @@ Item {
return deviceName;
}
color: deviceMouseArea.containsMouse ? Theme.backgroundPrimary : (modelData.connected ? Theme.accentPrimary : Theme.textPrimary)
font.pixelSize: 14 * Theme.uiScale
font.pixelSize: 14 * Theme.scale(Screen)
elide: Text.ElideRight
Layout.fillWidth: true
}
@@ -217,7 +217,7 @@ Item {
}
}
color: deviceMouseArea.containsMouse ? Theme.backgroundPrimary : (modelData.connected ? Theme.accentPrimary : Theme.textSecondary)
font.pixelSize: 11 * Theme.uiScale
font.pixelSize: 11 * Theme.scale(Screen)
elide: Text.ElideRight
Layout.fillWidth: true
}
@@ -265,7 +265,7 @@ Item {
Text {
text: "Scanning for devices..."
font.pixelSize: 12 * Theme.uiScale
font.pixelSize: 12 * Theme.scale(Screen)
color: Theme.textSecondary
}
Bar/Modules/Calendar.qml
+3 -3
View File
@@ -52,7 +52,7 @@ PanelWithOverlay {
text: calendar.title
color: Theme.textPrimary
opacity: 0.7
font.pixelSize: 13 * Theme.uiScale
font.pixelSize: 13 * Theme.scale(Screen)
font.family: Theme.fontFamily
font.bold: true
}
@@ -78,7 +78,7 @@ PanelWithOverlay {
text: shortName
color: Theme.textPrimary
opacity: 0.8
font.pixelSize: 13 * Theme.uiScale
font.pixelSize: 13 * Theme.scale(Screen)
font.family: Theme.fontFamily
font.bold: true
horizontalAlignment: Text.AlignHCenter
@@ -161,7 +161,7 @@ PanelWithOverlay {
text: model.day
color: model.today ? Theme.onAccent : Theme.textPrimary
opacity: model.month === calendar.month ? (mouseArea2.containsMouse ? 1 : 0.7) : 0.3
font.pixelSize: 13 * Theme.uiScale
font.pixelSize: 13 * Theme.scale(Screen)
font.family: Theme.fontFamily
font.bold: model.today ? true : false
}
Bar/Modules/ClockWidget.qml
+1 -1
View File
@@ -15,7 +15,7 @@ Rectangle {
text: Time.time
font.family: Theme.fontFamily
font.weight: Font.Bold
font.pixelSize: Theme.fontSizeSmall * Theme.uiScale
font.pixelSize: Theme.fontSizeSmall * Theme.scale(Screen)
color: Theme.textPrimary
anchors.centerIn: parent
}
Bar/Modules/CustomTrayMenu.qml
+4 -4
View File
@@ -128,7 +128,7 @@ PopupWindow {
color: (modelData?.enabled ?? true) ? bg.hoverTextColor : Theme.textDisabled;
text: modelData?.text ?? "";
font.family: Theme.fontFamily;
font.pixelSize: Theme.fontSizeSmall * Theme.uiScale;
font.pixelSize: Theme.fontSizeSmall * Theme.scale(Screen);
verticalAlignment: Text.AlignVCenter;
elide: Text.ElideRight;
}
@@ -145,7 +145,7 @@ PopupWindow {
// Material Symbols Outlined chevron right for submenu
text: modelData?.hasChildren ? "menu" : "";
font.family: "Material Symbols Outlined";
font.pixelSize: 18 * Theme.uiScale;
font.pixelSize: 18 * Theme.scale(Screen);
verticalAlignment: Text.AlignVCenter;
visible: modelData?.hasChildren ?? false;
color: Theme.textPrimary;
@@ -362,7 +362,7 @@ PopupWindow {
color: (modelData?.enabled ?? true) ? bg.hoverTextColor : Theme.textDisabled;
text: modelData?.text ?? "";
font.family: Theme.fontFamily;
font.pixelSize: Theme.fontSizeSmall * Theme.uiScale;
font.pixelSize: Theme.fontSizeSmall * Theme.scale(Screen);
verticalAlignment: Text.AlignVCenter;
elide: Text.ElideRight;
}
@@ -378,7 +378,7 @@ PopupWindow {
Text {
text: modelData?.hasChildren ? "\uE5CC" : "";
font.family: "Material Symbols Outlined";
font.pixelSize: 18 * Theme.uiScale;
font.pixelSize: 18 * Theme.scale(Screen);
verticalAlignment: Text.AlignVCenter;
visible: modelData?.hasChildren ?? false;
color: Theme.textPrimary;
Bar/Modules/Media.qml
+11 -11
View File
@@ -10,7 +10,7 @@ import qs.Components
Item {
id: mediaControl
width: visible ? mediaRow.width : 0
height: 36 * Theme.uiScale
height: 36 * Theme.scale(Screen)
visible: Settings.settings.showMediaInBar && MusicManager.currentPlayer
RowLayout {
@@ -20,8 +20,8 @@ Item {
Item {
id: albumArtContainer
width: 24 * Theme.uiScale
height: 24 * Theme.uiScale
width: 24 * Theme.scale(Screen)
height: 24 * Theme.scale(Screen)
Layout.alignment: Qt.AlignVCenter
// Circular spectrum visualizer
@@ -29,8 +29,8 @@ Item {
id: spectrum
values: MusicManager.cavaValues
anchors.centerIn: parent
innerRadius: 10 * Theme.uiScale
outerRadius: 18 * Theme.uiScale
innerRadius: 10 * Theme.scale(Screen)
outerRadius: 18 * Theme.scale(Screen)
fillColor: Theme.accentPrimary
strokeColor: Theme.accentPrimary
strokeWidth: 0
@@ -40,10 +40,10 @@ Item {
// Album art image
Rectangle {
id: albumArtwork
width: 20 * Theme.uiScale
height: 20 * Theme.uiScale
width: 20 * Theme.scale(Screen)
height: 20 * Theme.scale(Screen)
anchors.centerIn: parent
radius: 12 * Theme.uiScale // circle
radius: 12 * Theme.scale(Screen) // circle
color: Qt.darker(Theme.surface, 1.1)
border.color: Qt.rgba(Theme.accentPrimary.r, Theme.accentPrimary.g, Theme.accentPrimary.b, 0.3)
border.width: 1
@@ -79,7 +79,7 @@ Item {
anchors.centerIn: parent
text: "music_note"
font.family: "Material Symbols Outlined"
font.pixelSize: 14 * Theme.uiScale
font.pixelSize: 14 * Theme.scale(Screen)
color: Qt.rgba(Theme.textPrimary.r, Theme.textPrimary.g, Theme.textPrimary.b, 0.4)
visible: !albumArt.visible
}
@@ -96,7 +96,7 @@ Item {
anchors.centerIn: parent
text: MusicManager.isPlaying ? "pause" : "play_arrow"
font.family: "Material Symbols Outlined"
font.pixelSize: 14 * Theme.uiScale
font.pixelSize: 14 * Theme.scale(Screen)
color: "white"
}
}
@@ -117,7 +117,7 @@ Item {
text: MusicManager.trackTitle + " - " + MusicManager.trackArtist
color: Theme.textPrimary
font.family: Theme.fontFamily
font.pixelSize: 12 * Theme.uiScale
font.pixelSize: 12 * Theme.scale(Screen)
elide: Text.ElideRight
Layout.maximumWidth: 300
Layout.alignment: Qt.AlignVCenter
Bar/Modules/SettingsButton.qml
+1 -1
View File
@@ -21,7 +21,7 @@ Item {
anchors.centerIn: parent
text: "settings"
font.family: "Material Symbols Outlined"
font.pixelSize: 16 * Theme.uiScale
font.pixelSize: 16 * Theme.scale(Screen)
color: mouseArea.containsMouse ? Theme.accentPrimary : Theme.textPrimary
}
Bar/Modules/SystemInfo.qml
+6 -6
View File
@@ -17,7 +17,7 @@ Row {
Text {
id: cpuUsageIcon
font.family: "Material Symbols Outlined"
font.pixelSize: Theme.fontSizeBody * Theme.uiScale
font.pixelSize: Theme.fontSizeBody * Theme.scale(Screen)
text: "speed"
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
@@ -27,7 +27,7 @@ Row {
Text {
id: cpuUsageText
font.family: Theme.fontFamily
font.pixelSize: Theme.fontSizeSmall * Theme.uiScale
font.pixelSize: Theme.fontSizeSmall * Theme.scale(Screen)
color: Theme.textPrimary
text: Sysinfo.cpuUsageStr
anchors.verticalCenter: parent.verticalCenter
@@ -41,7 +41,7 @@ Row {
spacing: 3
Text {
font.family: "Material Symbols Outlined"
font.pixelSize: Theme.fontSizeBody * Theme.uiScale
font.pixelSize: Theme.fontSizeBody * Theme.scale(Screen)
text: "thermometer"
verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter
@@ -50,7 +50,7 @@ Row {
Text {
font.family: Theme.fontFamily
font.pixelSize: Theme.fontSizeSmall * Theme.uiScale
font.pixelSize: Theme.fontSizeSmall * Theme.scale(Screen)
color: Theme.textPrimary
text: Sysinfo.cpuTempStr
anchors.verticalCenter: parent.verticalCenter
@@ -64,7 +64,7 @@ Row {
spacing: 3
Text {
font.family: "Material Symbols Outlined"
font.pixelSize: Theme.fontSizeBody * Theme.uiScale
font.pixelSize: Theme.fontSizeBody * Theme.scale(Screen)
text: "memory"
color: Theme.accentPrimary
verticalAlignment: Text.AlignVCenter
@@ -73,7 +73,7 @@ Row {
Text {
font.family: Theme.fontFamily
font.pixelSize: Theme.fontSizeSmall * Theme.uiScale
font.pixelSize: Theme.fontSizeSmall * Theme.scale(Screen)
color: Theme.textPrimary
text: Sysinfo.memoryUsageStr
anchors.verticalCenter: parent.verticalCenter
Bar/Modules/SystemTray.qml
+8 -8
View File
@@ -21,8 +21,8 @@ Row {
Repeater {
model: systemTray.items
delegate: Item {
width: 24 * Theme.uiScale
height: 24 * Theme.uiScale
width: 24 * Theme.scale(Screen)
height: 24 * Theme.scale(Screen)
visible: modelData
property bool isHovered: trayMouseArea.containsMouse
@@ -31,17 +31,17 @@ Row {
Rectangle {
anchors.centerIn: parent
width: 16 * Theme.uiScale
height: 16 * Theme.uiScale
radius: 6 * Theme.uiScale
width: 16 * Theme.scale(Screen)
height: 16 * Theme.scale(Screen)
radius: 6 * Theme.scale(Screen)
color: "transparent"
clip: true
IconImage {
id: trayIcon
anchors.centerIn: parent
width: 16 * Theme.uiScale
height: 16 * Theme.uiScale
width: 16 * Theme.scale(Screen)
height: 16 * Theme.scale(Screen)
smooth: false
asynchronous: true
backer.fillMode: Image.PreserveAspectFit
@@ -99,7 +99,7 @@ Row {
if (modelData.hasMenu && modelData.menu && trayMenu) {
// Anchor the menu to the tray icon item (parent) and position it below the icon
const menuX = (width / 2) - (trayMenu.width / 2);
const menuY = height + 20 * Theme.uiScale;
const menuY = height + 20 * Theme.scale(Screen);
trayMenu.menu = modelData.menu;
trayMenu.showAt(parent, menuX, menuY);
} else
Bar/Modules/Taskbar.qml
+1 -1
View File
@@ -83,7 +83,7 @@ Item {
visible: !appIcon.visible
text: appButton.appId ? appButton.appId.charAt(0).toUpperCase() : "?"
font.family: Theme.fontFamily
font.pixelSize: Math.max(10, Settings.settings.taskbarIconSize * 0.4375 * Theme.uiScale)
font.pixelSize: Math.max(10, Settings.settings.taskbarIconSize * 0.4375 * Theme.scale(Screen))
font.bold: true
color: appButton.isActive ? Theme.onAccent : Theme.textPrimary
}
Bar/Modules/Wifi.qml
+12 -12
View File
@@ -51,7 +51,7 @@ Item {
return connected ? network.signalIcon(parent.currentSignal) : "wifi_off"
}
font.family: mouseAreaWifi.containsMouse ? "Material Symbols Rounded" : "Material Symbols Outlined"
font.pixelSize: 16 * Theme.uiScale
font.pixelSize: 16 * Theme.scale(Screen)
color: mouseAreaWifi.containsMouse ? Theme.accentPrimary : Theme.textPrimary
}
@@ -120,13 +120,13 @@ Item {
Text {
text: "wifi"
font.family: "Material Symbols Outlined"
font.pixelSize: 24 * Theme.uiScale
font.pixelSize: 24 * Theme.scale(Screen)
color: Theme.accentPrimary
}
Text {
text: "WiFi Networks"
font.pixelSize: 18 * Theme.uiScale
font.pixelSize: 18 * Theme.scale(Screen)
font.bold: true
color: Theme.textPrimary
Layout.fillWidth: true
@@ -183,7 +183,7 @@ Item {
Text {
text: network.signalIcon(modelData.signal)
font.family: "Material Symbols Outlined"
font.pixelSize: 18 * Theme.uiScale
font.pixelSize: 18 * Theme.scale(Screen)
color: networkMouseArea.containsMouse ? Theme.backgroundPrimary : (modelData.connected ? Theme.accentPrimary : Theme.textSecondary)
}
@@ -194,7 +194,7 @@ Item {
Text {
text: modelData.ssid || "Unknown Network"
color: networkMouseArea.containsMouse ? Theme.backgroundPrimary : (modelData.connected ? Theme.accentPrimary : Theme.textPrimary)
font.pixelSize: 14 * Theme.uiScale
font.pixelSize: 14 * Theme.scale(Screen)
elide: Text.ElideRight
Layout.fillWidth: true
}
@@ -202,7 +202,7 @@ Item {
Text {
text: modelData.security && modelData.security !== "--" ? modelData.security : "Open"
color: networkMouseArea.containsMouse ? Theme.backgroundPrimary : (modelData.connected ? Theme.accentPrimary : Theme.textSecondary)
font.pixelSize: 11 * Theme.uiScale
font.pixelSize: 11 * Theme.scale(Screen)
elide: Text.ElideRight
Layout.fillWidth: true
}
@@ -211,7 +211,7 @@ Item {
visible: network.connectStatusSsid === modelData.ssid && network.connectStatus === "error" && network.connectError.length > 0
text: network.connectError
color: Theme.error
font.pixelSize: 11 * Theme.uiScale
font.pixelSize: 11 * Theme.scale(Screen)
elide: Text.ElideRight
Layout.fillWidth: true
}
@@ -234,7 +234,7 @@ Item {
visible: network.connectStatus === "success" && !network.connectingSsid
text: "check_circle"
font.family: "Material Symbols Outlined"
font.pixelSize: 18 * Theme.uiScale
font.pixelSize: 18 * Theme.scale(Screen)
color: "#43a047"
anchors.centerIn: parent
}
@@ -243,7 +243,7 @@ Item {
visible: network.connectStatus === "error" && !network.connectingSsid
text: "error"
font.family: "Material Symbols Outlined"
font.pixelSize: 18 * Theme.uiScale
font.pixelSize: 18 * Theme.scale(Screen)
color: Theme.error
anchors.centerIn: parent
}
@@ -253,7 +253,7 @@ Item {
visible: modelData.connected
text: "connected"
color: networkMouseArea.containsMouse ? Theme.backgroundPrimary : Theme.accentPrimary
font.pixelSize: 11 * Theme.uiScale
font.pixelSize: 11 * Theme.scale(Screen)
}
}
@@ -309,7 +309,7 @@ Item {
anchors.fill: parent
anchors.margins: 12
text: passwordInput
font.pixelSize: 13 * Theme.uiScale
font.pixelSize: 13 * Theme.scale(Screen)
color: Theme.textPrimary
verticalAlignment: TextInput.AlignVCenter
clip: true
@@ -364,7 +364,7 @@ Item {
anchors.centerIn: parent
text: "Connect"
color: Theme.backgroundPrimary
font.pixelSize: 14 * Theme.uiScale
font.pixelSize: 14 * Theme.scale(Screen)
font.bold: true
}
}
Bar/Modules/Workspace.qml
+9 -9
View File
@@ -40,7 +40,7 @@ Item {
return total;
}
height: 36 * Theme.uiScale
height: 36 * Theme.scale(Screen)
Component.onCompleted: {
localWorkspaces.clear();
@@ -115,14 +115,14 @@ Item {
Rectangle {
id: workspaceBackground
width: parent.width - 15 * Theme.uiScale
height: 26 * Theme.uiScale
width: parent.width - 15 * Theme.scale(Screen)
height: 26 * Theme.scale(Screen)
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
radius: 12 * Theme.uiScale
radius: 12 * Theme.scale(Screen)
color: Theme.surfaceVariant
border.color: Qt.rgba(Theme.textPrimary.r, Theme.textPrimary.g, Theme.textPrimary.b, 0.1)
border.width: 1 * Theme.uiScale
border.width: 1 * Theme.scale(Screen)
layer.enabled: true
layer.effect: MultiEffect {
shadowColor: "black"
@@ -145,7 +145,7 @@ Item {
model: localWorkspaces
Item {
id: workspacePillContainer
height: 12 * Theme.uiScale
height: 12 * Theme.scale(Screen)
width: {
if (model.isFocused)
return 44;
@@ -245,12 +245,12 @@ Item {
Rectangle {
id: pillBurst
anchors.centerIn: workspacePillContainer
width: workspacePillContainer.width + 18 * root.masterProgress * Theme.uiScale
height: workspacePillContainer.height + 18 * root.masterProgress * Theme.uiScale
width: workspacePillContainer.width + 18 * root.masterProgress * Theme.scale(Screen)
height: workspacePillContainer.height + 18 * root.masterProgress * Theme.scale(Screen)
radius: width / 2
color: "transparent"
border.color: root.effectColor
border.width: (2 + 6 * (1.0 - root.masterProgress)) * Theme.uiScale
border.width: (2 + 6 * (1.0 - root.masterProgress)) * Theme.scale(Screen)
opacity: root.effectsActive && model.isFocused ? (1.0 - root.masterProgress) * 0.7 : 0
visible: root.effectsActive && model.isFocused
z: 1