otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI: fix Wayland/macOS scaling

Browse source 
do scaling in Furnace rather than in ImGui
This commit is contained in:
tildearrow 2025-08-15 05:20:38 -05:00
parent 4cd105c6b2
commit 04f901b224
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
extern/imgui_patched/backends/imgui_impl_sdl2.cpp vendored
View file

@ -1015,6 +1015,11 @@ static void ImGui_ImplSDL2_GetWindowSizeAndFramebufferScale(SDL_Window* window,
// tildearrow: TODO: good idea?
if (out_framebuffer_scale != nullptr && w > 0 && h > 0)
*out_framebuffer_scale = (w > 0 && h > 0) ? ImVec2((float)display_w / w, (float)display_h / h) : ImVec2(1.0f, 1.0f);
*out_w=w;
*out_h=h;
*out_display_w=display_w;
*out_display_h=display_h;
}
void ImGui_ImplSDL2_NewFrame()
@ -1030,7 +1035,6 @@ void ImGui_ImplSDL2_NewFrame()
// Setup main viewport size (every frame to accommodate for window resizing)
ImGui_ImplSDL2_GetWindowSizeAndFramebufferScale(bd->Window, bd->Renderer, &io.DisplaySize, &io.DisplayFramebufferScale, &w, &h, &display_w, &display_h);
// TODO: is this before, or after?
// Update monitors
#ifdef WIN32
@ -1228,11 +1232,8 @@ static void ImGui_ImplSDL2_SetWindowSize(ImGuiViewport* viewport, ImVec2 size)
static ImVec2 ImGui_ImplSDL2_GetWindowFramebufferScale(ImGuiViewport* viewport)
{
// FIXME: SDL_Renderer does not support multi-viewport.
ImGui_ImplSDL2_ViewportData* vd = (ImGui_ImplSDL2_ViewportData*)viewport->PlatformUserData;
ImVec2 framebuffer_scale;
ImGui_ImplSDL2_GetWindowSizeAndFramebufferScale(vd->Window, nullptr, nullptr, &framebuffer_scale, NULL, NULL, NULL, NULL);
return framebuffer_scale;
// tildearrow: not here please.
return ImVec2(1.0f,1.0f);
}
static void ImGui_ImplSDL2_SetWindowTitle(ImGuiViewport* viewport, const char* title)