diff options
author | archshift <admin@archshift.com> | 2014-09-13 02:06:13 +0200 |
---|---|---|
committer | archshift <admin@archshift.com> | 2014-10-08 00:09:37 +0200 |
commit | e6594f9f53df456db42ab2091a7b1397070ff9c8 (patch) | |
tree | a1ca13000e379f753a155580560c20e015c2e552 /src/common/emu_window.h | |
parent | Merge pull request #118 from lioncash/chunk-file (diff) | |
download | yuzu-e6594f9f53df456db42ab2091a7b1397070ff9c8.tar yuzu-e6594f9f53df456db42ab2091a7b1397070ff9c8.tar.gz yuzu-e6594f9f53df456db42ab2091a7b1397070ff9c8.tar.bz2 yuzu-e6594f9f53df456db42ab2091a7b1397070ff9c8.tar.lz yuzu-e6594f9f53df456db42ab2091a7b1397070ff9c8.tar.xz yuzu-e6594f9f53df456db42ab2091a7b1397070ff9c8.tar.zst yuzu-e6594f9f53df456db42ab2091a7b1397070ff9c8.zip |
Diffstat (limited to '')
-rw-r--r-- | src/common/emu_window.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/common/emu_window.h b/src/common/emu_window.h index 23f178fdf..34cecb40b 100644 --- a/src/common/emu_window.h +++ b/src/common/emu_window.h @@ -16,7 +16,7 @@ class EmuWindow public: /// Data structure to store an emuwindow configuration - struct Config{ + struct WindowConfig { bool fullscreen; int res_width; int res_height; @@ -34,17 +34,19 @@ public: /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread virtual void DoneCurrent() = 0; + virtual void ReloadSetKeymaps() = 0; + /// Signals a key press action to the HID module static void KeyPressed(KeyMap::HostDeviceKey key); /// Signals a key release action to the HID module static void KeyReleased(KeyMap::HostDeviceKey key); - Config GetConfig() const { + WindowConfig GetConfig() const { return m_config; } - void SetConfig(const Config& val) { + void SetConfig(const WindowConfig& val) { m_config = val; } @@ -86,6 +88,6 @@ protected: int m_client_area_height; ///< Current client height, should be set by window impl. private: - Config m_config; ///< Internal configuration + WindowConfig m_config; ///< Internal configuration }; |