Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-28 23:42:51 -05:00
Code Packages Releases Activity

VPN Detail: align action buttons right via RowLayout, add hover color by state, retain pointer cursor

Browse Source
This commit is contained in:
Jon Rogers
2025-08-30 14:31:11 -04:00
parent 7cc2c0acef
commit 04ce154d36
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Modules/ControlCenter/Details/VpnDetail.qml
View File

@@ -1,5 +1,6 @@
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Layouts
import Quickshell import Quickshell
import qs.Common import qs.Common
import qs.Services import qs.Services
@@ -35,14 +36,15 @@ Rectangle {
height: 28 height: 28
radius: 14 radius: 14
color: toggleMouse.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5) color: toggleMouse.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5)
visible: VpnService.connected || VpnService.profiles.length > 0 // Only show quick connect when not connected
width: 80 visible: !VpnService.connected && VpnService.profiles.length > 0
width: 100
Row { Row {
anchors.centerIn: parent anchors.centerIn: parent
spacing: Theme.spacingXS spacing: Theme.spacingXS
DankIcon { name: VpnService.connected ? "link_off" : "link"; size: Theme.fontSizeSmall; color: Theme.surfaceText } DankIcon { name: "link"; size: Theme.fontSizeSmall; color: Theme.surfaceText }
StyledText { text: VpnService.connected ? "Disconnect" : "Connect"; font.pixelSize: Theme.fontSizeSmall; color: Theme.surfaceText; font.weight: Font.Medium } StyledText { text: "Connect"; font.pixelSize: Theme.fontSizeSmall; color: Theme.surfaceText; font.weight: Font.Medium }
} }
MouseArea { MouseArea {
@@ -93,7 +95,7 @@ Rectangle {
border.width: 1 border.width: 1
border.color: modelData.uuid === VpnService.activeUuid ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) border.color: modelData.uuid === VpnService.activeUuid ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
Row { RowLayout {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@@ -111,16 +113,20 @@ Rectangle {
text: modelData.name text: modelData.name
font.pixelSize: Theme.fontSizeMedium font.pixelSize: Theme.fontSizeMedium
color: Theme.surfaceText color: Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter Layout.alignment: Qt.AlignVCenter
} }
Item { Layout.fillWidth: true; height: 1 }
Item { width: 1; height: 1 }
Rectangle { Rectangle {
height: 28 height: 28
radius: 14 radius: 14
color: actMouse.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5) color: actMouse.containsMouse
? (modelData.uuid === VpnService.activeUuid
? Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.12)
: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12))
: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5)
width: 100 width: 100
Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
StyledText { StyledText {
anchors.centerIn: parent anchors.centerIn: parent

4
Modules/TopBar/VpnPopout.qml
View File

@@ -22,7 +22,7 @@ DankPopout {
triggerScreen = screen triggerScreen = screen
} }
popupWidth: 420 popupWidth: 360
popupHeight: contentLoader.item ? contentLoader.item.implicitHeight : 260 popupHeight: contentLoader.item ? contentLoader.item.implicitHeight : 260
triggerX: Screen.width - 400 - Theme.spacingL triggerX: Screen.width - 400 - Theme.spacingL
triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingS triggerY: Theme.barHeight - 4 + SettingsData.topBarSpacing + Theme.spacingS
@@ -64,7 +64,7 @@ DankPopout {
width: parent.width width: parent.width
height: 28 height: 28
StyledText { StyledText {
text: "VPN" text: "VPN Connections"
font.pixelSize: Theme.fontSizeLarge font.pixelSize: Theme.fontSizeLarge
color: Theme.surfaceText color: Theme.surfaceText
font.weight: Font.Medium font.weight: Font.Medium