lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-10 12:03:18 +02:00
Code Activity

Correct some bug MessageBar

Browse source 
Change-Id: I198763539ba1b093ef9dfbc6f429ba15dcf93285
This commit is contained in:
lcoursodon 2023-09-22 14:32:26 -04:00 • committed by Andreas Traczyk
parent 1bd7d75d29
commit 6f8f96edfd
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/mainview/components/ChatViewFooter.qml
View file

@ -130,7 +130,7 @@ Rectangle {
Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: footerColumnLayout.width
Layout.leftMargin: marginSize
Layout.leftMargin: 0
Layout.rightMargin: marginSize
Layout.bottomMargin: marginSize
Layout.preferredHeight: height

19
src/app/mainview/components/MessageBar.qml
View file

@ -54,6 +54,7 @@ RowLayout {
height: showTypo || multiLine ? messageBarTextArea.height + 25 + 3 * marginSize + 1 : textAreaObj.height + marginSize + 1
Rectangle {
Layout.preferredHeight: parent.height
Layout.preferredWidth: childrenRect.width
visible: !CurrentConversation.isSip
@ -132,8 +133,6 @@ RowLayout {
Layout.fillWidth: true
Layout.fillHeight: true
Layout.rightMargin: marginSize
Layout.leftMargin: marginSize
radius: 5
color: JamiTheme.transparentColor
@ -671,11 +670,11 @@ RowLayout {
normalColor: {
if (showPreview) {
return JamiTheme.transparentColor;
return JamiTheme.primaryBackgroundColor;
} else if (modelData.isStyle) {
return JamiTheme.hoveredButtonColor;
} else {
return JamiTheme.transparentColor;
return JamiTheme.primaryBackgroundColor;
}
}
imageColor: {
@ -698,7 +697,7 @@ RowLayout {
Rectangle {
height: JamiTheme.chatViewFooterButtonSize
color: JamiTheme.transparentColor
color: JamiTheme.primaryBackgroundColor
visible: showTypo && showTypoSecond
width: 2
@ -713,7 +712,7 @@ RowLayout {
Rectangle {
z: -1
radius: 0
color: JamiTheme.transparentColor
color: JamiTheme.primaryBackgroundColor
width: JamiTheme.chatViewFooterButtonSize
height: JamiTheme.chatViewFooterButtonSize
@ -855,13 +854,13 @@ RowLayout {
normalColor: {
if (showPreview) {
return JamiTheme.transparentColor;
return JamiTheme.primaryBackgroundColor;
} else if (modelData.normalColor != null) {
return modelData.normalColor;
} else if (modelData.isStyle) {
return JamiTheme.hoveredButtonColor;
} else {
return JamiTheme.transparentColor;
return JamiTheme.primaryBackgroundColor;
}
}
imageColor: {
@ -900,7 +899,7 @@ RowLayout {
toolTipText: showTypo ? JamiStrings.hideFormatting : JamiStrings.showFormatting
source: JamiResources.text_edit_black_24dp_svg
normalColor: showPreview ? JamiTheme.transparentColor : (showTypo ? JamiTheme.hoveredButtonColor : JamiTheme.transparentColor)
normalColor: showPreview ? JamiTheme.primaryBackgroundColor : (showTypo ? JamiTheme.hoveredButtonColor : JamiTheme.primaryBackgroundColor)
imageColor: showPreview ? JamiTheme.chatViewFooterImgDisableColor : (hovered || showTypo ? JamiTheme.chatViewFooterImgHoverColor : JamiTheme.chatViewFooterImgColor)
hoveredColor: JamiTheme.hoveredButtonColor
pressedColor: hoveredColor
@ -1022,7 +1021,7 @@ RowLayout {
toolTipText: modelData.toolTip
source: modelData.iconSrc
normalColor: JamiTheme.transparentColor
normalColor: JamiTheme.primaryBackgroundColor
imageColor: showPreview ? JamiTheme.chatViewFooterImgDisableColor : (hovered ? JamiTheme.chatViewFooterImgHoverColor : JamiTheme.chatViewFooterImgColor)
hoveredColor: JamiTheme.hoveredButtonColor
pressedColor: hoveredColor

2
src/app/mainview/components/MessageBarTextArea.qml
View file

@ -157,7 +157,7 @@ JamiFlickable {
persistentSelection: true
height: this.paintedHeight
height: textArea.lineCount === 1 ? 35 : textArea.paintedHeight
verticalAlignment: TextEdit.AlignVCenter