From 7d144eb18a9cb7186372f911e86d67cd047c7b82 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Fri, 22 May 2026 23:00:50 -0500
Subject: [PATCH] [studio,turbine] Fix DPI scaling for Mac

---
 src/olympic/studio/applib/src/studioui.cpp | 9 +++++----
 src/olympic/turbine/src/glfw/turbine.cpp   | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/olympic/studio/applib/src/studioui.cpp b/src/olympic/studio/applib/src/studioui.cpp
index 53e96564..f644d166 100644
--- a/src/olympic/studio/applib/src/studioui.cpp
+++ b/src/olympic/studio/applib/src/studioui.cpp
@@ -122,7 +122,8 @@ StudioUI::StudioUI(turbine::Context &tctx, ox::StringParam projectDataDir) noexc
 		m_sctx{*this, tctx},
 		m_projectDataDir{std::move(projectDataDir)} {
 	{
-		auto const scale = turbine::isWayland() ? 1.f : turbine::scale(m_tctx);
+		auto const scale = turbine::isWayland() || ox::defines::OS == ox::OS::Darwin ?
+			1.f : turbine::scale(m_tctx);
 		ImFontConfig fontCfg;
 		fontCfg.FontDataOwnedByAtlas = false;
 		auto const &io = ImGui::GetIO();
@@ -202,10 +203,10 @@ void StudioUI::handleNavigationChange(ox::StringParam path, ox::StringParam navA
 }
 
 void StudioUI::draw() noexcept {
-	if (!turbine::isWayland()) {
-		ig::setDpiScale(ImGui::GetWindowDpiScale());
-	} else {
+	if (turbine::isWayland() || ox::defines::OS == ox::OS::Darwin) {
 		ig::setDpiScale(1.f);
+	} else {
+		ig::setDpiScale(ImGui::GetWindowDpiScale());
 	}
 	glutils::clearScreen();
 	drawMenu();
diff --git a/src/olympic/turbine/src/glfw/turbine.cpp b/src/olympic/turbine/src/glfw/turbine.cpp
index 6284bbc3..7ada51a4 100644
--- a/src/olympic/turbine/src/glfw/turbine.cpp
+++ b/src/olympic/turbine/src/glfw/turbine.cpp
@@ -376,7 +376,8 @@ ox::Result<ox::UPtr<Context>> init(
 	themeImgui();
 	float xscale{}, yscale{};
 	glfwGetWindowContentScale(ctx->window, &xscale, &yscale);
-	ctx->scale = isWayland() ? 1.f : ox::max(xscale, yscale);
+	ctx->scale = isWayland() || ox::defines::OS == ox::OS::Darwin ?
+		1.f : ox::max(xscale, yscale);
 	io.DisplayFramebufferScale = ImVec2{ctx->scale, ctx->scale};
 	auto &style = ImGui::GetStyle();
 	style.ScaleAllSizes(ctx->scale);