octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5693 from FearlessTobi/port-5342

Browse Source 
Port yuzu-emu/yuzu#5342: "yuzu: Migrate off of setMargin() to setContentsMargins()"
This commit is contained in:
Marshall Mohror
2021-02-04 10:50:32 -06:00
committed by GitHub
parent a1d6396a90 aeba818634
commit e2adb51494
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra_qt/bootmanager.cpp
View File

@@ -195,7 +195,7 @@ GRenderWindow::GRenderWindow(QWidget* parent_, EmuThread* emu_thread)
QString::fromUtf8(Common::g_scm_desc)));
setAttribute(Qt::WA_AcceptTouchEvents);
auto layout = new QHBoxLayout(this);
layout->setMargin(0);
layout->setContentsMargins(0, 0, 0, 0);
setLayout(layout);
InputCommon::Init();

2
src/citra_qt/game_list.cpp
View File

@@ -134,7 +134,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;