diff options
| author | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2026-01-03 19:34:14 +1100 |
|---|---|---|
| committer | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2026-01-03 19:34:14 +1100 |
| commit | ee65883f974d99a3f642fd973f6f08301d27a168 (patch) | |
| tree | 7d8844883c7fcd86a590f5a3544b8d6ea1f7c242 | |
| parent | services: add brightnessIncrement config property (#1010) (diff) | |
| download | caelestia-shell-ee65883f974d99a3f642fd973f6f08301d27a168.tar.gz caelestia-shell-ee65883f974d99a3f642fd973f6f08301d27a168.tar.bz2 caelestia-shell-ee65883f974d99a3f642fd973f6f08301d27a168.zip | |
internal: fix some widgets not respecting rounding scale
Diffstat (limited to '')
| -rw-r--r-- | components/controls/IconButton.qml | 2 | ||||
| -rw-r--r-- | components/controls/IconTextButton.qml | 2 | ||||
| -rw-r--r-- | components/controls/SplitButton.qml | 6 | ||||
| -rw-r--r-- | components/controls/TextButton.qml | 2 | ||||
| -rw-r--r-- | services/Weather.qml | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/components/controls/IconButton.qml b/components/controls/IconButton.qml index dc3b04b..ffb1d06 100644 --- a/components/controls/IconButton.qml +++ b/components/controls/IconButton.qml @@ -44,7 +44,7 @@ StyledRect { onCheckedChanged: internalChecked = checked - radius: internalChecked ? Appearance.rounding.small : implicitHeight / 2 + radius: internalChecked ? Appearance.rounding.small : implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) color: type === IconButton.Text ? "transparent" : disabled ? disabledColour : internalChecked ? activeColour : inactiveColour implicitWidth: implicitHeight diff --git a/components/controls/IconTextButton.qml b/components/controls/IconTextButton.qml index 0badd7a..b2bb96c 100644 --- a/components/controls/IconTextButton.qml +++ b/components/controls/IconTextButton.qml @@ -36,7 +36,7 @@ StyledRect { onCheckedChanged: internalChecked = checked - radius: internalChecked ? Appearance.rounding.small : implicitHeight / 2 + radius: internalChecked ? Appearance.rounding.small : implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) color: type === IconTextButton.Text ? "transparent" : internalChecked ? activeColour : inactiveColour implicitWidth: row.implicitWidth + horizontalPadding * 2 diff --git a/components/controls/SplitButton.qml b/components/controls/SplitButton.qml index d7f2651..c91474e 100644 --- a/components/controls/SplitButton.qml +++ b/components/controls/SplitButton.qml @@ -36,7 +36,7 @@ Row { spacing: Math.floor(Appearance.spacing.small / 2) StyledRect { - radius: implicitHeight / 2 + radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) topRightRadius: Appearance.rounding.small / 2 bottomRightRadius: Appearance.rounding.small / 2 color: root.disabled ? root.disabledColour : root.colour @@ -96,9 +96,9 @@ Row { StyledRect { id: expandBtn - property real rad: root.expanded ? implicitHeight / 2 : Appearance.rounding.small / 2 + property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) : Appearance.rounding.small / 2 - radius: implicitHeight / 2 + radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) topLeftRadius: rad bottomLeftRadius: rad color: root.disabled ? root.disabledColour : root.colour diff --git a/components/controls/TextButton.qml b/components/controls/TextButton.qml index ef84185..ecf7eb1 100644 --- a/components/controls/TextButton.qml +++ b/components/controls/TextButton.qml @@ -47,7 +47,7 @@ StyledRect { onCheckedChanged: internalChecked = checked - radius: internalChecked ? Appearance.rounding.small : implicitHeight / 2 + radius: internalChecked ? Appearance.rounding.small : implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) color: type === TextButton.Text ? "transparent" : internalChecked ? activeColour : inactiveColour implicitWidth: label.implicitWidth + horizontalPadding * 2 diff --git a/services/Weather.qml b/services/Weather.qml index bc1f11c..d04c537 100644 --- a/services/Weather.qml +++ b/services/Weather.qml @@ -24,7 +24,7 @@ Singleton { readonly property string sunset: cc ? Qt.formatDateTime(new Date(cc.sunset), Config.services.useTwelveHourClock ? "h:mm A" : "h:mm") : "--:--" function reload(): void { - let configLocation = Config.services.weatherLocation; + const configLocation = Config.services.weatherLocation; if (configLocation && configLocation !== "") { if (configLocation.indexOf(",") !== -1 && !isNaN(parseFloat(configLocation.split(",")[0]))) |