From c6952a89ae44e4eb12214edc3812700d0658eaf4 Mon Sep 17 00:00:00 2001 From: Pascal Precht Date: Thu, 19 Aug 2021 19:48:00 +0200 Subject: [PATCH] Revert "fix(StatusChatInputButton) ensure button text is elided correctly" This reverts commit 38b0207055f81c853830320e8b20e9532e84973b. --- src/StatusQ/Components/StatusChatToolBar.qml | 3 +-- src/StatusQ/Controls/StatusChatInfoButton.qml | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/StatusQ/Components/StatusChatToolBar.qml b/src/StatusQ/Components/StatusChatToolBar.qml index 019863e0..af8abb1e 100644 --- a/src/StatusQ/Components/StatusChatToolBar.qml +++ b/src/StatusQ/Components/StatusChatToolBar.qml @@ -37,7 +37,6 @@ Rectangle { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: 12 - anchors.right: actionButtons.left onClicked: statusChatToolBar.chatInfoButtonClicked() } @@ -46,7 +45,7 @@ Rectangle { anchors.right: parent.right anchors.rightMargin: 8 anchors.verticalCenter: parent.verticalCenter - width: childrenRect.width + spacing: 8 StatusFlatRoundButton { diff --git a/src/StatusQ/Controls/StatusChatInfoButton.qml b/src/StatusQ/Controls/StatusChatInfoButton.qml index 636fbfc2..a434d1d2 100644 --- a/src/StatusQ/Controls/StatusChatInfoButton.qml +++ b/src/StatusQ/Controls/StatusChatInfoButton.qml @@ -102,7 +102,8 @@ Rectangle { anchors.topMargin: statusChatInfoButtonSubTitle.visible ? 0 : 8 anchors.left: identicon.right 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 StatusIcon { @@ -137,8 +138,7 @@ Rectangle { anchors.left: statusIcon.visible ? statusIcon.right : parent.left anchors.leftMargin: statusIcon.visible ? 1 : 0 anchors.top: parent.top - anchors.right: parent.right - elide: Text.ElideRight + text: statusChatInfoButton.type === StatusChatInfoButton.Type.PublicChat && !statusChatInfoButton.title.startsWith("#") ? "#" + statusChatInfoButton.title : @@ -180,15 +180,13 @@ Rectangle { Item { id: statusChatInfoButtonSubTitle anchors.left: statusChatInfoButtonTitle.left - anchors.right: parent.right anchors.top: statusChatInfoButtonTitle.bottom visible: !!statusChatInfoButton.subTitle || statusChatInfoButton.pinnedMessagesCount > 0 height: visible ? chatType.height : 0 + width: childrenRect.width StatusBaseText { id: chatType - width: parent.width - elide: Text.ElideRight text: statusChatInfoButton.subTitle color: Theme.palette.baseColor1 font.pixelSize: 12