Skip to content

Commit 218d961

Browse files
committed
Update high DPI handling
1 parent 1a36214 commit 218d961

File tree

6 files changed

+5
-20
lines changed

6 files changed

+5
-20
lines changed

src/core/Core/Application.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,12 @@ ExitStatus App::Application::run() {
147147
// Rendering
148148
ImGui::Render();
149149

150+
SDL_RenderSetScale(m_window->get_native_renderer(),
151+
io.DisplayFramebufferScale.x,
152+
io.DisplayFramebufferScale.y);
150153
SDL_SetRenderDrawColor(m_window->get_native_renderer(), 100, 100, 100, 255);
151154
SDL_RenderClear(m_window->get_native_renderer());
152-
ImGui_ImplSDLRenderer2_RenderDrawData(ImGui::GetDrawData());
155+
ImGui_ImplSDLRenderer2_RenderDrawData(ImGui::GetDrawData(), m_window->get_native_renderer());
153156
SDL_RenderPresent(m_window->get_native_renderer());
154157
}
155158

src/core/Core/Window.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ Window::Window(const Settings& settings) {
3333

3434
SDL_RendererInfo info;
3535
SDL_GetRendererInfo(m_renderer, &info);
36-
DPIHandler::set_render_scale(m_renderer);
3736

3837
APP_DEBUG("Current SDL_Renderer: {}", info.name);
3938
}

src/core/Platform/Linux/DPIHandler.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ WindowSize DPIHandler::get_dpi_aware_window_size(const Window::Settings& setting
2626
return {settings.width, settings.height};
2727
}
2828

29-
void DPIHandler::set_render_scale([[maybe_unused]] SDL_Renderer* renderer) {
30-
APP_PROFILE_FUNCTION();
31-
// do nothing
32-
}
33-
3429
void DPIHandler::set_global_font_scaling([[maybe_unused]] ImGuiIO* io) {
3530
APP_PROFILE_FUNCTION();
3631
// do nothing

src/core/Platform/Mac/DPIHandler.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,6 @@ WindowSize DPIHandler::get_dpi_aware_window_size(const Window::Settings& setting
3030
return {settings.width, settings.height};
3131
}
3232

33-
void DPIHandler::set_render_scale(SDL_Renderer* renderer) {
34-
APP_PROFILE_FUNCTION();
35-
36-
auto scale{get_scale()};
37-
SDL_RenderSetScale(renderer, scale, scale);
38-
}
39-
4033
void DPIHandler::set_global_font_scaling(ImGuiIO* io) {
4134
APP_PROFILE_FUNCTION();
4235

src/core/Platform/Windows/DPIHandler.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ WindowSize DPIHandler::get_dpi_aware_window_size(const Window::Settings& setting
2929
return {width, height};
3030
}
3131

32-
void DPIHandler::set_render_scale([[maybe_unused]] SDL_Renderer* renderer) {
33-
APP_PROFILE_FUNCTION();
34-
// do nothing
35-
}
36-
3732
void DPIHandler::set_global_font_scaling([[maybe_unused]] ImGuiIO* io) {
3833
APP_PROFILE_FUNCTION();
3934
// do nothing

vendor/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ FetchContent_Declare(
1717
FetchContent_Declare(
1818
imgui
1919
GIT_REPOSITORY "https://github.com/ocornut/imgui.git"
20-
GIT_TAG 527b2c45af2f8964f95826bd16ab7c7ed372ae41 # Branch: docking, date: 02.07.2024, 19:05 GMT+1
20+
GIT_TAG 527b2c45af2f8964f95826bd16ab7c7ed372ae41 # Branch: docking, date: 02.07.2024, 19:05 GMT+2
2121
)
2222

2323
FetchContent_Declare(

0 commit comments

Comments
 (0)