fix scaling

pkdawson · Apr 20, 2024 · 1dc82a9 · 1dc82a9
1 parent 50fa981
commit 1dc82a9
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/Dear ImGui for Godot Demo.csproj b/Dear ImGui for Godot Demo.csproj
@@ -12,19 +12,19 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ImGui.NET" Version="1.90.1.1" />
-    <PackageReference Include="Roslynator.Analyzers" Version="4.10.0">
+    <PackageReference Include="Roslynator.Analyzers" Version="4.12.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.10.0">
+    <PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.12.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Roslynator.CodeFixes" Version="4.10.0">
+    <PackageReference Include="Roslynator.CodeFixes" Version="4.12.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.10.0">
+    <PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/addons/imgui-godot/ImGuiGodot/Internal/BackendNative.cs b/addons/imgui-godot/ImGuiGodot/Internal/BackendNative.cs
@@ -31,7 +31,11 @@ public float JoyAxisDeadZone
         set => _gd.Set(PropertyName.JoyAxisDeadZone, value);
     }
 
-    public float Scale { get; set; } = 1.0f; // TODO: make property
+    public float Scale
+    {
+        get => (float)_gd.Get(PropertyName.Scale);
+        set => _gd.Set(PropertyName.Scale, value);
+    }
 
     public bool Visible
     {

diff --git a/gdext/src/Context.cpp b/gdext/src/Context.cpp
@@ -283,9 +283,9 @@ void AddFontDefault()
     ctx->fonts->Add(nullptr, 13, false);
 }
 
-void RebuildFontAtlas()
+void RebuildFontAtlas(float scale)
 {
-    ctx->fonts->RebuildFontAtlas(ctx->scale);
+    ctx->fonts->RebuildFontAtlas(scale);
 }
 
 void SetIniFilename(const String& fn)

diff --git a/gdext/src/Context.h b/gdext/src/Context.h
@@ -74,7 +74,7 @@ void Connect(const Callable& callable);
 void ResetFonts();
 void AddFont(const Ref<FontFile>& fontFile, int fontSize, bool merge = false);
 void AddFontDefault();
-void RebuildFontAtlas();
+void RebuildFontAtlas(float scale = 1.0f);
 void SetIniFilename(const String& fn);
 void SetVisible(bool visible);
 bool IsVisible();

diff --git a/gdext/src/ImGuiGD.cpp b/gdext/src/ImGuiGD.cpp
@@ -95,7 +95,9 @@ void ImGuiGD::AddFontDefault()
 
 void ImGuiGD::RebuildFontAtlas(float scale)
 {
-    ImGui::Godot::RebuildFontAtlas();
+    bool scaleToDpi = ProjectSettings::get_singleton()->get_setting("display/window/dpi/allow_hidpi");
+    int dpiFactor = std::max(1, DisplayServer::get_singleton()->screen_get_dpi() / 96);
+    ImGui::Godot::RebuildFontAtlas(scaleToDpi ? dpiFactor * scale : scale);
 }
 
 void ImGuiGD::_SetVisible(bool visible)
@@ -108,8 +110,9 @@ void ImGuiGD::_SetVisible(bool visible)
 bool ImGuiGD::_GetVisible()
 {
     CanvasLayer* igl = Object::cast_to<CanvasLayer>(Engine::get_singleton()->get_singleton("ImGuiLayer"));
-    ERR_FAIL_COND_V(!igl, false);
-    return igl->is_visible();
+    if (igl)
+        return igl->is_visible();
+    return false;
 }
 
 void ImGuiGD::_SetJoyAxisDeadZone(float zone)
@@ -122,16 +125,21 @@ float ImGuiGD::_GetJoyAxisDeadZone()
     Context* ctx = ImGui::Godot::GetContext();
     if (ctx)
         return ctx->input->GetJoyAxisDeadZone();
-    else
-        return 0.15f;
+    return 0.15f;
 }
 
 void ImGuiGD::_SetScale(float scale)
 {
+    Context* ctx = ImGui::Godot::GetContext();
+    ERR_FAIL_COND(!ctx);
+    ctx->scale = scale;
 }
 
 float ImGuiGD::_GetScale()
 {
+    Context* ctx = ImGui::Godot::GetContext();
+    if (ctx)
+        return ctx->scale;
     return 1.0f;
 }