mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-10 21:44:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt/MappingWindow: Update layout to match WX

Browse Source
This commit is contained in:
Starsam80 2017-06-13 22:24:24 -06:00
parent 38c60156ce
commit e023cc124b
No known key found for this signature in database
GPG Key ID: 4E48BB48BA7E9026
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt2/Config/Mapping/MappingWidget.cpp
View File

@ -51,7 +51,7 @@ QGroupBox* MappingWidget::CreateGroupBox(const QString& name, ControllerEmu::Con
{ {
auto* button = new MappingButton(this, control->control_ref.get()); auto* button = new MappingButton(this, control->control_ref.get());
button->setMinimumWidth(125); button->setMinimumWidth(100);
button->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); button->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
form_layout->addRow(QString::fromStdString(control->name), button); form_layout->addRow(QString::fromStdString(control->name), button);

10
Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp
View File

@ -63,7 +63,7 @@ void MappingWindow::CreateDevicesLayout()
void MappingWindow::CreateProfilesLayout() void MappingWindow::CreateProfilesLayout()
{ {
m_profiles_layout = new QVBoxLayout(); m_profiles_layout = new QHBoxLayout();
m_profiles_box = new QGroupBox(tr("Profiles")); m_profiles_box = new QGroupBox(tr("Profiles"));
m_profiles_combo = new QComboBox(); m_profiles_combo = new QComboBox();
m_profiles_load = new QPushButton(tr("Load")); m_profiles_load = new QPushButton(tr("Load"));
@ -86,15 +86,15 @@ void MappingWindow::CreateProfilesLayout()
void MappingWindow::CreateResetLayout() void MappingWindow::CreateResetLayout()
{ {
m_reset_layout = new QVBoxLayout(); m_reset_layout = new QHBoxLayout();
m_reset_box = new QGroupBox(tr("Reset")); m_reset_box = new QGroupBox(tr("Reset"));
m_reset_clear = new QPushButton(tr("Clear")); m_reset_clear = new QPushButton(tr("Clear"));
m_reset_default = new QPushButton(tr("Default")); m_reset_default = new QPushButton(tr("Default"));
m_reset_box->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); 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_default);
m_reset_layout->addWidget(m_reset_clear);
m_reset_box->setLayout(m_reset_layout); m_reset_box->setLayout(m_reset_layout);
} }
@ -106,10 +106,10 @@ void MappingWindow::CreateMainLayout()
m_tab_widget = new QTabWidget(); m_tab_widget = new QTabWidget();
m_button_box = new QDialogButtonBox(QDialogButtonBox::Ok); 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_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->addItem(m_config_layout);
m_main_layout->addWidget(m_tab_widget); m_main_layout->addWidget(m_tab_widget);
m_main_layout->addWidget(m_button_box); m_main_layout->addWidget(m_button_box);

4
Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h
View File

@ -97,7 +97,7 @@ private:
// Profiles // Profiles
QGroupBox* m_profiles_box; QGroupBox* m_profiles_box;
QVBoxLayout* m_profiles_layout; QHBoxLayout* m_profiles_layout;
QComboBox* m_profiles_combo; QComboBox* m_profiles_combo;
QPushButton* m_profiles_load; QPushButton* m_profiles_load;
QPushButton* m_profiles_save; QPushButton* m_profiles_save;
@ -105,7 +105,7 @@ private:
// Reset // Reset
QGroupBox* m_reset_box; QGroupBox* m_reset_box;
QVBoxLayout* m_reset_layout; QHBoxLayout* m_reset_layout;
QPushButton* m_reset_default; QPushButton* m_reset_default;
QPushButton* m_reset_clear; QPushButton* m_reset_clear;