mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2025-12-05 21:15:38 -05:00
respect cornerRadius setting in more places
This commit is contained in:
@@ -245,7 +245,7 @@ DankPopout {
|
||||
Rectangle {
|
||||
width: batteryContentRow.implicitWidth + Theme.spacingS * 2
|
||||
height: 40
|
||||
radius: 20
|
||||
radius: Theme.cornerRadius
|
||||
color: batteryMouseArea.containsMouse ? Qt.rgba(
|
||||
Theme.primary.r,
|
||||
Theme.primary.g,
|
||||
|
||||
@@ -16,7 +16,7 @@ StyledRect {
|
||||
|
||||
width: buttonSize
|
||||
height: buttonSize
|
||||
radius: circular ? buttonSize / 2 : Theme.cornerRadius
|
||||
radius: Theme.cornerRadius
|
||||
color: backgroundColor
|
||||
|
||||
DankIcon {
|
||||
|
||||
@@ -58,7 +58,7 @@ Item {
|
||||
|
||||
width: parent.width - (leftIconWidth + rightIconWidth + (slider.leftIcon.length > 0 ? Theme.spacingM : 0) + (slider.rightIcon.length > 0 ? Theme.spacingM : 0))
|
||||
height: 12
|
||||
radius: height / 2
|
||||
radius: Theme.cornerRadius
|
||||
color: slider.trackColor
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
clip: false
|
||||
@@ -66,7 +66,7 @@ Item {
|
||||
StyledRect {
|
||||
id: sliderFill
|
||||
height: parent.height
|
||||
radius: parent.radius
|
||||
radius: Theme.cornerRadius
|
||||
width: {
|
||||
const ratio = (slider.value - slider.minimum) / (slider.maximum - slider.minimum)
|
||||
const travel = sliderTrack.width - sliderHandle.width
|
||||
@@ -84,7 +84,7 @@ Item {
|
||||
|
||||
width: 8
|
||||
height: 24
|
||||
radius: 4
|
||||
radius: Theme.cornerRadius
|
||||
x: {
|
||||
const ratio = (slider.value - slider.minimum) / (slider.maximum - slider.minimum)
|
||||
const travel = sliderTrack.width - width
|
||||
@@ -98,7 +98,7 @@ Item {
|
||||
|
||||
StyledRect {
|
||||
anchors.fill: parent
|
||||
radius: parent.radius
|
||||
radius: Theme.cornerRadius
|
||||
color: Theme.onPrimary
|
||||
opacity: slider.enabled ? (sliderMouseArea.pressed ? 0.16 : (sliderMouseArea.containsMouse ? 0.08 : 0)) : 0
|
||||
visible: opacity > 0
|
||||
|
||||
@@ -87,7 +87,7 @@ Item {
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: showText ? Theme.spacingM : 0
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
radius: height / 2
|
||||
radius: Theme.cornerRadius
|
||||
|
||||
color: (checked && enabled) ? Theme.primary : Theme.surfaceVariantAlpha
|
||||
opacity: toggling ? 0.6 : (enabled ? 1 : 0.4)
|
||||
@@ -103,7 +103,7 @@ Item {
|
||||
|
||||
width: (checked && enabled) ? insetCircle : insetCircle - 4
|
||||
height: (checked && enabled) ? insetCircle : insetCircle - 4
|
||||
radius: width / 2
|
||||
radius: Theme.cornerRadius
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
|
||||
color: (checked && enabled) ? Theme.surface : Theme.outline
|
||||
|
||||
Reference in New Issue
Block a user