Skip to content
Snippets Groups Projects
Commit 21f3479a authored by Aline Gondim Santos's avatar Aline Gondim Santos
Browse files

messagebar: fix rtl layout

GitLab: #1279

Change-Id: I746fd86a4cf32cbb369ba2c5d57182800d7da0d0
parent 83070899
Branches
Tags
No related merge requests found
...@@ -130,7 +130,6 @@ Item { ...@@ -130,7 +130,6 @@ Item {
id: controlsLayout id: controlsLayout
height: childrenRect.height height: childrenRect.height
width: childrenRect.width
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: JamiTheme.pushButtonMargins anchors.rightMargin: JamiTheme.pushButtonMargins
anchors.leftMargin: JamiTheme.pushButtonMargins anchors.leftMargin: JamiTheme.pushButtonMargins
......
...@@ -36,11 +36,12 @@ Popup { ...@@ -36,11 +36,12 @@ Popup {
contentItem: ListView { contentItem: ListView {
id: listViewTypoSecond id: listViewTypoSecond
width: contentWidth + leftMargin width: contentWidth + leftMargin + rightMargin
height: JamiTheme.chatViewFooterButtonSize height: JamiTheme.chatViewFooterButtonSize
orientation: ListView.Horizontal orientation: ListView.Horizontal
interactive: false interactive: false
leftMargin: 10 leftMargin: 10
rightMargin: 10
spacing: 10 spacing: 10
Rectangle { Rectangle {
...@@ -53,7 +54,7 @@ Popup { ...@@ -53,7 +54,7 @@ Popup {
model: menuTypoActionsSecond model: menuTypoActionsSecond
delegate: PushButton { delegate: PushButton {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent ? parent.verticalCenter : undefined
preferredSize: JamiTheme.chatViewFooterRealButtonSize preferredSize: JamiTheme.chatViewFooterRealButtonSize
imageContainerWidth: 20 imageContainerWidth: 20
......
...@@ -129,6 +129,9 @@ Rectangle { ...@@ -129,6 +129,9 @@ Rectangle {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: footerColumnLayout.width Layout.preferredWidth: footerColumnLayout.width
Layout.leftMargin: marginSize
Layout.rightMargin: marginSize
Layout.bottomMargin: marginSize
Layout.preferredHeight: height Layout.preferredHeight: height
property var emojiPicker property var emojiPicker
......
This diff is collapsed.
...@@ -30,7 +30,9 @@ JamiFlickable { ...@@ -30,7 +30,9 @@ JamiFlickable {
property int maxWidth: 330 property int maxWidth: 330
property bool tooMuch: { property bool tooMuch: {
if (maxWidth > 0)
return textArea.contentWidth > maxWidth; return textArea.contentWidth > maxWidth;
return false;
} }
property alias text: textArea.text property alias text: textArea.text
property var textAreaObj: textArea property var textAreaObj: textArea
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment