diff options
| author | 2018-08-11 22:40:08 -0400 | |
|---|---|---|
| committer | 2018-08-11 22:40:08 -0400 | |
| commit | ee07041b3a6c45ae1ff9e02d24341f7819a4b004 (patch) | |
| tree | e4e46c365dcdcd701d31dcec93dca4d0a534d09a /src/core/frontend/emu_window.cpp | |
| parent | Merge pull request #1021 from lioncash/warn (diff) | |
| parent | core: Namespace EmuWindow (diff) | |
| download | yuzu-ee07041b3a6c45ae1ff9e02d24341f7819a4b004.tar.gz yuzu-ee07041b3a6c45ae1ff9e02d24341f7819a4b004.tar.xz yuzu-ee07041b3a6c45ae1ff9e02d24341f7819a4b004.zip | |
Merge pull request #1020 from lioncash/namespace
core: Namespace EmuWindow
Diffstat (limited to 'src/core/frontend/emu_window.cpp')
| -rw-r--r-- | src/core/frontend/emu_window.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp index 2d776c693..9dd493efb 100644 --- a/src/core/frontend/emu_window.cpp +++ b/src/core/frontend/emu_window.cpp | |||
| @@ -8,6 +8,8 @@ | |||
| 8 | #include "core/frontend/input.h" | 8 | #include "core/frontend/input.h" |
| 9 | #include "core/settings.h" | 9 | #include "core/settings.h" |
| 10 | 10 | ||
| 11 | namespace Core::Frontend { | ||
| 12 | |||
| 11 | class EmuWindow::TouchState : public Input::Factory<Input::TouchDevice>, | 13 | class EmuWindow::TouchState : public Input::Factory<Input::TouchDevice>, |
| 12 | public std::enable_shared_from_this<TouchState> { | 14 | public std::enable_shared_from_this<TouchState> { |
| 13 | public: | 15 | public: |
| @@ -108,3 +110,5 @@ void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) { | |||
| 108 | void EmuWindow::UpdateCurrentFramebufferLayout(unsigned width, unsigned height) { | 110 | void EmuWindow::UpdateCurrentFramebufferLayout(unsigned width, unsigned height) { |
| 109 | NotifyFramebufferLayoutChanged(Layout::DefaultFrameLayout(width, height)); | 111 | NotifyFramebufferLayoutChanged(Layout::DefaultFrameLayout(width, height)); |
| 110 | } | 112 | } |
| 113 | |||
| 114 | } // namespace Core::Frontend | ||