summaryrefslogtreecommitdiffstats
path: root/src/core/frontend
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-08-12 04:40:08 +0200
committerGitHub <noreply@github.com>2018-08-12 04:40:08 +0200
commitee07041b3a6c45ae1ff9e02d24341f7819a4b004 (patch)
treee4e46c365dcdcd701d31dcec93dca4d0a534d09a /src/core/frontend
parentMerge pull request #1021 from lioncash/warn (diff)
parentcore: Namespace EmuWindow (diff)
downloadyuzu-ee07041b3a6c45ae1ff9e02d24341f7819a4b004.tar
yuzu-ee07041b3a6c45ae1ff9e02d24341f7819a4b004.tar.gz
yuzu-ee07041b3a6c45ae1ff9e02d24341f7819a4b004.tar.bz2
yuzu-ee07041b3a6c45ae1ff9e02d24341f7819a4b004.tar.lz
yuzu-ee07041b3a6c45ae1ff9e02d24341f7819a4b004.tar.xz
yuzu-ee07041b3a6c45ae1ff9e02d24341f7819a4b004.tar.zst
yuzu-ee07041b3a6c45ae1ff9e02d24341f7819a4b004.zip
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 @@
#include "core/frontend/input.h"
#include "core/settings.h"
+namespace Core::Frontend {
+
class EmuWindow::TouchState : public Input::Factory<Input::TouchDevice>,
public std::enable_shared_from_this<TouchState> {
public:
@@ -108,3 +110,5 @@ void EmuWindow::TouchMoved(unsigned framebuffer_x, unsigned framebuffer_y) {
void EmuWindow::UpdateCurrentFramebufferLayout(unsigned width, unsigned height) {
NotifyFramebufferLayoutChanged(Layout::DefaultFrameLayout(width, height));
}
+
+} // 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 @@
#include "common/common_types.h"
#include "core/frontend/framebuffer_layout.h"
+namespace Core::Frontend {
+
/**
* Abstraction class used to provide an interface between emulation code and the frontend
* (e.g. SDL, QGLWidget, GLFW, etc...).
@@ -166,3 +168,5 @@ private:
*/
std::tuple<unsigned, unsigned> ClipToTouchScreen(unsigned new_x, unsigned new_y);
};
+
+} // namespace Core::Frontend