Skip to content

Fix window scaling on MacOS #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffamstutz merged 3 commits into from
Jun 8, 2026
Merged

Fix window scaling on MacOS #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc87aca
tsd: fix macOS Retina UI using render scale instead of font scale
tarcila Jun 5, 2026
600a76b
tsd: Fix missing include in ExtensionManager.h
tarcila Jun 5, 2026
77f0085
rtx: silence C++20-extension warning in MDL::syncParameters
tarcila Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions devices/rtx/device/material/MDL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,11 @@ void MDL::syncParameters()
if (sampler) {
// Find a valid slot for out sampler.
// Check if this input if already bound and then release it
auto it = std::find_if(begin(m_samplers), end(m_samplers), [&name](const SamplerDesc &desc) {
return desc.name == name;
});
auto it = std::find_if(begin(m_samplers),
end(m_samplers),
[&paramName = name](const SamplerDesc &desc) {
return desc.name == paramName;
});
if (it != end(m_samplers)) {
// Found, release
if (it->sampler) {
Expand Down
11 changes: 5 additions & 6 deletions tsd/src/tsd/ui/imgui/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,8 @@ void Application::showImportObjectFileDialog(
m_objectFileDialog->showImport(fileType, importRoot);
}

void Application::showExportObjectFileDialog(TSDObjectFileType fileType,
anari::DataType objectType,
size_t objectIndex)
void Application::showExportObjectFileDialog(
TSDObjectFileType fileType, anari::DataType objectType, size_t objectIndex)
{
m_objectFileDialog->showExport(fileType, objectType, objectIndex);
}
Expand Down Expand Up @@ -374,7 +373,6 @@ WindowArray Application::setupWindows()

auto *window = sdlWindow();
SDL_MaximizeWindow(window);
m_uiConfig.fontScale = SDL_GetWindowDisplayScale(window);

setupImGuiStyle();

Expand Down Expand Up @@ -1207,8 +1205,8 @@ void Application::AppImpl::init(Uint32 windowFlags)

SDL_ShowWindow(sdlWindow);

const float scale = SDL_GetWindowPixelDensity(sdlWindow);
SDL_SetRenderScale(sdlRenderer, scale, scale);
float pixelDensity = SDL_GetWindowPixelDensity(sdlWindow);
SDL_SetRenderScale(sdlRenderer, pixelDensity, pixelDensity);

ImGui::CreateContext();
ImGui::StyleColorsDark();
Expand All @@ -1219,6 +1217,7 @@ void Application::AppImpl::init(Uint32 windowFlags)
ImGuiIO &io = ImGui::GetIO();
io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
io.DisplayFramebufferScale = ImVec2(pixelDensity, pixelDensity);

ImGuiStyle &style = ImGui::GetStyle();
if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
Expand Down
1 change: 1 addition & 0 deletions tsd/src/tsd/ui/imgui/ExtensionManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#pragma once

#include <cstdint>
#include <functional>
#include <memory>
#include <string>
Expand Down
Loading