From 99a44990bac1ac45b15303e8a73fb2696347a8c8 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 30 Jan 2026 11:08:20 +0100 Subject: [PATCH] [client,sdl] rename SdlContext::removeDisplay To match with SdlContext::addDisplayWindow rename it to SdlContext::removeDisplayWindow --- client/SDL/SDL3/sdl_context.cpp | 2 +- client/SDL/SDL3/sdl_context.hpp | 4 ++-- client/SDL/SDL3/sdl_disp.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/SDL/SDL3/sdl_context.cpp b/client/SDL/SDL3/sdl_context.cpp index 3f2328c46..56240c8ac 100644 --- a/client/SDL/SDL3/sdl_context.cpp +++ b/client/SDL/SDL3/sdl_context.cpp @@ -878,7 +878,7 @@ bool SdlContext::addDisplayWindow(SDL_DisplayID id) return true; } -bool SdlContext::removeDisplay(SDL_DisplayID id) +bool SdlContext::removeDisplayWindow(SDL_DisplayID id) { for (auto& w : _windows) { diff --git a/client/SDL/SDL3/sdl_context.hpp b/client/SDL/SDL3/sdl_context.hpp index 2110c4e30..393feee2c 100644 --- a/client/SDL/SDL3/sdl_context.hpp +++ b/client/SDL/SDL3/sdl_context.hpp @@ -120,7 +120,7 @@ class SdlContext [[nodiscard]] SdlWindow* getFirstWindow(); [[nodiscard]] bool addDisplayWindow(SDL_DisplayID id); - [[nodiscard]] bool removeDisplay(SDL_DisplayID id); + [[nodiscard]] bool removeDisplayWindow(SDL_DisplayID id); [[nodiscard]] sdlDispContext& getDisplayChannelContext(); [[nodiscard]] sdlInput& getInputChannelContext(); @@ -206,7 +206,7 @@ class SdlContext SdlConnectionDialogWrapper _dialog; - std::map _windows; + std::map _windows; uint32_t _windowWidth = 0; uint32_t _windowHeigth = 0; diff --git a/client/SDL/SDL3/sdl_disp.cpp b/client/SDL/SDL3/sdl_disp.cpp index 4478f070d..02ff07a45 100644 --- a/client/SDL/SDL3/sdl_disp.cpp +++ b/client/SDL/SDL3/sdl_disp.cpp @@ -308,7 +308,7 @@ bool sdlDispContext::updateMonitors(SDL_EventType type, SDL_DisplayID displayID) return false; break; case SDL_EVENT_DISPLAY_REMOVED: - if (!_sdl->removeDisplay(displayID)) + if (!_sdl->removeDisplayWindow(displayID)) return false; break; default: