status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(Invitation+LinksBubble): fixed button radius corners 

Closes #7308
This commit is contained in:
Alexandra Betouni 2022-09-28 17:59:22 +03:00 committed by Alexandra Betouni
parent 2ec0b5330a
commit ae7d49c9b1
2 changed files with 67 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ui/imports/shared/views/chat/InvitationBubbleView.qml
View File

@ -280,13 +280,26 @@ Item {
color: Style.current.separator color: Style.current.separator
} }
StatusFlatButton { Item {
id: joinBtn
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 44 Layout.preferredHeight: 44
clip: true
StatusFlatButton {
id: joinBtn
width: parent.width
height: (parent.height+Style.current.padding)
anchors.top: parent.top
anchors.topMargin: -Style.current.padding
text: qsTr("Unsupported state") text: qsTr("Unsupported state")
contentItem: Item {
StatusBaseText {
anchors.centerIn: parent
anchors.verticalCenterOffset: Style.current.halfPadding
font: joinBtn.font
color: joinBtn.enabled ? joinBtn.textColor : joinBtn.disabledTextColor
text: joinBtn.text
}
}
onClicked: { onClicked: {
if (rectangleBubble.state === "joined") { if (rectangleBubble.state === "joined") {
@ -308,8 +321,8 @@ Item {
} }
Component.onCompleted: { Component.onCompleted: {
// FIXME: extract StatusButtonBackground or expose radius property in StatusBaseButton background.radius = Style.current.padding;
background.radius = 16 }
} }
} }
} }

27
ui/imports/shared/views/chat/LinksMessageView.qml
View File

@ -377,6 +377,9 @@ Column {
} }
width: parent.width width: parent.width
anchors.top: sep1.bottom anchors.top: sep1.bottom
Component.onCompleted: {
background.radius = 0;
}
} }
Separator { Separator {
@ -385,13 +388,33 @@ Column {
anchors.topMargin: 0 anchors.topMargin: 0
} }
Item {
width: parent.width
height: 44
anchors.top: sep2.bottom
clip: true
StatusFlatButton { StatusFlatButton {
id: dontAskBtn
width: parent.width
height: (parent.height+Style.current.padding)
anchors.top: parent.top
anchors.topMargin: -Style.current.padding
contentItem: Item {
StatusBaseText {
anchors.centerIn: parent
anchors.verticalCenterOffset: Style.current.halfPadding
font: dontAskBtn.font
color: dontAskBtn.enabled ? dontAskBtn.textColor : dontAskBtn.disabledTextColor
text: qsTr("Don't ask me again") text: qsTr("Don't ask me again")
}
}
onClicked: { onClicked: {
RootStore.setNeverAskAboutUnfurlingAgain(true); RootStore.setNeverAskAboutUnfurlingAgain(true);
} }
width: parent.width Component.onCompleted: {
anchors.top: sep2.bottom background.radius = Style.current.padding;
}
}
} }
} }
} }