From 033d56a4b332ded5b4e326bf060192ac1469d0d8 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Mon, 8 Jun 2020 23:40:15 +0200
Subject: [PATCH] Use SetMinimumSize in about dialog

---
 src/dialogs/about.cpp | 15 ++-------------
 src/dialogs/about.h   |  4 ----
 src/dialogs/about.ui  | 29 +++++++++++++++++++++++++----
 3 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/dialogs/about.cpp b/src/dialogs/about.cpp
index 21c062b43..87c5b2d49 100644
--- a/src/dialogs/about.cpp
+++ b/src/dialogs/about.cpp
@@ -95,24 +95,13 @@ About::About(QWidget *parent):QDialog(parent) {
 
   ui_.label_title->setFont(title_font);
   ui_.label_title->setText(Title);
-  ui_.label_title->adjustSize();
   ui_.label_text->setText(MainHtml());
-  ui_.label_text->adjustSize();
   ui_.text_contributors->setText(ContributorsHtml());
 
   ui_.buttonBox->button(QDialogButtonBox::Close)->setShortcut(QKeySequence::Close);
 
 }
 
-void About::showEvent(QShowEvent*) {
-
-  setMinimumHeight(0);
-  setMaximumHeight(9000);
-  adjustSize();
-  setFixedHeight(height() + 40);
-
-}
-
 QString About::MainHtml() const {
 
   QString ret;
@@ -134,9 +123,9 @@ QString About::MainHtml() const {
   ret += "</p>";
 
   ret += "<p>";
-  ret += tr("If you like this Strawberry and can make use of it, consider sponsoring or donating.");
+  ret += tr("If you like Strawberry and can make use of it, consider sponsoring or donating.");
   ret += "<br />";
-  ret += tr("You can sponsor the author on %1. You can also make a one-time payment through %2.").arg("<a href=\"https://github.com/sponsors/jonaski\">GitHub sponsors</a>.").arg("<a href=\"https://paypal.me/jonaskvinge\">paypal.me/jonaskvinge</a>");
+  ret += tr("You can sponsor the author on %1. You can also make a one-time payment through %2.").arg("<a href=\"https://github.com/sponsors/jonaski\">GitHub sponsors</a>").arg("<a href=\"https://paypal.me/jonaskvinge\">paypal.me/jonaskvinge</a>");
   ret += "</p>";
 
   return ret;
diff --git a/src/dialogs/about.h b/src/dialogs/about.h
index d91250ee9..30fb97e15 100644
--- a/src/dialogs/about.h
+++ b/src/dialogs/about.h
@@ -32,7 +32,6 @@
 #include "ui_about.h"
 
 class QWidget;
-class QShowEvent;
 
 class About : public QDialog {
   Q_OBJECT
@@ -40,9 +39,6 @@ class About : public QDialog {
  public:
   explicit About(QWidget *parent = nullptr);
 
- protected:
-  void showEvent(QShowEvent*);
-
  private:
   struct Person {
     Person(const QString &n, const QString &e = QString()) : name(n), email(e) {}
diff --git a/src/dialogs/about.ui b/src/dialogs/about.ui
index 48b628b99..44765b87e 100644
--- a/src/dialogs/about.ui
+++ b/src/dialogs/about.ui
@@ -25,6 +25,9 @@
   <property name="focusPolicy">
    <enum>Qt::StrongFocus</enum>
   </property>
+  <property name="windowTitle">
+   <string>About</string>
+  </property>
   <property name="windowIcon">
    <iconset resource="../../data/icons.qrc">
     <normaloff>:/icons/64x64/strawberry.png</normaloff>:/icons/64x64/strawberry.png</iconset>
@@ -37,12 +40,15 @@
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
    <property name="sizeConstraint">
-    <enum>QLayout::SetDefaultConstraint</enum>
+    <enum>QLayout::SetMinimumSize</enum>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="layout_about">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetMinimumSize</enum>
+     </property>
      <item>
-      <layout class="QVBoxLayout" name="verticalLayout_logo">
+      <layout class="QVBoxLayout" name="layout_left">
        <item>
         <widget class="QLabel" name="label_icon">
          <property name="pixmap">
@@ -91,9 +97,18 @@
       </widget>
      </item>
      <item>
-      <layout class="QVBoxLayout" name="verticalLayout_text">
+      <layout class="QVBoxLayout" name="layout_right">
+       <property name="sizeConstraint">
+        <enum>QLayout::SetMinimumSize</enum>
+       </property>
        <item>
         <widget class="QLabel" name="label_title">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string/>
          </property>
@@ -107,6 +122,12 @@
        </item>
        <item>
         <widget class="QLabel" name="label_text">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="text">
           <string/>
          </property>