From 1adf4da736bb17dcb6479a0efb9b56485537beae Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 11 Feb 2019 18:07:27 -0500
Subject: [PATCH 1/2] [users] Small space between password explanation and
 checkboxes

---
 src/modules/users/page_usersetup.ui | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/modules/users/page_usersetup.ui b/src/modules/users/page_usersetup.ui
index 083d8f965..650c568fa 100644
--- a/src/modules/users/page_usersetup.ui
+++ b/src/modules/users/page_usersetup.ui
@@ -444,6 +444,22 @@
      </property>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer_5">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>6</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item>
     <widget class="QCheckBox" name="checkBoxAutoLogin">
      <property name="text">

From ebc9a00bcf810bd3f98662af00258425bc46cc27 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 11 Feb 2019 18:18:34 -0500
Subject: [PATCH 2/2] [users] Massage text widths

 - Make the explanations about 3 times as wide as the text-boxes
   that they are explaining. This is partly moot because the
   text-boxes have fixed pixel sizes in the designer file, but keep
   it flexible for now.
---
 src/modules/users/UsersPage.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp
index 04b851cf9..00e15b69d 100644
--- a/src/modules/users/UsersPage.cpp
+++ b/src/modules/users/UsersPage.cpp
@@ -99,6 +99,13 @@ UsersPage::UsersPage( QWidget* parent )
     setWriteRootPassword( true );
     ui->checkBoxReusePassword->setChecked( true );
 
+    // Don't expand the explanations to "stupid wide", but keep them vaguely as-wide-as
+    // the things they are explaining.
+    int boxWidth = qMax( qMax( ui->textBoxUsername->width(), ui->textBoxHostname->width() ), ui->textBoxUserPassword->width() );
+    ui->username_extra_label_2->setMaximumWidth( 3 * boxWidth );
+    ui->hostname_extra_label_2->setMaximumWidth( 3 * boxWidth );
+    ui->password_extra_label_3->setMaximumWidth( 3 * boxWidth );
+
     CALAMARES_RETRANSLATE( ui->retranslateUi( this ); )
 }