From be1ee4e4f8c8c719676c18cd9f5871cd6afb3775 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Wed, 22 Feb 2023 15:14:40 -0500
Subject: [PATCH] updater: fix overlapping download progress
+ also fixes the missing confirm-update string
Change-Id: Ib8d0dce0b09e7415795d96d5c45b2f8a0f19bd30
---
src/app/commoncomponents/SimpleMessageDialog.qml | 4 +++-
src/app/settingsview/components/UpdateSettings.qml | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/app/commoncomponents/SimpleMessageDialog.qml b/src/app/commoncomponents/SimpleMessageDialog.qml
index 77daf83e2..44530f749 100644
--- a/src/app/commoncomponents/SimpleMessageDialog.qml
+++ b/src/app/commoncomponents/SimpleMessageDialog.qml
@@ -57,6 +57,7 @@ BaseModalDialog {
Layout.alignment: Qt.AlignCenter
Layout.preferredWidth: JamiTheme.preferredDialogWidth - JamiTheme.preferredMarginSize
+ Layout.preferredHeight: implicitHeight
text: infoText
font.pointSize: JamiTheme.menuFontSize - 2
@@ -71,7 +72,7 @@ BaseModalDialog {
Layout.topMargin: JamiTheme.preferredMarginSize / 2
Layout.fillWidth: true
- Layout.fillHeight: true
+ Layout.preferredHeight: childrenRect.height
data: innerContentData
}
@@ -80,6 +81,7 @@ BaseModalDialog {
spacing: JamiTheme.preferredMarginSize
Layout.fillWidth: true
+ Layout.preferredHeight: contentHeight
Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
Layout.bottomMargin: JamiTheme.preferredMarginSize
diff --git a/src/app/settingsview/components/UpdateSettings.qml b/src/app/settingsview/components/UpdateSettings.qml
index 124e7e31c..2c4b53fc0 100644
--- a/src/app/settingsview/components/UpdateSettings.qml
+++ b/src/app/settingsview/components/UpdateSettings.qml
@@ -169,7 +169,7 @@ ColumnLayout {
if (!found) {
presentInfoDialog(JamiStrings.updateNotFound)
} else {
- presentConfirmInstallDialog(JamiStrings.confirmUpdate, false)
+ presentConfirmInstallDialog(JamiStrings.updateFound, false)
}
}
--
GitLab