Fixed scaling to remain constant regardless of screen.

Author: Sekqies

src/graphics/ui_init.cpp

@@ -11,35 +11,24 @@
 
 
 void init_imgui(GLFWwindow* window) {
-    IMGUI_CHECKVERSION();
-    ImGui::CreateContext();
-    ImGuiIO& io = ImGui::GetIO();
-    float xscale = 1.0f;
-    float yscale = 1.0f;
-
+	IMGUI_CHECKVERSION();
+	ImGui::CreateContext();
+	ImGuiIO& io = ImGui::GetIO();
+	io.FontGlobalScale = 2.0f;
+	io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
+	io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;
+	io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
+	ImGui_ImplGlfw_InitForOpenGL(window, true);
 #ifdef __EMSCRIPTEN__
-    xscale = emscripten_get_device_pixel_ratio();
-#else
-    glfwGetWindowContentScale(window, &xscale, &yscale);
-#endif
-    io.FontGlobalScale = xscale; 
 
-    //ImGui::GetStyle().ScaleAllSizes(xscale); 
-
-    io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
-    io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;
-    io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
-    ImGui_ImplGlfw_InitForOpenGL(window, true);
-
-#ifdef __EMSCRIPTEN__
-    emscripten_browser_clipboard::paste([](std::string&& paste_data, void* callback_data) {
-        clip_content = std::move(paste_data);
-        just_pasted = true;
-        }, nullptr); 
-    
-    ImGui_ImplOpenGL3_Init("#version 300 es");
+	emscripten_browser_clipboard::paste([](std::string&& paste_data, void* callback_data) {
+		clip_content = std::move(paste_data);
+		just_pasted = true;
+		}, nullptr); 
+	
+	ImGui_ImplOpenGL3_Init("#version 300 es");
 #else
-    ImGui_ImplOpenGL3_Init();
+	ImGui_ImplOpenGL3_Init();
 #endif
 }
 

src/interactions/interactions.cpp

@@ -103,16 +103,46 @@ void window_size_callback(GLFWwindow* window, const int width, const int height)
     state->height = static_cast<float>(height);
 }
 
+void apply_resolution_scaling(int current_height) {
+    if (current_height <= 0) return; 
+
+    ImGuiIO& io = ImGui::GetIO();
+    float base_height = 1080.0f;
+    float raw_scale = static_cast<float>(current_height) / base_height;
+
+    if (raw_scale < 0.75f) raw_scale = 0.75f;
+    if (raw_scale > 2.5f) raw_scale = 2.5f;
+
+    float scale = std::round(raw_scale * 4.0f) / 4.0f;
+
+    io.FontGlobalScale = scale;
+
+    ImGui::GetStyle() = ImGuiStyle();
+    ImGui::GetStyle().ScaleAllSizes(scale);
+
+    ImGuiStyle& style = ImGui::GetStyle();
+    if (style.WindowBorderSize < 1.0f) style.WindowBorderSize = 1.0f;
+    if (style.FrameBorderSize < 1.0f) style.FrameBorderSize = 1.0f;
+    if (style.PopupBorderSize < 1.0f) style.PopupBorderSize = 1.0f;
+    if (style.ChildBorderSize < 1.0f) style.ChildBorderSize = 1.0f;
+    if (style.TabBorderSize < 1.0f) style.TabBorderSize = 1.0f;
+    
+#if IMGUI_VERSION_NUM >= 18900
+    if (style.SeparatorTextBorderSize < 1.0f) style.SeparatorTextBorderSize = 1.0f;
+#endif
+}
+
 void framebuffer_size_callback(GLFWwindow* window, const int width, const int height) {
     glViewport(0, 0, width, height);
+    //apply_resolution_scaling(height);
 }
 
 #ifdef __EMSCRIPTEN__
 EM_BOOL browser_resize_callback(int event_type, const EmscriptenUiEvent* ui_event, void* data) {
     GLFWwindow* window = static_cast<GLFWwindow*>(data);
     const double width = ui_event->windowInnerWidth;
     const double height = ui_event->windowInnerHeight;
-    const double ratio = emscripten_get_device_pixel_ratio();
+    const double ratio = 2;
 
     emscripten_set_canvas_element_size("#canvas", width * ratio, height * ratio);