diff --git a/Modules/Audio/AudioDeviceSelector.qml b/Modules/Audio/AudioDeviceSelector.qml index 460b297..ded1457 100644 --- a/Modules/Audio/AudioDeviceSelector.qml +++ b/Modules/Audio/AudioDeviceSelector.qml @@ -22,7 +22,7 @@ NLoader { color: Colors.backgroundPrimary radius: Style.radiusMedium * scaling border.color: Colors.backgroundTertiary - border.width: Math.min(1, Style.borderMedium * scaling) + border.width: Math.max(1, Style.borderMedium * scaling) width: 500 * scaling height: 400 anchors.centerIn: parent @@ -38,9 +38,7 @@ NLoader { } } } -} // NPanel {// id: ioSelector// property int tabIndex: 0// property Item anchorItem: null// signal panelClosed()// function sinkNodes() {// let nodes = Pipewire.nodes && Pipewire.nodes.values ? Pipewire.nodes.values.filter(function(n) {// return n.isSink && n.audio && n.isStream === false;// }) : [];// if (Pipewire.defaultAudioSink) -// nodes = nodes.slice().sort(function(a, b) { -// if (a.id === Pipewire.defaultAudioSink.id) +} // NPanel {// id: ioSelector// property int tabIndex: 0// property Item anchorItem: null// signal panelClosed()// function sinkNodes() {// let nodes = Pipewire.nodes && Pipewire.nodes.values ? Pipewire.nodes.values.filter(function(n) {// return n.isSink && n.audio && n.isStream === false;// }) : [];// if (Pipewire.defaultAudioSink)// nodes = nodes.slice().sort(function(a, b) {// if (a.id === Pipewire.defaultAudioSink.id) // return -1; // if (b.id === Pipewire.defaultAudioSink.id) diff --git a/Modules/Calendar/Calendar.qml b/Modules/Calendar/Calendar.qml index ca60424..6768593 100644 --- a/Modules/Calendar/Calendar.qml +++ b/Modules/Calendar/Calendar.qml @@ -19,7 +19,7 @@ NLoader { color: Colors.backgroundSecondary radius: Style.radiusMedium * scaling border.color: Colors.backgroundTertiary - border.width: Math.min(1, Style.borderMedium * scaling) + border.width: Math.max(1, Style.borderMedium * scaling) width: 340 * scaling height: 320 // TBC anchors.top: parent.top diff --git a/Modules/DemoPanel/DemoPanel.qml b/Modules/DemoPanel/DemoPanel.qml index 6e46687..b33d0dd 100644 --- a/Modules/DemoPanel/DemoPanel.qml +++ b/Modules/DemoPanel/DemoPanel.qml @@ -27,7 +27,7 @@ NLoader { color: Colors.backgroundPrimary radius: Style.radiusMedium * scaling border.color: Colors.backgroundTertiary - border.width: Math.min(1, Style.borderMedium * scaling) + border.width: Math.max(1, Style.borderMedium * scaling) width: 500 * scaling height: 400 * scaling anchors.centerIn: parent diff --git a/Modules/Notification/Notification.qml b/Modules/Notification/Notification.qml index 7ff94fa..9926689 100644 --- a/Modules/Notification/Notification.qml +++ b/Modules/Notification/Notification.qml @@ -64,8 +64,8 @@ PanelWindow { clip: true color: Colors.backgroundSecondary radius: Style.radiusMedium * scaling - border.color: Colors.backgroundTertiary - border.width: Math.min(1, Style.borderThin * scaling) + border.color: Colors.accentTertiary + border.width: Math.max(1, Style.borderThin * scaling) // Animation properties property real scaleValue: 0.8 diff --git a/Modules/SidePanel/SidePanel.qml b/Modules/SidePanel/SidePanel.qml index de1a5c1..9e155b6 100644 --- a/Modules/SidePanel/SidePanel.qml +++ b/Modules/SidePanel/SidePanel.qml @@ -50,7 +50,7 @@ NLoader { color: Colors.backgroundPrimary radius: Style.radiusLarge * scaling border.color: Colors.backgroundTertiary - border.width: Math.min(1, Style.borderMedium * scaling) + border.width: Math.max(1, Style.borderMedium * scaling) layer.enabled: true width: 460 * scaling property real innerMargin: sidePanel.cardSpacing diff --git a/Widgets/NBox.qml b/Widgets/NBox.qml index aa5a28d..9281bf2 100644 --- a/Widgets/NBox.qml +++ b/Widgets/NBox.qml @@ -14,6 +14,6 @@ Rectangle { color: Colors.surfaceVariant radius: Style.radiusMedium * scaling border.color: Colors.backgroundTertiary - border.width: Math.min(1, Style.borderThin * scaling) + border.width: Math.max(1, Style.borderThin * scaling) clip: true } diff --git a/Widgets/NCard.qml b/Widgets/NCard.qml index d0ff71d..bc2bb40 100644 --- a/Widgets/NCard.qml +++ b/Widgets/NCard.qml @@ -13,5 +13,5 @@ Rectangle { color: Colors.backgroundSecondary radius: Style.radiusMedium * scaling border.color: Colors.backgroundTertiary - border.width: Math.min(1, Style.borderThin * scaling) + border.width: Math.max(1, Style.borderThin * scaling) } diff --git a/Widgets/NCircleStat.qml b/Widgets/NCircleStat.qml index 6ef5eaa..a0a740f 100644 --- a/Widgets/NCircleStat.qml +++ b/Widgets/NCircleStat.qml @@ -21,7 +21,7 @@ Rectangle { color: flat ? "transparent" : Colors.backgroundSecondary radius: Style.radiusSmall * scaling border.color: flat ? "transparent" : Colors.backgroundTertiary - border.width: flat ? 0 : Math.min(1, Style.borderThin * scaling) + border.width: flat ? 0 : Math.max(1, Style.borderThin * scaling) clip: true // Repaint gauge when the bound value changes @@ -90,7 +90,7 @@ Rectangle { radius: width / 2 color: Colors.backgroundPrimary border.color: Colors.accentPrimary - border.width: Math.min(1, Style.borderThin * scaling) + border.width: Math.max(1, Style.borderThin * scaling) anchors.right: parent.right anchors.bottom: parent.bottom anchors.rightMargin: 4 * scaling * contentScale diff --git a/Widgets/NSlider.qml b/Widgets/NSlider.qml index 60a8367..3afc394 100644 --- a/Widgets/NSlider.qml +++ b/Widgets/NSlider.qml @@ -83,7 +83,7 @@ Slider { radius: width * 0.5 color: root.pressed ? Colors.surfaceVariant : Colors.surface border.color: Colors.accentPrimary - border.width: Math.min(1, Style.borderThick * scaling) + border.width: Math.max(1, Style.borderThick * scaling) // Press feedback halo (using accent color, low opacity) Rectangle { anchors.centerIn: parent diff --git a/Widgets/NToggle.qml b/Widgets/NToggle.qml index 2da7606..3318bf8 100644 --- a/Widgets/NToggle.qml +++ b/Widgets/NToggle.qml @@ -43,7 +43,7 @@ RowLayout { radius: height * 0.5 color: value ? Colors.accentPrimary : Colors.surfaceVariant border.color: value ? Colors.accentPrimary : Colors.outline - border.width: Math.min(1, Style.borderMedium * scaling) + border.width: Math.max(1, Style.borderMedium * scaling) Rectangle { width: (Style.baseWidgetSize - 4) * scaling @@ -51,7 +51,7 @@ RowLayout { radius: height * 0.5 color: Colors.surface border.color: hovering ? Colors.textDisabled : Colors.outline - border.width: Math.min(1, Style.borderMedium * scaling) + border.width: Math.max(1, Style.borderMedium * scaling) y: 2 * scaling x: value ? switcher.width - width - 2 * scaling : 2 * scaling diff --git a/Widgets/NTooltip.qml b/Widgets/NTooltip.qml index 99efe7f..7d6bda2 100644 --- a/Widgets/NTooltip.qml +++ b/Widgets/NTooltip.qml @@ -102,7 +102,7 @@ Window { radius: Style.radiusMedium * scaling color: Colors.backgroundTertiary border.color: Colors.outline - border.width: Math.min(1, Style.borderThin * scaling) + border.width: Math.max(1, Style.borderThin * scaling) opacity: Style.opacityFull z: 1 }