summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd/emu_window
diff options
context:
space:
mode:
authorGravatar bunnei2021-04-23 09:26:56 -0700
committerGravatar GitHub2021-04-23 09:26:56 -0700
commit19bbdedf00db2c611debada864821ce63f6532e4 (patch)
treeda8ff437572d41c249be8047d75e8560d3d7aa8d /src/yuzu_cmd/emu_window
parentMerge pull request #6225 from ameerj/unused-header (diff)
parentemu_window: Return pair from ClipToTouchScreen() instead of tuple (diff)
downloadyuzu-19bbdedf00db2c611debada864821ce63f6532e4.tar.gz
yuzu-19bbdedf00db2c611debada864821ce63f6532e4.tar.xz
yuzu-19bbdedf00db2c611debada864821ce63f6532e4.zip
Merge pull request #6232 from lioncash/alias2
emu_window: unsigned -> u32
Diffstat (limited to 'src/yuzu_cmd/emu_window')
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2.cpp2
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
index 3bb555a6b..d64f81106 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
@@ -238,6 +238,6 @@ void EmuWindow_SDL2::SetWindowIcon() {
238 SDL_FreeSurface(window_icon); 238 SDL_FreeSurface(window_icon);
239} 239}
240 240
241void EmuWindow_SDL2::OnMinimalClientAreaChangeRequest(std::pair<unsigned, unsigned> minimal_size) { 241void EmuWindow_SDL2::OnMinimalClientAreaChangeRequest(std::pair<u32, u32> minimal_size) {
242 SDL_SetWindowMinimumSize(render_window, minimal_size.first, minimal_size.second); 242 SDL_SetWindowMinimumSize(render_window, minimal_size.first, minimal_size.second);
243} 243}
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.h b/src/yuzu_cmd/emu_window/emu_window_sdl2.h
index 0e17bbca7..1b9ab5b93 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2.h
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.h
@@ -71,7 +71,7 @@ protected:
71 void Fullscreen(); 71 void Fullscreen();
72 72
73 /// Called when a configuration change affects the minimal size of the window 73 /// Called when a configuration change affects the minimal size of the window
74 void OnMinimalClientAreaChangeRequest(std::pair<unsigned, unsigned> minimal_size) override; 74 void OnMinimalClientAreaChangeRequest(std::pair<u32, u32> minimal_size) override;
75 75
76 /// Is the window still open? 76 /// Is the window still open?
77 bool is_open = true; 77 bool is_open = true;