mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2025-12-06 05:25:41 -05:00
UX update to widget padding heights, updated workspaces
This commit is contained in:
@@ -9,7 +9,7 @@ Rectangle {
|
|||||||
property bool batteryPopupVisible: false
|
property bool batteryPopupVisible: false
|
||||||
|
|
||||||
width: 70 // Increased width to accommodate percentage text
|
width: 70 // Increased width to accommodate percentage text
|
||||||
height: 32
|
height: 30
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
color: batteryArea.containsMouse || batteryPopupVisible ?
|
color: batteryArea.containsMouse || batteryPopupVisible ?
|
||||||
Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) :
|
Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) :
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ Rectangle {
|
|||||||
property bool showIcon: true
|
property bool showIcon: true
|
||||||
|
|
||||||
width: 55
|
width: 55
|
||||||
height: 32
|
height: 30
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
color: cpuArea.containsMouse ?
|
color: cpuArea.containsMouse ?
|
||||||
Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) :
|
Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) :
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ Rectangle {
|
|||||||
id: powerButton
|
id: powerButton
|
||||||
|
|
||||||
width: 48
|
width: 48
|
||||||
height: 32
|
height: 30
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
color: powerArea.containsMouse || root.powerMenuVisible ?
|
color: powerArea.containsMouse || root.powerMenuVisible ?
|
||||||
Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.16) :
|
Qt.rgba(Theme.error.r, Theme.error.g, Theme.error.b, 0.16) :
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ Rectangle {
|
|||||||
property bool showIcon: true
|
property bool showIcon: true
|
||||||
|
|
||||||
width: 55
|
width: 55
|
||||||
height: 32
|
height: 30
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
color: ramArea.containsMouse ?
|
color: ramArea.containsMouse ?
|
||||||
Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) :
|
Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) :
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ Rectangle {
|
|||||||
return Math.min(baseWidth, parent.width - Theme.spacingL * 2)
|
return Math.min(baseWidth, parent.width - Theme.spacingL * 2)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
height: 32
|
height: 30
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
color: clockMouseArea.containsMouse ?
|
color: clockMouseArea.containsMouse ?
|
||||||
Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) :
|
Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) :
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ Rectangle {
|
|||||||
signal clicked()
|
signal clicked()
|
||||||
|
|
||||||
width: Math.max(80, controlIndicators.implicitWidth + Theme.spacingS * 2)
|
width: Math.max(80, controlIndicators.implicitWidth + Theme.spacingS * 2)
|
||||||
height: 32
|
height: 30
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
color: controlCenterArea.containsMouse || root.isActive ?
|
color: controlCenterArea.containsMouse || root.isActive ?
|
||||||
Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) :
|
Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) :
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ Rectangle {
|
|||||||
id: root
|
id: root
|
||||||
|
|
||||||
width: 40
|
width: 40
|
||||||
height: 32
|
height: 30
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
color: launcherArea.containsMouse ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.12) : Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08)
|
color: launcherArea.containsMouse ? Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.12) : Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08)
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ Rectangle {
|
|||||||
signal clicked()
|
signal clicked()
|
||||||
|
|
||||||
width: 40
|
width: 40
|
||||||
height: 32
|
height: 30
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
color: notificationArea.containsMouse || root.isActive ?
|
color: notificationArea.containsMouse || root.isActive ?
|
||||||
Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) :
|
Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.16) :
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ Rectangle {
|
|||||||
signal menuRequested(var menu, var item, real x, real y)
|
signal menuRequested(var menu, var item, real x, real y)
|
||||||
|
|
||||||
width: Math.max(40, systemTrayRow.implicitWidth + Theme.spacingS * 2)
|
width: Math.max(40, systemTrayRow.implicitWidth + Theme.spacingS * 2)
|
||||||
height: 32
|
height: 30
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
color: Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.08)
|
color: Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.08)
|
||||||
visible: systemTrayRow.children.length > 0
|
visible: systemTrayRow.children.length > 0
|
||||||
|
|||||||
@@ -208,7 +208,7 @@ PanelWindow {
|
|||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
width: 40
|
width: 40
|
||||||
height: 32
|
height: 30
|
||||||
radius: Theme.cornerRadius
|
radius: Theme.cornerRadius
|
||||||
color: clipboardArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.08)
|
color: clipboardArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.secondary.r, Theme.secondary.g, Theme.secondary.b, 0.08)
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
|||||||
@@ -9,9 +9,9 @@ Rectangle {
|
|||||||
property string screenName: ""
|
property string screenName: ""
|
||||||
|
|
||||||
width: Math.max(120, workspaceRow.implicitWidth + Theme.spacingL * 2)
|
width: Math.max(120, workspaceRow.implicitWidth + Theme.spacingL * 2)
|
||||||
height: 32
|
height: 30
|
||||||
radius: Theme.cornerRadiusLarge
|
radius: Theme.cornerRadiusLarge
|
||||||
color: Qt.rgba(Theme.surfaceContainerHigh.r, Theme.surfaceContainerHigh.g, Theme.surfaceContainerHigh.b, 0.8)
|
color: Qt.rgba(Theme.surfaceText.r, Theme.surfaceText.g, Theme.surfaceText.b, 0.08)
|
||||||
visible: NiriWorkspaceService.niriAvailable
|
visible: NiriWorkspaceService.niriAvailable
|
||||||
|
|
||||||
property int currentWorkspace: getDisplayActiveWorkspace()
|
property int currentWorkspace: getDisplayActiveWorkspace()
|
||||||
@@ -86,8 +86,8 @@ Rectangle {
|
|||||||
property bool isHovered: mouseArea.containsMouse
|
property bool isHovered: mouseArea.containsMouse
|
||||||
property int sequentialNumber: index + 1
|
property int sequentialNumber: index + 1
|
||||||
|
|
||||||
width: isActive ? Theme.spacingXL + Theme.spacingS : Theme.spacingL
|
width: isActive ? Theme.spacingXL + Theme.spacingM : Theme.spacingL + Theme.spacingXS
|
||||||
height: Theme.spacingS
|
height: Theme.spacingM
|
||||||
radius: height / 2
|
radius: height / 2
|
||||||
color: isActive ? Theme.primary :
|
color: isActive ? Theme.primary :
|
||||||
isHovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.5) :
|
isHovered ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.5) :
|
||||||
|
|||||||
Reference in New Issue
Block a user