From 02c345e3beca16627cb54d067a6d96798a289580 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Fri, 6 Nov 2015 17:17:53 +0100
Subject: [PATCH] Use QGridLayout in ExpandableRadioButton to align widget with
 label.

---
 .../partition/gui/ExpandableRadioButton.cpp        | 14 +++++++-------
 src/modules/partition/gui/ExpandableRadioButton.h  |  4 ++++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/modules/partition/gui/ExpandableRadioButton.cpp b/src/modules/partition/gui/ExpandableRadioButton.cpp
index ef371c502..886753cd8 100644
--- a/src/modules/partition/gui/ExpandableRadioButton.cpp
+++ b/src/modules/partition/gui/ExpandableRadioButton.cpp
@@ -22,7 +22,7 @@
 #include <utils/CalamaresUtilsGui.h>
 #include <widgets/ClickableLabel.h>
 
-#include <QBoxLayout>
+#include <QGridLayout>
 
 
 ExpandableRadioButton::ExpandableRadioButton( QWidget* parent )
@@ -32,10 +32,10 @@ ExpandableRadioButton::ExpandableRadioButton( QWidget* parent )
     QBoxLayout* mainLayout = qobject_cast< QBoxLayout* >( layout() );
     mainLayout->setDirection( QBoxLayout::TopToBottom );
     mainLayout->setContentsMargins( 0, 0, 0, 0 );
-    QBoxLayout* prettyRadioButtonLayout = new QHBoxLayout;
-    prettyRadioButtonLayout->addWidget( m_radio );
-    prettyRadioButtonLayout->addWidget( m_label );
-    mainLayout->addLayout( prettyRadioButtonLayout );
+    m_gridLayout = new QGridLayout;
+    m_gridLayout->addWidget( m_radio, 0, 0 );
+    m_gridLayout->addWidget( m_label, 0, 1 );
+    mainLayout->addLayout( m_gridLayout );
 }
 
 
@@ -51,13 +51,13 @@ ExpandableRadioButton::setExpandableWidget( QWidget* widget )
 {
     if ( m_expandableWidget )
     {
-        layout()->removeWidget( m_expandableWidget );
+        m_gridLayout->removeWidget( m_expandableWidget );
         m_expandableWidget->deleteLater();
     }
 
     m_expandableWidget = widget;
     m_expandableWidget->setVisible( m_radio->isChecked() );
-    layout()->addWidget( m_expandableWidget );
+    m_gridLayout->addWidget( m_expandableWidget, 1, 1 );
     updateGeometry();
 
     connect( m_radio, &QRadioButton::toggled,
diff --git a/src/modules/partition/gui/ExpandableRadioButton.h b/src/modules/partition/gui/ExpandableRadioButton.h
index 740c0970a..4ac57ef97 100644
--- a/src/modules/partition/gui/ExpandableRadioButton.h
+++ b/src/modules/partition/gui/ExpandableRadioButton.h
@@ -22,6 +22,8 @@
 
 #include "PrettyRadioButton.h"
 
+class QGridLayout;
+
 class ExpandableRadioButton : public PrettyRadioButton
 {
     Q_OBJECT
@@ -37,6 +39,8 @@ public:
 private:
     QWidget* m_expandableWidget;
     bool m_expanded;
+
+    QGridLayout* m_gridLayout;
 };
 
 #endif // EXPANDABLERADIOBUTTON_H