remove rounded shapes
This commit is contained in:
parent
b10aa645e0
commit
fe38395b37
@ -26,7 +26,7 @@ AbstractButton {
|
||||
id: bg
|
||||
|
||||
color: palette.dark
|
||||
radius: Settings.avatarCircles ? height / 2 : height / 8
|
||||
radius: Settings.avatarCircles ? height / 2 : 0
|
||||
}
|
||||
|
||||
Label {
|
||||
@ -46,7 +46,7 @@ AbstractButton {
|
||||
id: identicon
|
||||
|
||||
anchors.fill: parent
|
||||
source: Settings.useIdenticon ? ("image://jdenticon/" + (avatar.userid !== "" ? avatar.userid : avatar.roomid) + "?radius=" + (Settings.avatarCircles ? 100 : 25)) : ""
|
||||
source: Settings.useIdenticon ? ("image://jdenticon/" + (avatar.userid !== "" ? avatar.userid : avatar.roomid) + "?radius=" + (Settings.avatarCircles ? 100 : 0)) : ""
|
||||
visible: Settings.useIdenticon && img.status != Image.Ready
|
||||
}
|
||||
Image {
|
||||
@ -56,9 +56,9 @@ AbstractButton {
|
||||
asynchronous: true
|
||||
fillMode: avatar.crop ? Image.PreserveAspectCrop : Image.PreserveAspectFit
|
||||
source: if (avatar.url.startsWith('image://colorimage')) {
|
||||
return avatar.url + "&radius=" + (Settings.avatarCircles ? 100 : 25) + ((avatar.crop) ? "" : "&scale");
|
||||
return avatar.url + "&radius=" + (Settings.avatarCircles ? 100 : 0) + ((avatar.crop) ? "" : "&scale");
|
||||
} else if (avatar.url.startsWith('image://')) {
|
||||
return avatar.url + "?radius=" + (Settings.avatarCircles ? 100 : 25) + ((avatar.crop) ? "" : "&scale");
|
||||
return avatar.url + "?radius=" + (Settings.avatarCircles ? 100 : 0) + ((avatar.crop) ? "" : "&scale");
|
||||
} else if (avatar.url.startsWith(':/')) {
|
||||
return "image://colorimage/" + avatar.url + "?" + label.color;
|
||||
} else {
|
||||
@ -95,7 +95,7 @@ AbstractButton {
|
||||
anchors.right: avatar.right
|
||||
color: updatePresence()
|
||||
height: avatar.height / 6
|
||||
radius: Settings.avatarCircles ? height / 2 : height / 8
|
||||
radius: Settings.avatarCircles ? height / 2 : 0
|
||||
visible: !!avatar.userid
|
||||
width: height
|
||||
|
||||
|
@ -30,7 +30,7 @@ Rectangle {
|
||||
border.width: 1
|
||||
// TODO: Qt.alpha() would make more sense but it wasn't working...
|
||||
color: Qt.rgba(bubbleColor.r, bubbleColor.g, bubbleColor.b, 0.3)
|
||||
radius: 3
|
||||
radius: 0
|
||||
visible: warningRoot.visible
|
||||
z: 3
|
||||
|
||||
|
@ -169,7 +169,7 @@ Item {
|
||||
border.color: palette.buttonText
|
||||
border.width: 1
|
||||
color: palette.window
|
||||
radius: padding
|
||||
radius: 0
|
||||
}
|
||||
contentItem: RowLayout {
|
||||
id: row
|
||||
@ -637,7 +637,7 @@ Item {
|
||||
flat: true
|
||||
height: width
|
||||
hoverEnabled: true
|
||||
radius: width / 2
|
||||
radius: 0
|
||||
width: 0
|
||||
|
||||
background: Rectangle {
|
||||
@ -645,7 +645,7 @@ Item {
|
||||
border.width: 1
|
||||
color: toEndButton.down ? palette.highlight : palette.button
|
||||
opacity: enabled ? 1 : 0.3
|
||||
radius: toEndButton.radius
|
||||
radius: 0
|
||||
}
|
||||
states: [
|
||||
State {
|
||||
|
@ -39,7 +39,7 @@ Flow {
|
||||
color: reaction.hovered ? palette.highlight : (modelData.selfReactedEvent !== '' ? gentleHighlight : palette.window)
|
||||
implicitHeight: reaction.implicitHeight
|
||||
implicitWidth: reaction.implicitWidth
|
||||
radius: reaction.height / 2
|
||||
radius: 0
|
||||
}
|
||||
contentItem: Row {
|
||||
spacing: textMetrics.height / 4
|
||||
|
@ -34,7 +34,7 @@ Item {
|
||||
border.color: Nheko.theme.separator
|
||||
border.width: 1
|
||||
color: palette.window
|
||||
radius: Nheko.paddingSmall
|
||||
radius: 0
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
@ -88,7 +88,7 @@ Item {
|
||||
border.color: Nheko.theme.separator
|
||||
border.width: 1
|
||||
color: palette.window
|
||||
radius: Nheko.paddingSmall
|
||||
radius: 0
|
||||
}
|
||||
|
||||
onAccepted: SelfVerificationStatus.setupCrosssigning(storeSecretsOnline.checked, usePassword.checked ? passwordField.text : "", useOnlineKeyBackup.checked)
|
||||
|
@ -289,7 +289,7 @@ TimelineEvent {
|
||||
padding: wrapper.isStateEvent ? 0 : 4
|
||||
background: Rectangle {
|
||||
color: !wrapper.isStateEvent ? Qt.tint(palette.base, Qt.hsla(messageBubble.userColor.hslHue, wrapper.hovered ? 0.8 : 0.5, messageBubble.userColor.hslLightness, 0.2)) : "transparent"
|
||||
radius: 4
|
||||
radius: 0
|
||||
border.color: Nheko.theme.red
|
||||
border.width: wrapper.notificationlevel == MtxEvent.Highlight ? 1 : 0
|
||||
}
|
||||
|
@ -294,7 +294,7 @@ TimelineEvent {
|
||||
color: "transparent"
|
||||
border.color: Nheko.theme.red
|
||||
border.width: wrapper.notificationlevel == MtxEvent.Highlight ? 1 : 0
|
||||
radius: 4
|
||||
radius: 0
|
||||
height: contentColumn.implicitHeight + 4
|
||||
width: contentColumn.implicitWidth + 4 + (wrapper.threadId ? (4 + gridContainer.spacing) : 0)
|
||||
},
|
||||
|
@ -43,7 +43,7 @@ Column {
|
||||
|
||||
background: Rectangle {
|
||||
color: palette.window
|
||||
radius: parent.height / 2
|
||||
radius: 0
|
||||
}
|
||||
}
|
||||
Row {
|
||||
|
@ -24,7 +24,7 @@ Switch {
|
||||
|
||||
color: Qt.rgba(border.color.r, border.color.g, border.color.b, 0.6)
|
||||
height: parent.height * 0.6
|
||||
radius: height / 2
|
||||
radius: 0
|
||||
width: parent.width - height
|
||||
x: radius
|
||||
y: parent.height / 2 - height / 2
|
||||
@ -35,7 +35,7 @@ Switch {
|
||||
border.color: "#767676"
|
||||
color: palette.button
|
||||
height: width
|
||||
radius: width / 2
|
||||
radius: 0
|
||||
width: parent.height * 0.9
|
||||
y: parent.height / 2 - height / 2
|
||||
}
|
||||
|
@ -42,7 +42,7 @@ Page {
|
||||
|
||||
background: Rectangle {
|
||||
color: palette.window
|
||||
radius: Nheko.paddingMedium
|
||||
radius: 0
|
||||
}
|
||||
contentItem: ColumnLayout {
|
||||
Image {
|
||||
|
@ -47,7 +47,7 @@ Button {
|
||||
background: Rectangle {
|
||||
//height: control.contentItem.implicitHeight * 2
|
||||
//width: control.contentItem.implicitWidth * 2
|
||||
radius: height / 8
|
||||
radius: 0
|
||||
color: Qt.lighter(palette.dark, control.down ? 1.4 : (control.hovered ? 1.2 : 1))
|
||||
}
|
||||
|
||||
|
@ -33,7 +33,7 @@ Dialog {
|
||||
color: palette.window
|
||||
border.color: Nheko.theme.separator
|
||||
border.width: 1
|
||||
radius: Nheko.paddingSmall
|
||||
radius: 0
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -23,7 +23,7 @@ TabButton {
|
||||
border.color: control.down ? palette.highlight : Nheko.theme.separator
|
||||
color: control.checked ? palette.highlight : palette.base
|
||||
border.width: 1
|
||||
radius: 2
|
||||
radius: 0
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -20,7 +20,7 @@ Rectangle {
|
||||
visible: mayBeVisible && notificationCount > 0
|
||||
implicitHeight: notificationBubbleText.height + Nheko.paddingMedium
|
||||
implicitWidth: Math.max(notificationBubbleText.width, height)
|
||||
radius: height / 2
|
||||
radius: 0
|
||||
color: hasLoudNotification ? Nheko.theme.red : bubbleBackgroundColor
|
||||
ToolTip.text: notificationCount
|
||||
ToolTip.delay: Nheko.tooltipDelay
|
||||
|
@ -50,7 +50,7 @@ Item {
|
||||
color: dragArea.held ? palette.highlight : palette.base
|
||||
Behavior on color { ColorAnimation { duration: 100 } }
|
||||
|
||||
radius: 2
|
||||
radius: 0
|
||||
|
||||
Drag.active: dragArea.held
|
||||
Drag.source: dragArea
|
||||
|
@ -73,7 +73,7 @@ Control {
|
||||
|
||||
background: Rectangle {
|
||||
color: palette.alternateBase
|
||||
radius: fontMetrics.lineSpacing / 2 + 2 * Nheko.paddingMedium
|
||||
radius: 0
|
||||
visible: !Settings.bubbles // the bubble in a bubble looks odd
|
||||
}
|
||||
}
|
||||
|
@ -57,7 +57,7 @@ Control {
|
||||
}
|
||||
|
||||
background: Rectangle {
|
||||
radius: fontMetrics.lineSpacing / 2 + Nheko.paddingMedium
|
||||
radius: 0
|
||||
height: contents.implicitHeight + Nheko.paddingMedium * 2
|
||||
color: palette.alternateBase
|
||||
border.color: Nheko.theme.green
|
||||
|
@ -31,7 +31,7 @@ Control {
|
||||
id: button
|
||||
|
||||
color: palette.base
|
||||
radius: 22
|
||||
radius: 0
|
||||
Layout.preferredHeight: 36
|
||||
Layout.preferredWidth: 36
|
||||
|
||||
@ -91,7 +91,7 @@ Control {
|
||||
|
||||
background: Rectangle {
|
||||
color: palette.base
|
||||
radius: fontMetrics.lineSpacing / 2 + 2 * Nheko.paddingSmall
|
||||
radius: 0
|
||||
visible: !Settings.bubbles // the bubble in a bubble looks odd
|
||||
}
|
||||
|
||||
|
@ -13,7 +13,7 @@ Label {
|
||||
width: contentWidth * 1.2
|
||||
|
||||
background: Rectangle {
|
||||
radius: parent.height / 2
|
||||
radius: 0
|
||||
color: palette.base
|
||||
}
|
||||
|
||||
|
@ -52,6 +52,6 @@ Control {
|
||||
|
||||
background: Rectangle {
|
||||
color: palette.alternateBase
|
||||
radius: fontMetrics.lineSpacing / 2 + 2 * Nheko.paddingSmall
|
||||
radius: 0
|
||||
}
|
||||
}
|
||||
|
@ -250,7 +250,7 @@ ApplicationWindow {
|
||||
background: Rectangle {
|
||||
anchors.fill: parent
|
||||
color: hovered ? palette.highlight : 'transparent'
|
||||
radius: 5
|
||||
radius: 0
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -80,7 +80,7 @@ ApplicationWindow {
|
||||
border.color: palette.text
|
||||
color: inviteeButton.hovered ? palette.highlight : palette.window
|
||||
border.width: 1
|
||||
radius: inviteeButton.height / 2
|
||||
radius: 0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -202,7 +202,7 @@ Menu {
|
||||
background: Rectangle {
|
||||
anchors.fill: parent
|
||||
color: hovered ? palette.highlight : 'transparent'
|
||||
radius: 5
|
||||
radius: 0
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -24,14 +24,14 @@ Slider {
|
||||
implicitHeight: control.sliderRadius / 4
|
||||
width: control.availableWidth - handle.width
|
||||
height: implicitHeight
|
||||
radius: height / 2
|
||||
radius: 0
|
||||
color: palette.buttonText
|
||||
|
||||
Rectangle {
|
||||
width: control.visualPosition * parent.width
|
||||
height: parent.height
|
||||
color: control.progressColor
|
||||
radius: 2
|
||||
radius: 0
|
||||
}
|
||||
|
||||
}
|
||||
@ -41,7 +41,7 @@ Slider {
|
||||
y: control.topPadding + control.availableHeight / 2 - height / 2
|
||||
implicitWidth: control.sliderRadius
|
||||
implicitHeight: control.sliderRadius
|
||||
radius: control.sliderRadius / 2
|
||||
radius: 0
|
||||
color: control.progressColor
|
||||
visible: Settings.mobileMode || control.alwaysShowSlider || control.hovered || control.pressed
|
||||
border.color: control.progressColor
|
||||
|
@ -55,7 +55,7 @@ Popup {
|
||||
}
|
||||
|
||||
background: Rectangle {
|
||||
radius: Nheko.paddingLarge
|
||||
radius: 0
|
||||
color: palette.dark
|
||||
opacity: 0.8
|
||||
}
|
||||
|
@ -156,7 +156,7 @@ Popup {
|
||||
}
|
||||
|
||||
background: Rectangle {
|
||||
radius: buttonLayout.buttonSize / 2
|
||||
radius: 0
|
||||
color: "#ff0000"
|
||||
}
|
||||
|
||||
@ -185,7 +185,7 @@ Popup {
|
||||
}
|
||||
|
||||
background: Rectangle {
|
||||
radius: buttonLayout.buttonSize / 2
|
||||
radius: 0
|
||||
color: "#00ff00"
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user