Merge pull request #578 from 602p/ngscope_dpi

Support window content scale in ngscopeclient
ngscopeclient · Mar 25, 2023 · 1563bb4 · 1563bb4
2 parents 17d69b2 + 83b38f0
commit 1563bb4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/src/ngscopeclient/FontManager.cpp b/src/ngscopeclient/FontManager.cpp
@@ -52,7 +52,7 @@ FontManager::~FontManager()
 
 	@return True if changes were made to the font atlas
  */
-bool FontManager::UpdateFonts(PreferenceCategory& root)
+bool FontManager::UpdateFonts(PreferenceCategory& root, float contentScale)
 {
 	//Make a list of fonts we want to have
 	set<FontDescription> fonts;
@@ -98,7 +98,7 @@ bool FontManager::UpdateFonts(PreferenceCategory& root)
 
 	//Load the fonts
 	for(auto f : fonts)
-		m_fonts[f] = atlas->AddFontFromFileTTF(f.first.c_str(), f.second, nullptr, ranges.Data);
+		m_fonts[f] = atlas->AddFontFromFileTTF(f.first.c_str(), f.second * contentScale, nullptr, ranges.Data);
 
 	//Done loading fonts, build the texture
 	atlas->Flags = ImFontAtlasFlags_NoMouseCursors;

diff --git a/src/ngscopeclient/FontManager.h b/src/ngscopeclient/FontManager.h
@@ -46,7 +46,7 @@ class FontManager
 	FontManager();
 	~FontManager();
 
-	bool UpdateFonts(PreferenceCategory& root);
+	bool UpdateFonts(PreferenceCategory& root, float contentScale);
 
 	/**
 		@brief Gets the font, if any, for the provided description

diff --git a/src/ngscopeclient/MainWindow.cpp b/src/ngscopeclient/MainWindow.cpp
@@ -1102,7 +1102,7 @@ void MainWindow::UpdateFonts()
 	//Check for any changes to font preferences and rebuild the atlas if so
 	//Early out if nothing changed
 	auto& prefs = GetSession().GetPreferences();
-	if(!m_fontmgr.UpdateFonts(prefs.AllPreferences()))
+	if(!m_fontmgr.UpdateFonts(prefs.AllPreferences(), GetContentScale()))
 		return;
 
 	//Set the default font

diff --git a/src/ngscopeclient/VulkanWindow.cpp b/src/ngscopeclient/VulkanWindow.cpp
@@ -175,6 +175,11 @@ VulkanWindow::VulkanWindow(const string& title, shared_ptr<QueueHandle> queue)
 		ImGui_ImplVulkan_Init(&info, **m_renderPass);
 	}
 
+	// Apply DPI scaling now that glfw initialized
+	float scale = GetContentScale();
+	LogTrace("Applying ImGui style scale factor: %.2f\n", scale);
+	ImGui::GetStyle().ScaleAllSizes(scale);
+
 	//Hook a couple of backend functions with mutexing
 	ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO();
 	ImGui_ImplVulkan_CreateWindow = platform_io.Renderer_CreateWindow;
@@ -304,11 +309,6 @@ bool VulkanWindow::UpdateFramebuffer()
 		return false;
 	}
 
-	float xscale;
-	float yscale;
-	glfwGetWindowContentScale(m_window, &xscale, &yscale);
-	LogTrace("Scale: %.2f, %.2f\n", xscale, yscale);
-
 	const VkFormat requestSurfaceImageFormat[] =
 	{
 		VK_FORMAT_B8G8R8A8_UNORM,
@@ -403,6 +403,16 @@ bool VulkanWindow::UpdateFramebuffer()
 	return true;
 }
 
+float VulkanWindow::GetContentScale()
+{
+	float xscale;
+	float yscale;
+	glfwGetWindowContentScale(m_window, &xscale, &yscale);
+
+	// Hope this works well should a screen have unequal X- and Y- DPIs...
+	return (xscale + yscale) / 2;
+}
+
 void VulkanWindow::Render()
 {
 	//If we're re-rendering after the window size changed, fix up the framebuffer before we worry about anything else

diff --git a/src/ngscopeclient/VulkanWindow.h b/src/ngscopeclient/VulkanWindow.h
@@ -49,6 +49,10 @@ class VulkanWindow
 	GLFWwindow* GetWindow()
 	{ return m_window; }
 
+	// Return a DPI 'scale' value where 1 ~= 96DPI
+	// Akin to uses of `get_pango_context()->get_resolution() / 96` in glscopeclient
+	float GetContentScale();
+
 	virtual void Render();
 
 	std::shared_ptr<QueueHandle> GetRenderQueue()