diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/frontend/emu_window.h | 3 | ||||
| -rw-r--r-- | src/yuzu/bootmanager.cpp | 3 | ||||
| -rw-r--r-- | src/yuzu/bootmanager.h | 3 | ||||
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 3 | ||||
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.h | 3 |
5 files changed, 5 insertions, 10 deletions
diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.h index e2c290dc1..4a9912641 100644 --- a/src/core/frontend/emu_window.h +++ b/src/core/frontend/emu_window.h | |||
| @@ -169,8 +169,7 @@ private: | |||
| 169 | * For the request to be honored, EmuWindow implementations will usually reimplement this | 169 | * For the request to be honored, EmuWindow implementations will usually reimplement this |
| 170 | * function. | 170 | * function. |
| 171 | */ | 171 | */ |
| 172 | virtual void OnMinimalClientAreaChangeRequest( | 172 | virtual void OnMinimalClientAreaChangeRequest(std::pair<unsigned, unsigned>) { |
| 173 | const std::pair<unsigned, unsigned>& minimal_size) { | ||
| 174 | // By default, ignore this request and do nothing. | 173 | // By default, ignore this request and do nothing. |
| 175 | } | 174 | } |
| 176 | 175 | ||
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index c2783d684..484c0f1c5 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp | |||
| @@ -440,8 +440,7 @@ void GRenderWindow::CaptureScreenshot(u16 res_scale, const QString& screenshot_p | |||
| 440 | layout); | 440 | layout); |
| 441 | } | 441 | } |
| 442 | 442 | ||
| 443 | void GRenderWindow::OnMinimalClientAreaChangeRequest( | 443 | void GRenderWindow::OnMinimalClientAreaChangeRequest(std::pair<unsigned, unsigned> minimal_size) { |
| 444 | const std::pair<unsigned, unsigned>& minimal_size) { | ||
| 445 | setMinimumSize(minimal_size.first, minimal_size.second); | 444 | setMinimumSize(minimal_size.first, minimal_size.second); |
| 446 | } | 445 | } |
| 447 | 446 | ||
diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h index 3df33aca1..7f9f8e8e3 100644 --- a/src/yuzu/bootmanager.h +++ b/src/yuzu/bootmanager.h | |||
| @@ -162,8 +162,7 @@ private: | |||
| 162 | void TouchUpdateEvent(const QTouchEvent* event); | 162 | void TouchUpdateEvent(const QTouchEvent* event); |
| 163 | void TouchEndEvent(); | 163 | void TouchEndEvent(); |
| 164 | 164 | ||
| 165 | void OnMinimalClientAreaChangeRequest( | 165 | void OnMinimalClientAreaChangeRequest(std::pair<unsigned, unsigned> minimal_size) override; |
| 166 | const std::pair<unsigned, unsigned>& minimal_size) override; | ||
| 167 | 166 | ||
| 168 | QWidget* container = nullptr; | 167 | QWidget* container = nullptr; |
| 169 | GGLWidgetInternal* child = nullptr; | 168 | GGLWidgetInternal* child = nullptr; |
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index d32ad9fa0..a6edc089a 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | |||
| @@ -172,7 +172,6 @@ void EmuWindow_SDL2::PollEvents() { | |||
| 172 | } | 172 | } |
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | void EmuWindow_SDL2::OnMinimalClientAreaChangeRequest( | 175 | void EmuWindow_SDL2::OnMinimalClientAreaChangeRequest(std::pair<unsigned, unsigned> minimal_size) { |
| 176 | const std::pair<unsigned, unsigned>& minimal_size) { | ||
| 177 | SDL_SetWindowMinimumSize(render_window, minimal_size.first, minimal_size.second); | 176 | SDL_SetWindowMinimumSize(render_window, minimal_size.first, minimal_size.second); |
| 178 | } | 177 | } |
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.h b/src/yuzu_cmd/emu_window/emu_window_sdl2.h index 09145835b..d8051ebdf 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.h +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.h | |||
| @@ -50,8 +50,7 @@ protected: | |||
| 50 | void Fullscreen(); | 50 | void Fullscreen(); |
| 51 | 51 | ||
| 52 | /// Called when a configuration change affects the minimal size of the window | 52 | /// Called when a configuration change affects the minimal size of the window |
| 53 | void OnMinimalClientAreaChangeRequest( | 53 | void OnMinimalClientAreaChangeRequest(std::pair<unsigned, unsigned> minimal_size) override; |
| 54 | const std::pair<unsigned, unsigned>& minimal_size) override; | ||
| 55 | 54 | ||
| 56 | /// Is the window still open? | 55 | /// Is the window still open? |
| 57 | bool is_open = true; | 56 | bool is_open = true; |