ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new cornerRadius Kirigami unit across the app

Browse Source 
(cherry picked from commit ab0c8b8170)
This commit is contained in:
James Graham
2024-04-21 18:25:39 +02:00
committed by Tobias Fella
parent 08807797a5
commit 3b858ab7d5
15 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qml/EmojiDelegate.qml
View File

@@ -48,10 +48,10 @@ QQC2.ItemDelegate {
background: Rectangle { background: Rectangle {
color: root.checked ? Kirigami.Theme.highlightColor : Kirigami.Theme.backgroundColor color: root.checked ? Kirigami.Theme.highlightColor : Kirigami.Theme.backgroundColor
radius: Kirigami.Units.smallSpacing radius: Kirigami.Units.cornerRadius
Rectangle { Rectangle {
radius: Kirigami.Units.smallSpacing radius: Kirigami.Units.cornerRadius
anchors.fill: parent anchors.fill: parent
color: Kirigami.Theme.highlightColor color: Kirigami.Theme.highlightColor
opacity: root.hovered && !root.pressed ? 0.2 : 0 opacity: root.hovered && !root.pressed ? 0.2 : 0

2
src/qml/EmojiDialog.qml
View File

@@ -40,7 +40,7 @@ QQC2.Popup {
background: Kirigami.ShadowedRectangle { background: Kirigami.ShadowedRectangle {
Kirigami.Theme.colorSet: Kirigami.Theme.View Kirigami.Theme.colorSet: Kirigami.Theme.View
color: Kirigami.Theme.backgroundColor color: Kirigami.Theme.backgroundColor
radius: Kirigami.Units.mediumSpacing radius: Kirigami.Units.cornerRadius
shadow { shadow {
size: Kirigami.Units.largeSpacing size: Kirigami.Units.largeSpacing
color: Qt.rgba(0.0, 0.0, 0.0, 0.3) color: Qt.rgba(0.0, 0.0, 0.0, 0.3)

2
src/qml/EmojiTonesPicker.qml
View File

@@ -30,7 +30,7 @@ QQC2.Popup {
onOpened: x = Math.min(parent.mapFromGlobal(QQC2.Overlay.overlay.width - root.width, 0).x, -(width - parent.width) / 2) onOpened: x = Math.min(parent.mapFromGlobal(QQC2.Overlay.overlay.width - root.width, 0).x, -(width - parent.width) / 2)
background: Kirigami.ShadowedRectangle { background: Kirigami.ShadowedRectangle {
color: Kirigami.Theme.backgroundColor color: Kirigami.Theme.backgroundColor
radius: Kirigami.Units.mediumSpacing radius: Kirigami.Units.cornerRadius
shadow { shadow {
size: Kirigami.Units.largeSpacing size: Kirigami.Units.largeSpacing
color: Qt.rgba(0.0, 0.0, 0.0, 0.3) color: Qt.rgba(0.0, 0.0, 0.0, 0.3)

2
src/qml/TypingPane.qml
View File

@@ -113,7 +113,7 @@ Loader {
rightInset: mirrored ? 0 : -background.radius rightInset: mirrored ? 0 : -background.radius
bottomInset: -background.radius bottomInset: -background.radius
background: Rectangle { background: Rectangle {
radius: 3 radius: Kirigami.Units.cornerRadius
color: Kirigami.Theme.backgroundColor color: Kirigami.Theme.backgroundColor
border.color: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.textColor, 0.2) border.color: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.textColor, 0.2)
border.width: 1 border.width: 1

4
src/settings/AppearanceSettingsPage.qml
View File

@@ -65,7 +65,7 @@ FormCard.FormCardPage {
} }
background: Kirigami.ShadowedRectangle { background: Kirigami.ShadowedRectangle {
color: Kirigami.Theme.backgroundColor color: Kirigami.Theme.backgroundColor
radius: Kirigami.Units.smallSpacing radius: Kirigami.Units.cornerRadius
shadow.size: Kirigami.Units.smallSpacing shadow.size: Kirigami.Units.smallSpacing
shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10) shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10)
border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15) border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
@@ -102,7 +102,7 @@ FormCard.FormCardPage {
} }
background: Kirigami.ShadowedRectangle { background: Kirigami.ShadowedRectangle {
color: Kirigami.Theme.backgroundColor color: Kirigami.Theme.backgroundColor
radius: Kirigami.Units.smallSpacing radius: Kirigami.Units.cornerRadius
shadow.size: Kirigami.Units.smallSpacing shadow.size: Kirigami.Units.smallSpacing
shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10) shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10)
border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15) border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)

2
src/settings/Permissions.qml
View File

@@ -136,7 +136,7 @@ FormCard.FormCardPage {
Kirigami.Theme.colorSet: Kirigami.Theme.View Kirigami.Theme.colorSet: Kirigami.Theme.View
Kirigami.Theme.inherit: false Kirigami.Theme.inherit: false
radius: 4 radius: Kirigami.Units.cornerRadius
color: Kirigami.Theme.backgroundColor color: Kirigami.Theme.backgroundColor
border { border {

2
src/settings/ThemeRadioButton.qml
View File

@@ -21,7 +21,7 @@ QQC2.RadioButton {
Kirigami.ShadowedRectangle { Kirigami.ShadowedRectangle {
implicitWidth: implicitHeight * 1.6 implicitWidth: implicitHeight * 1.6
implicitHeight: root.thin ? Kirigami.Units.gridUnit * 5 : Kirigami.Units.gridUnit * 6 implicitHeight: root.thin ? Kirigami.Units.gridUnit * 5 : Kirigami.Units.gridUnit * 6
radius: Kirigami.Units.smallSpacing radius: Kirigami.Units.cornerRadius
Kirigami.Theme.inherit: false Kirigami.Theme.inherit: false
Kirigami.Theme.colorSet: Kirigami.Theme.View Kirigami.Theme.colorSet: Kirigami.Theme.View

2
src/timeline/Bubble.qml
View File

@@ -182,7 +182,7 @@ QQC2.Control {
} else { } else {
return Kirigami.Theme.backgroundColor; return Kirigami.Theme.backgroundColor;
} }
radius: Kirigami.Units.smallSpacing radius: Kirigami.Units.cornerRadius
shadow { shadow {
size: Kirigami.Units.smallSpacing size: Kirigami.Units.smallSpacing
color: root.showHighlight ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10) color: root.showHighlight ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)

2
src/timeline/CodeComponent.qml
View File

@@ -190,7 +190,7 @@ QQC2.Control {
color: Kirigami.Theme.backgroundColor color: Kirigami.Theme.backgroundColor
Kirigami.Theme.colorSet: Kirigami.Theme.View Kirigami.Theme.colorSet: Kirigami.Theme.View
Kirigami.Theme.inherit: false Kirigami.Theme.inherit: false
radius: Kirigami.Units.smallSpacing radius: Kirigami.Units.cornerRadius
border { border {
width: 1 width: 1
color: Kirigami.Theme.highlightColor color: Kirigami.Theme.highlightColor

2
src/timeline/HiddenDelegate.qml
View File

@@ -79,7 +79,7 @@ TimelineDelegate {
background: Rectangle { background: Rectangle {
color: Kirigami.Theme.backgroundColor color: Kirigami.Theme.backgroundColor
radius: Kirigami.Units.smallSpacing radius: Kirigami.Units.cornerRadius
border { border {
width: contentControl.hovered ? 1 : 0 width: contentControl.hovered ? 1 : 0
color: Kirigami.Theme.highlightColor color: Kirigami.Theme.highlightColor

2
src/timeline/ItineraryReservationComponent.qml
View File

@@ -26,7 +26,7 @@ FormCard.FormCard {
Layout.fillWidth: true Layout.fillWidth: true
implicitWidth: Math.max(headerDelegate.implicitWidth, content.implicitWidth) implicitWidth: Math.max(headerDelegate.implicitWidth, content.implicitWidth)
Component.onCompleted: children[0].radius = Kirigami.Units.smallSpacing Component.onCompleted: children[0].radius = Kirigami.Units.cornerRadius
FormCard.AbstractFormDelegate { FormCard.AbstractFormDelegate {
id: headerDelegate id: headerDelegate

2
src/timeline/MessageDelegate.qml
View File

@@ -349,7 +349,7 @@ TimelineDelegate {
background: Rectangle { background: Rectangle {
visible: mainContainer.hovered && (Config.compactLayout || root.alwaysMaxWidth) visible: mainContainer.hovered && (Config.compactLayout || root.alwaysMaxWidth)
color: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15) color: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
radius: Kirigami.Units.smallSpacing radius: Kirigami.Units.cornerRadius
} }
TapHandler { TapHandler {

2
src/timeline/QuoteComponent.qml
View File

@@ -62,6 +62,6 @@ QQC2.Control {
background: Rectangle { background: Rectangle {
color: Kirigami.Theme.backgroundColor color: Kirigami.Theme.backgroundColor
radius: Kirigami.Units.smallSpacing radius: Kirigami.Units.cornerRadius
} }
} }

2
src/timeline/ReadMarkerDelegate.qml
View File

@@ -44,7 +44,7 @@ TimelineDelegate {
Kirigami.Theme.inherit: false Kirigami.Theme.inherit: false
Kirigami.Theme.colorSet: Kirigami.Theme.View Kirigami.Theme.colorSet: Kirigami.Theme.View
opacity: root.isTemporaryHighlighted ? 1 : 0.6 opacity: root.isTemporaryHighlighted ? 1 : 0.6
radius: Kirigami.Units.smallSpacing radius: Kirigami.Units.cornerRadius
shadow.size: Kirigami.Units.smallSpacing shadow.size: Kirigami.Units.smallSpacing
shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10) shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10)
border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15) border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)

6
src/timeline/VideoComponent.qml
View File

@@ -186,7 +186,7 @@ Video {
visible: false visible: false
color: Kirigami.Theme.backgroundColor color: Kirigami.Theme.backgroundColor
radius: Kirigami.Units.smallSpacing radius: Kirigami.Units.cornerRadius
QQC2.ProgressBar { QQC2.ProgressBar {
anchors.centerIn: parent anchors.centerIn: parent
@@ -296,7 +296,7 @@ Video {
} }
} }
background: Kirigami.ShadowedRectangle { background: Kirigami.ShadowedRectangle {
radius: 4 radius: Kirigami.Units.cornerRadius
color: Kirigami.Theme.backgroundColor color: Kirigami.Theme.backgroundColor
opacity: 0.8 opacity: 0.8
@@ -332,7 +332,7 @@ Video {
} }
} }
background: Kirigami.ShadowedRectangle { background: Kirigami.ShadowedRectangle {
radius: 4 radius: Kirigami.Units.cornerRadius
color: Kirigami.Theme.backgroundColor color: Kirigami.Theme.backgroundColor
opacity: 0.8 opacity: 0.8