medvedych/harbour-fernschreiber
2
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge pull request #176 from Wunderfitz/chat-header-alignment

Browse source 
Properly align custom header on chat page
This commit is contained in:
Sebastian Wolf 2020-11-18 11:54:13 +01:00 committed by GitHub
commit 97feb2f804
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qml/pages/ChatPage.qml
View file

@ -530,7 +530,7 @@ Page {
Row { Row {
id: headerRow id: headerRow
width: parent.width - (3 * Theme.horizontalPageMargin) width: parent.width - (3 * Theme.horizontalPageMargin)
height: chatOverviewColumn.height + Theme.paddingLarge + Theme.paddingSmall height: chatOverviewColumn.height + ( chatPage.isPortrait ? (2 * Theme.paddingMedium) : (2 * Theme.paddingSmall) )
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
spacing: Theme.paddingMedium spacing: Theme.paddingMedium
@ -541,19 +541,19 @@ Page {
width: chatOverviewColumn.height width: chatOverviewColumn.height
height: chatOverviewColumn.height height: chatOverviewColumn.height
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: Theme.paddingSmall anchors.bottomMargin: chatPage.isPortrait ? Theme.paddingMedium : Theme.paddingSmall
} }
Column { Column {
id: chatOverviewColumn id: chatOverviewColumn
width: parent.width - chatPictureThumbnail.width - Theme.paddingMedium width: parent.width - chatPictureThumbnail.width - Theme.paddingMedium
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: Theme.paddingSmall anchors.bottomMargin: chatPage.isPortrait ? Theme.paddingMedium : Theme.paddingSmall
Text { Text {
id: chatNameText id: chatNameText
text: chatInformation.title !== "" ? Emoji.emojify(chatInformation.title, font.pixelSize) : qsTr("Unknown") text: chatInformation.title !== "" ? Emoji.emojify(chatInformation.title, font.pixelSize) : qsTr("Unknown")
textFormat: Text.StyledText textFormat: Text.StyledText
font.pixelSize: Theme.fontSizeLarge font.pixelSize: chatPage.isPortrait ? Theme.fontSizeLarge : Theme.fontSizeMedium
font.family: Theme.fontFamilyHeading font.family: Theme.fontFamilyHeading
color: Theme.highlightColor color: Theme.highlightColor
elide: Text.ElideRight elide: Text.ElideRight
@ -565,7 +565,7 @@ Page {
id: chatStatusText id: chatStatusText
text: "" text: ""
textFormat: Text.StyledText textFormat: Text.StyledText
font.pixelSize: Theme.fontSizeExtraSmall font.pixelSize: chatPage.isPortrait ? Theme.fontSizeExtraSmall : Theme.fontSizeTiny
font.family: Theme.fontFamilyHeading font.family: Theme.fontFamilyHeading
color: headerMouseArea.pressed ? Theme.secondaryHighlightColor : Theme.secondaryColor color: headerMouseArea.pressed ? Theme.secondaryHighlightColor : Theme.secondaryColor
elide: Text.ElideRight elide: Text.ElideRight