Merge pull request #5608 from Starsam80/qt-should-be-like-wx

Qt/MappingWindow: Update layout to match WX
dolphin-emu · Jun 14, 2017 · c71cb9a · c71cb9a
2 parents 54e8829 + e023cc1
commit c71cb9a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp
@@ -51,7 +51,7 @@ QGroupBox* MappingWidget::CreateGroupBox(const QString& name, ControllerEmu::Con
   {
     auto* button = new MappingButton(this, control->control_ref.get());
 
-    button->setMinimumWidth(125);
+    button->setMinimumWidth(100);
     button->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     form_layout->addRow(QString::fromStdString(control->name), button);
 

diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
@@ -63,7 +63,7 @@ void MappingWindow::CreateDevicesLayout()
 
 void MappingWindow::CreateProfilesLayout()
 {
-  m_profiles_layout = new QVBoxLayout();
+  m_profiles_layout = new QHBoxLayout();
   m_profiles_box = new QGroupBox(tr("Profiles"));
   m_profiles_combo = new QComboBox();
   m_profiles_load = new QPushButton(tr("Load"));
@@ -86,15 +86,15 @@ void MappingWindow::CreateProfilesLayout()
 
 void MappingWindow::CreateResetLayout()
 {
-  m_reset_layout = new QVBoxLayout();
+  m_reset_layout = new QHBoxLayout();
   m_reset_box = new QGroupBox(tr("Reset"));
   m_reset_clear = new QPushButton(tr("Clear"));
   m_reset_default = new QPushButton(tr("Default"));
 
   m_reset_box->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
-  m_reset_layout->addWidget(m_reset_clear);
   m_reset_layout->addWidget(m_reset_default);
+  m_reset_layout->addWidget(m_reset_clear);
 
   m_reset_box->setLayout(m_reset_layout);
 }
@@ -106,10 +106,10 @@ void MappingWindow::CreateMainLayout()
   m_tab_widget = new QTabWidget();
   m_button_box = new QDialogButtonBox(QDialogButtonBox::Ok);
 
-  m_config_layout->addWidget(m_profiles_box);
+  m_config_layout->addWidget(m_devices_box);
   m_config_layout->addWidget(m_reset_box);
+  m_config_layout->addWidget(m_profiles_box);
 
-  m_main_layout->addWidget(m_devices_box);
   m_main_layout->addItem(m_config_layout);
   m_main_layout->addWidget(m_tab_widget);
   m_main_layout->addWidget(m_button_box);

diff --git a/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h b/Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h
@@ -97,15 +97,15 @@ class MappingWindow final : public QDialog
 
   // Profiles
   QGroupBox* m_profiles_box;
-  QVBoxLayout* m_profiles_layout;
+  QHBoxLayout* m_profiles_layout;
   QComboBox* m_profiles_combo;
   QPushButton* m_profiles_load;
   QPushButton* m_profiles_save;
   QPushButton* m_profiles_delete;
 
   // Reset
   QGroupBox* m_reset_box;
-  QVBoxLayout* m_reset_layout;
+  QHBoxLayout* m_reset_layout;
   QPushButton* m_reset_default;
   QPushButton* m_reset_clear;