summaryrefslogtreecommitdiff
path: root/src/core/frontend
diff options
context:
space:
mode:
authorGravatar bunnei2018-08-11 22:40:08 -0400
committerGravatar GitHub2018-08-11 22:40:08 -0400
commitee07041b3a6c45ae1ff9e02d24341f7819a4b004 (patch)
treee4e46c365dcdcd701d31dcec93dca4d0a534d09a /src/core/frontend
parentMerge pull request #1021 from lioncash/warn (diff)
parentcore: Namespace EmuWindow (diff)
downloadyuzu-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')
-rw-r--r--src/core/frontend/emu_window.cpp4
-rw-r--r--src/core/frontend/emu_window.h4
2 files changed, 8 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
11namespace Core::Frontend {
12
11class EmuWindow::TouchState : public Input::Factory<Input::TouchDevice>, 13class EmuWindow::TouchState : public Input::Factory<Input::TouchDevice>,
12 public std::enable_shared_from_this<TouchState> { 14 public std::enable_shared_from_this<TouchState> {
13public: 15public:
@@ -108,3 +110,5 @@ void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) {
108void EmuWindow::UpdateCurrentFramebufferLayout(unsigned width, unsigned height) { 110void 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
diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.h
index e8c29adfb..384dc7822 100644
--- a/src/core/frontend/emu_window.h
+++ b/src/core/frontend/emu_window.h
@@ -10,6 +10,8 @@
10#include "common/common_types.h" 10#include "common/common_types.h"
11#include "core/frontend/framebuffer_layout.h" 11#include "core/frontend/framebuffer_layout.h"
12 12
13namespace Core::Frontend {
14
13/** 15/**
14 * Abstraction class used to provide an interface between emulation code and the frontend 16 * Abstraction class used to provide an interface between emulation code and the frontend
15 * (e.g. SDL, QGLWidget, GLFW, etc...). 17 * (e.g. SDL, QGLWidget, GLFW, etc...).
@@ -166,3 +168,5 @@ private:
166 */ 168 */
167 std::tuple<unsigned, unsigned> ClipToTouchScreen(unsigned new_x, unsigned new_y); 169 std::tuple<unsigned, unsigned> ClipToTouchScreen(unsigned new_x, unsigned new_y);
168}; 170};
171
172} // namespace Core::Frontend