Skip to content
Snippets Groups Projects
Commit b335146d authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

about: fix offscreen modal bug on scaled multi-monitor

Change-Id: Id39e14ac93b68a2c8d069e5a4d2ac5e3aa07f140
parent ec2eae08
No related branches found
No related tags found
No related merge requests found
......@@ -523,6 +523,9 @@ Window {
AboutPopUp {
id: aboutPopUpDialog
height: Math.min(preferredHeight,
mainViewWindow.height - JamiTheme.preferredMarginSize * 2)
}
WelcomePageQrDialog {
......
......@@ -25,12 +25,10 @@ import net.jami.Adapters 1.0
import "../../constant"
import "../../commoncomponents"
BaseDialog {
ModalPopup {
id: root
height: aboutPopUpContentRectColumnLayout.implicitHeight
title: qsTr("About")
property alias preferredHeight: aboutPopUpContentRectColumnLayout.implicitHeight
ProjectCreditsScrollView {
id: projectCreditsScrollView
......@@ -70,13 +68,13 @@ BaseDialog {
Layout.alignment: Qt.AlignCenter
ResponsiveImage {
Image {
id: aboutPopUPJamiLogoImage
Layout.alignment: Qt.AlignCenter
Layout.topMargin: JamiTheme.preferredMarginSize
Layout.preferredWidth: contentRect.width
Layout.preferredHeight: 100
Layout.preferredWidth: 250
Layout.preferredHeight: 88
smooth: true
antialiasing: true
......@@ -289,7 +287,7 @@ BaseDialog {
Layout.alignment: Qt.AlignCenter
Layout.preferredWidth: contentRect.width - JamiTheme.preferredMarginSize * 2
Layout.preferredHeight: 150
Layout.preferredHeight: 128
Layout.margins: JamiTheme.preferredMarginSize
initialItem: changeLogScrollView
......
......@@ -41,7 +41,7 @@ ScrollView {
readOnly: true
wrapMode: Text.WordWrap
font.pointSize: JamiTheme.textFontSize - 3
font.pointSize: JamiTheme.textFontSize
text: UtilsAdapter.getProjectCredits()
textFormat: TextEdit.RichText
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment