Merge branch 'users-explanation-layout'

2 files changed, 23 insertions, 0 deletions

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 ); )
 }
 
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
@@ -445,6 +445,22 @@
     </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">
       <string>Log in automatically without asking for the password.</string>