diff options
| author | 2015-03-07 18:18:40 -0500 | |
|---|---|---|
| committer | 2015-03-07 18:18:40 -0500 | |
| commit | 06bf4715810489548a9a3b5e9274dfc78bc3fc4d (patch) | |
| tree | a2722e2b7e1356d9cb9725f18f0561fcaf815ec1 /src/citra_qt/bootmanager.cpp | |
| parent | Merge pull request #637 from Subv/etc (diff) | |
| parent | Set framebuffer layout from EmuWindow. (diff) | |
| download | yuzu-06bf4715810489548a9a3b5e9274dfc78bc3fc4d.tar.gz yuzu-06bf4715810489548a9a3b5e9274dfc78bc3fc4d.tar.xz yuzu-06bf4715810489548a9a3b5e9274dfc78bc3fc4d.zip | |
Merge pull request #636 from bunnei/refactor-screen-win
Set framebuffer layout from EmuWindow.
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 6514288a0..a040e75c1 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -155,6 +155,7 @@ GRenderWindow::GRenderWindow(QWidget* parent) : QWidget(parent), emu_thread(this | |||
| 155 | 155 | ||
| 156 | child = new GGLWidgetInternal(fmt, this); | 156 | child = new GGLWidgetInternal(fmt, this); |
| 157 | QBoxLayout* layout = new QHBoxLayout(this); | 157 | QBoxLayout* layout = new QHBoxLayout(this); |
| 158 | |||
| 158 | resize(VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight); | 159 | resize(VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight); |
| 159 | layout->addWidget(child); | 160 | layout->addWidget(child); |
| 160 | layout->setMargin(0); | 161 | layout->setMargin(0); |
| @@ -234,7 +235,7 @@ void GRenderWindow::OnFramebufferSizeChanged() | |||
| 234 | unsigned height = child->QPaintDevice::height(); | 235 | unsigned height = child->QPaintDevice::height(); |
| 235 | #endif | 236 | #endif |
| 236 | 237 | ||
| 237 | NotifyFramebufferSizeChanged(std::make_pair(width, height)); | 238 | NotifyFramebufferLayoutChanged(EmuWindow::FramebufferLayout::DefaultScreenLayout(width, height)); |
| 238 | } | 239 | } |
| 239 | 240 | ||
| 240 | void GRenderWindow::BackupGeometry() | 241 | void GRenderWindow::BackupGeometry() |