summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorLéo Lam <leolino.lam@gmail.com>2018-03-26 21:24:44 +0200
committerGitHub <noreply@github.com>2018-03-26 21:24:44 +0200
commitc9b4e3959c23ab20bc8ba1613fc49ffc4a3e8741 (patch)
tree606be944b8c4896542c4c82b74abe2bfce90d5f0 /Source/Core
parent91f61a1be49290895bd73da075db29b2a8770fae (diff)
parent2d0d4fee288309d932d57fde8d578f6ee9e5140a (diff)
Merge pull request #6511 from leoetlino/qt
Qt: Minor fixes
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinQt2/QtUtils/WrapInScrollArea.cpp2
-rw-r--r--Source/Core/DolphinQt2/SearchBar.cpp4
-rw-r--r--Source/Core/DolphinQt2/Settings.cpp2
-rw-r--r--Source/Core/DolphinQt2/Settings/GameCubePane.cpp2
4 files changed, 7 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt2/QtUtils/WrapInScrollArea.cpp b/Source/Core/DolphinQt2/QtUtils/WrapInScrollArea.cpp
index 4dc524cd8e..1327092bb3 100644
--- a/Source/Core/DolphinQt2/QtUtils/WrapInScrollArea.cpp
+++ b/Source/Core/DolphinQt2/QtUtils/WrapInScrollArea.cpp
@@ -40,7 +40,7 @@ void WrapInScrollArea(QWidget* parent, QLayout* wrapped_layout, QWidget* to_resi
auto* widget = new QWidget;
widget->setLayout(wrapped_layout);
- auto* scroll_area = GetWrappedWidget(widget, to_resize);
+ auto* scroll_area = GetWrappedWidget(widget, to_resize, 0, 0);
auto* scroll_layout = new QVBoxLayout;
scroll_layout->addWidget(scroll_area);
diff --git a/Source/Core/DolphinQt2/SearchBar.cpp b/Source/Core/DolphinQt2/SearchBar.cpp
index d4ccb8638e..71b38bf92f 100644
--- a/Source/Core/DolphinQt2/SearchBar.cpp
+++ b/Source/Core/DolphinQt2/SearchBar.cpp
@@ -24,13 +24,13 @@ void SearchBar::CreateWidgets()
m_search_edit = new QLineEdit;
m_close_button = new QPushButton(tr("Close"));
- m_search_edit->setPlaceholderText(tr("Type your search term here"));
+ m_search_edit->setPlaceholderText(tr("Search games..."));
auto* layout = new QHBoxLayout;
layout->addWidget(m_search_edit);
layout->addWidget(m_close_button);
- layout->setMargin(0);
+ layout->setSizeConstraint(QLayout::SetMinAndMaxSize);
setLayout(layout);
}
diff --git a/Source/Core/DolphinQt2/Settings.cpp b/Source/Core/DolphinQt2/Settings.cpp
index baa86879e8..6b51777b7c 100644
--- a/Source/Core/DolphinQt2/Settings.cpp
+++ b/Source/Core/DolphinQt2/Settings.cpp
@@ -226,6 +226,8 @@ void Settings::SetDebugModeEnabled(bool enabled)
SConfig::GetInstance().bEnableDebugging = enabled;
emit DebugModeToggled(enabled);
}
+ if (enabled)
+ SetCodeVisible(true);
}
bool Settings::IsDebugModeEnabled() const
diff --git a/Source/Core/DolphinQt2/Settings/GameCubePane.cpp b/Source/Core/DolphinQt2/Settings/GameCubePane.cpp
index bea623784a..0fbb68f802 100644
--- a/Source/Core/DolphinQt2/Settings/GameCubePane.cpp
+++ b/Source/Core/DolphinQt2/Settings/GameCubePane.cpp
@@ -116,6 +116,8 @@ void GameCubePane::CreateWidgets()
layout->addWidget(ipl_box);
layout->addWidget(device_box);
+ layout->addStretch();
+
setLayout(layout);
}