lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-04 14:55:43 +02:00
Code Activity

about: fix offscreen modal bug on scaled multi-monitor

Browse source 
Change-Id: Id39e14ac93b68a2c8d069e5a4d2ac5e3aa07f140
This commit is contained in:
Andreas Traczyk 2020-10-09 14:50:23 -04:00
parent ec2eae0830
commit b335146dfe
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mainview/MainView.qml
View file

@ -523,6 +523,9 @@ Window {
AboutPopUp { AboutPopUp {
id: aboutPopUpDialog id: aboutPopUpDialog
height: Math.min(preferredHeight,
mainViewWindow.height - JamiTheme.preferredMarginSize * 2)
} }
WelcomePageQrDialog { WelcomePageQrDialog {

14
src/mainview/components/AboutPopUp.qml
View file

@ -25,12 +25,10 @@ import net.jami.Adapters 1.0
import "../../constant" import "../../constant"
import "../../commoncomponents" import "../../commoncomponents"
BaseDialog { ModalPopup {
id: root id: root
height: aboutPopUpContentRectColumnLayout.implicitHeight property alias preferredHeight: aboutPopUpContentRectColumnLayout.implicitHeight
title: qsTr("About")
ProjectCreditsScrollView { ProjectCreditsScrollView {
id: projectCreditsScrollView id: projectCreditsScrollView
@ -70,13 +68,13 @@ BaseDialog {
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
ResponsiveImage { Image {
id: aboutPopUPJamiLogoImage id: aboutPopUPJamiLogoImage
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
Layout.topMargin: JamiTheme.preferredMarginSize Layout.topMargin: JamiTheme.preferredMarginSize
Layout.preferredWidth: contentRect.width Layout.preferredWidth: 250
Layout.preferredHeight: 100 Layout.preferredHeight: 88
smooth: true smooth: true
antialiasing: true antialiasing: true
@ -289,7 +287,7 @@ BaseDialog {
Layout.alignment: Qt.AlignCenter Layout.alignment: Qt.AlignCenter
Layout.preferredWidth: contentRect.width - JamiTheme.preferredMarginSize * 2 Layout.preferredWidth: contentRect.width - JamiTheme.preferredMarginSize * 2
Layout.preferredHeight: 150 Layout.preferredHeight: 128
Layout.margins: JamiTheme.preferredMarginSize Layout.margins: JamiTheme.preferredMarginSize
initialItem: changeLogScrollView initialItem: changeLogScrollView

2
src/mainview/components/ProjectCreditsScrollView.qml
View file

@ -41,7 +41,7 @@ ScrollView {
readOnly: true readOnly: true
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
font.pointSize: JamiTheme.textFontSize - 3 font.pointSize: JamiTheme.textFontSize
text: UtilsAdapter.getProjectCredits() text: UtilsAdapter.getProjectCredits()
textFormat: TextEdit.RichText textFormat: TextEdit.RichText