Browse Source
Merge pull request #5342 from lioncash/qt6
yuzu: Migrate off of setMargin() to setContentsMargins()
pull/15/merge
bunnei
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
src/yuzu/bootmanager.cpp
-
src/yuzu/game_list.cpp
|
|
|
@ -290,8 +290,8 @@ GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_, |
|
|
|
QString::fromUtf8(Common::g_scm_branch), |
|
|
|
QString::fromUtf8(Common::g_scm_desc))); |
|
|
|
setAttribute(Qt::WA_AcceptTouchEvents); |
|
|
|
auto layout = new QHBoxLayout(this); |
|
|
|
layout->setMargin(0); |
|
|
|
auto* layout = new QHBoxLayout(this); |
|
|
|
layout->setContentsMargins(0, 0, 0, 0); |
|
|
|
setLayout(layout); |
|
|
|
input_subsystem->Initialize(); |
|
|
|
|
|
|
|
|
|
|
|
@ -119,7 +119,7 @@ void GameListSearchField::setFocus() { |
|
|
|
GameListSearchField::GameListSearchField(GameList* parent) : QWidget{parent} { |
|
|
|
auto* const key_release_eater = new KeyReleaseEater(parent, this); |
|
|
|
layout_filter = new QHBoxLayout; |
|
|
|
layout_filter->setMargin(8); |
|
|
|
layout_filter->setContentsMargins(8, 8, 8, 8); |
|
|
|
label_filter = new QLabel; |
|
|
|
label_filter->setText(tr("Filter:")); |
|
|
|
edit_filter = new QLineEdit; |
|
|
|
|