diff options
| author | 2021-08-01 21:46:13 +0200 | |
|---|---|---|
| committer | 2021-08-01 21:46:13 +0200 | |
| commit | 3e2614148353342284b06899080e4707804eecf5 (patch) | |
| tree | 2d34250d81a20709dbbf8dc4a57a8e4b827e7c8f | |
| parent | game_list: Make game list folder icons smaller (#6762) (diff) | |
| download | yuzu-3e2614148353342284b06899080e4707804eecf5.tar.gz yuzu-3e2614148353342284b06899080e4707804eecf5.tar.xz yuzu-3e2614148353342284b06899080e4707804eecf5.zip | |
yuzu-cmd: hide cursor when in fullscreen
Exposed the SDL_ShowCursor function to EmuWindow baseclass. When creating the window (GL or VK) in fullscreen it now automatically hides the cursor.
Diffstat (limited to '')
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.h | 3 | ||||
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp | 1 | ||||
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp | 1 |
4 files changed, 9 insertions, 0 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index f643a4b0b..c80f7791c 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | |||
| @@ -122,6 +122,10 @@ void EmuWindow_SDL2::OnResize() { | |||
| 122 | UpdateCurrentFramebufferLayout(width, height); | 122 | UpdateCurrentFramebufferLayout(width, height); |
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | void EmuWindow_SDL2::ShowCursor(bool show_cursor) { | ||
| 126 | SDL_ShowCursor(show_cursor ? SDL_ENABLE : SDL_DISABLE); | ||
| 127 | } | ||
| 128 | |||
| 125 | void EmuWindow_SDL2::Fullscreen() { | 129 | void EmuWindow_SDL2::Fullscreen() { |
| 126 | switch (Settings::values.fullscreen_mode.GetValue()) { | 130 | switch (Settings::values.fullscreen_mode.GetValue()) { |
| 127 | case Settings::FullscreenMode::Exclusive: | 131 | case Settings::FullscreenMode::Exclusive: |
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.h b/src/yuzu_cmd/emu_window/emu_window_sdl2.h index aa0d52ae4..4810f8775 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.h +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.h | |||
| @@ -67,6 +67,9 @@ protected: | |||
| 67 | /// Called by WaitEvent when any event that may cause the window to be resized occurs | 67 | /// Called by WaitEvent when any event that may cause the window to be resized occurs |
| 68 | void OnResize(); | 68 | void OnResize(); |
| 69 | 69 | ||
| 70 | /// Called when users want to hide the mouse cursor | ||
| 71 | void ShowCursor(bool show_cursor); | ||
| 72 | |||
| 70 | /// Called when user passes the fullscreen parameter flag | 73 | /// Called when user passes the fullscreen parameter flag |
| 71 | void Fullscreen(); | 74 | void Fullscreen(); |
| 72 | 75 | ||
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp index 5b98c255b..a075ad08a 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp | |||
| @@ -111,6 +111,7 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsyste | |||
| 111 | 111 | ||
| 112 | if (fullscreen) { | 112 | if (fullscreen) { |
| 113 | Fullscreen(); | 113 | Fullscreen(); |
| 114 | ShowCursor(false); | ||
| 114 | } | 115 | } |
| 115 | 116 | ||
| 116 | window_context = SDL_GL_CreateContext(render_window); | 117 | window_context = SDL_GL_CreateContext(render_window); |
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp index cdda375d8..de40b76bf 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp | |||
| @@ -45,6 +45,7 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsyste | |||
| 45 | 45 | ||
| 46 | if (fullscreen) { | 46 | if (fullscreen) { |
| 47 | Fullscreen(); | 47 | Fullscreen(); |
| 48 | ShowCursor(false); | ||
| 48 | } | 49 | } |
| 49 | 50 | ||
| 50 | switch (wm.subsystem) { | 51 | switch (wm.subsystem) { |