From 158b03b3d97aa0bf3235d886ae0eae5bbe05d31e Mon Sep 17 00:00:00 2001 From: Felanbird <41973452+Felanbird@users.noreply.github.com> Date: Thu, 11 May 2023 18:30:29 -0400 Subject: [PATCH 1/4] cut the width of the update box in half --- src/widgets/dialogs/UpdateDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/dialogs/UpdateDialog.cpp b/src/widgets/dialogs/UpdateDialog.cpp index dcce88d1e0b..cc8456b3ee2 100644 --- a/src/widgets/dialogs/UpdateDialog.cpp +++ b/src/widgets/dialogs/UpdateDialog.cpp @@ -41,7 +41,7 @@ UpdateDialog::UpdateDialog() }); this->setScaleIndependantHeight(150); - this->setScaleIndependantWidth(500); + this->setScaleIndependantWidth(250); } void UpdateDialog::updateStatusChanged(Updates::Status status) From 859dbb51628ef865bb59d76cd84a048e2d81d836 Mon Sep 17 00:00:00 2001 From: Felanbird <41973452+Felanbird@users.noreply.github.com> Date: Thu, 11 May 2023 18:32:30 -0400 Subject: [PATCH 2/4] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90644896600..8c57401de93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Minor: Added a Send button in the input box so you can click to send a message. This is disabled by default and can be enabled with the "Show send message button" setting. (#4607) - Minor: Improved error messages when the updater fails a download. (#4594) - Minor: Added `/shield` and `/shieldoff` commands to toggle shield mode. (#4580) +- Minor: Reduced the size of the update prompt to prevent it from going off the users screen. (#4626) - Bugfix: Fixed the menu warping on macOS on Qt6. (#4595) - Bugfix: Fixed link tooltips not showing unless the thumbnail setting was enabled. (#4597) - Bugfix: Domains starting with `http` are now parsed as links again. (#4598) From 389ebe7146f394a0c27e1d39662def952250efe8 Mon Sep 17 00:00:00 2001 From: Felanbird <41973452+Felanbird@users.noreply.github.com> Date: Thu, 11 May 2023 19:13:38 -0400 Subject: [PATCH 3/4] add a few newlines to the version too new prompt --- src/widgets/dialogs/UpdateDialog.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/widgets/dialogs/UpdateDialog.cpp b/src/widgets/dialogs/UpdateDialog.cpp index cc8456b3ee2..888d35827d9 100644 --- a/src/widgets/dialogs/UpdateDialog.cpp +++ b/src/widgets/dialogs/UpdateDialog.cpp @@ -51,18 +51,18 @@ void UpdateDialog::updateStatusChanged(Updates::Status status) switch (status) { case Updates::UpdateAvailable: { - this->ui_.label->setText( - (Updates::instance().isDowngrade() - ? QString( - "The version online (%1) seems to be lower than the " - "current (%2).\nEither a version was reverted or " - "you are running a newer build.\n\nDo you want to " - "download and install it?") - .arg(Updates::instance().getOnlineVersion(), - Updates::instance().getCurrentVersion()) - : QString("An update (%1) is available.\n\nDo you want to " - "download and install it?") - .arg(Updates::instance().getOnlineVersion()))); + this->ui_.label->setText(( + Updates::instance().isDowngrade() + ? QString( + "The version online (%1) seems to be\nlower than the " + "current (%2).\nEither a version was reverted or " + "you are\nrunning a newer build.\n\nDo you want to " + "download and install it?") + .arg(Updates::instance().getOnlineVersion(), + Updates::instance().getCurrentVersion()) + : QString("An update (%1) is available.\n\nDo you want to " + "download and install it?") + .arg(Updates::instance().getOnlineVersion()))); this->updateGeometry(); } break; From bfc9a6d0b1b10df857b4eefa90a2547fe8daa8af Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sat, 13 May 2023 11:21:04 +0200 Subject: [PATCH 4/4] Make changelog a bugfix entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c57401de93..784fc5556ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,10 @@ - Minor: Added a Send button in the input box so you can click to send a message. This is disabled by default and can be enabled with the "Show send message button" setting. (#4607) - Minor: Improved error messages when the updater fails a download. (#4594) - Minor: Added `/shield` and `/shieldoff` commands to toggle shield mode. (#4580) -- Minor: Reduced the size of the update prompt to prevent it from going off the users screen. (#4626) - Bugfix: Fixed the menu warping on macOS on Qt6. (#4595) - Bugfix: Fixed link tooltips not showing unless the thumbnail setting was enabled. (#4597) - Bugfix: Domains starting with `http` are now parsed as links again. (#4598) +- Bugfix: Reduced the size of the update prompt to prevent it from going off the users screen. (#4626) - Bugfix: Fixed click effects on buttons not being antialiased. (#4473) - Bugfix: Fixed Ctrl+Backspace not working after Select All in chat search popup. (#4461) - Bugfix: Fixed crash when scrolling up really fast. (#4621)