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

Revert "fix(StatusChatInputButton) ensure button text is elided correctly" 

This reverts commit 38b0207055f81c853830320e8b20e9532e84973b.
This commit is contained in:
Pascal Precht 2021-08-19 19:48:00 +02:00 committed by Michał Cieślak
parent dc5e5d648b
commit 67031ad5b1
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/StatusQ/src/StatusQ/Components/StatusChatToolBar.qml
View File

@ -37,7 +37,6 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 12 anchors.leftMargin: 12
anchors.right: actionButtons.left
onClicked: statusChatToolBar.chatInfoButtonClicked() onClicked: statusChatToolBar.chatInfoButtonClicked()
} }
@ -46,7 +45,7 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 8 anchors.rightMargin: 8
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: childrenRect.width
spacing: 8 spacing: 8
StatusFlatRoundButton { StatusFlatRoundButton {

10
ui/StatusQ/src/StatusQ/Controls/StatusChatInfoButton.qml
View File

@ -102,7 +102,8 @@ Rectangle {
anchors.topMargin: statusChatInfoButtonSubTitle.visible ? 0 : 8 anchors.topMargin: statusChatInfoButtonSubTitle.visible ? 0 : 8
anchors.left: identicon.right anchors.left: identicon.right
anchors.leftMargin: 8 anchors.leftMargin: 8
anchors.right: parent.right
width: statusIcon.width + chatName.anchors.leftMargin + chatName.width + (mutedIcon.visible ? mutedIcon.width + mutedIcon.anchors.leftMargin : 0)
height: chatName.height height: chatName.height
StatusIcon { StatusIcon {
@ -137,8 +138,7 @@ Rectangle {
anchors.left: statusIcon.visible ? statusIcon.right : parent.left anchors.left: statusIcon.visible ? statusIcon.right : parent.left
anchors.leftMargin: statusIcon.visible ? 1 : 0 anchors.leftMargin: statusIcon.visible ? 1 : 0
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right
elide: Text.ElideRight
text: statusChatInfoButton.type === StatusChatInfoButton.Type.PublicChat && text: statusChatInfoButton.type === StatusChatInfoButton.Type.PublicChat &&
!statusChatInfoButton.title.startsWith("#") ? !statusChatInfoButton.title.startsWith("#") ?
"#" + statusChatInfoButton.title : "#" + statusChatInfoButton.title :
@ -180,15 +180,13 @@ Rectangle {
Item { Item {
id: statusChatInfoButtonSubTitle id: statusChatInfoButtonSubTitle
anchors.left: statusChatInfoButtonTitle.left anchors.left: statusChatInfoButtonTitle.left
anchors.right: parent.right
anchors.top: statusChatInfoButtonTitle.bottom anchors.top: statusChatInfoButtonTitle.bottom
visible: !!statusChatInfoButton.subTitle || statusChatInfoButton.pinnedMessagesCount > 0 visible: !!statusChatInfoButton.subTitle || statusChatInfoButton.pinnedMessagesCount > 0
height: visible ? chatType.height : 0 height: visible ? chatType.height : 0
width: childrenRect.width
StatusBaseText { StatusBaseText {
id: chatType id: chatType
width: parent.width
elide: Text.ElideRight
text: statusChatInfoButton.subTitle text: statusChatInfoButton.subTitle
color: Theme.palette.baseColor1 color: Theme.palette.baseColor1
font.pixelSize: 12 font.pixelSize: 12