From b335146dfe51e931fae71a3468dd474eee56e4d6 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Fri, 9 Oct 2020 14:50:23 -0400
Subject: [PATCH] about: fix offscreen modal bug on scaled multi-monitor
Change-Id: Id39e14ac93b68a2c8d069e5a4d2ac5e3aa07f140
---
src/mainview/MainView.qml | 3 +++
src/mainview/components/AboutPopUp.qml | 14 ++++++--------
.../components/ProjectCreditsScrollView.qml | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 46d522b5c..23b934d28 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -523,6 +523,9 @@ Window {
AboutPopUp {
id: aboutPopUpDialog
+
+ height: Math.min(preferredHeight,
+ mainViewWindow.height - JamiTheme.preferredMarginSize * 2)
}
WelcomePageQrDialog {
diff --git a/src/mainview/components/AboutPopUp.qml b/src/mainview/components/AboutPopUp.qml
index 4ede1ea09..0dcb66481 100644
--- a/src/mainview/components/AboutPopUp.qml
+++ b/src/mainview/components/AboutPopUp.qml
@@ -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
diff --git a/src/mainview/components/ProjectCreditsScrollView.qml b/src/mainview/components/ProjectCreditsScrollView.qml
index 32170d1d4..ad1389a1a 100644
--- a/src/mainview/components/ProjectCreditsScrollView.qml
+++ b/src/mainview/components/ProjectCreditsScrollView.qml
@@ -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
--
GitLab