More linux scaling issue fixes

- Fix blurry down arrow on dropdown toolbar buttons - Fix tab width calculation
sirjuddington · Jun 1, 2024 · fabf6fc · fabf6fc
1 parent 1f32dfd
commit fabf6fc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/UI/SAuiTabArt.cpp b/src/UI/SAuiTabArt.cpp
@@ -448,14 +448,14 @@ wxSize SAuiTabArt::GetTabSize(
 
 	// if close buttons are enabled, add space for one
 	if (close_buttons_)
-		tab_width += m_activeCloseBmp.GetPreferredBitmapSizeFor(wnd).x + padding_;
+		tab_width += wnd->FromPhys(m_activeCloseBmp.GetPreferredBitmapSizeFor(wnd).x) + padding_;
 
 	// if there's a bitmap, add space for it
 	if (bitmap.IsOk())
 	{
-		tab_width += bitmap.GetPreferredBitmapSizeFor(wnd).x;
+		tab_width += wnd->FromPhys(bitmap.GetPreferredBitmapSizeFor(wnd).x);
 		tab_width += padding_; // right side bitmap padding
-		tab_height = wxMax(tab_height, bitmap.GetPreferredBitmapSizeFor(wnd).y);
+		tab_height = wxMax(tab_height, wnd->FromPhys(bitmap.GetPreferredBitmapSizeFor(wnd).y));
 	}
 	else if (tabs_condensed)
 		tab_width += padding_ * 2; // a bit extra padding if there isn't an icon in condensed mode

diff --git a/src/UI/SToolBar/SToolBarButton.cpp b/src/UI/SToolBar/SToolBarButton.cpp
@@ -443,14 +443,17 @@ void SToolBarButton::onPaint(wxPaintEvent& e)
 	if (menu_dropdown_)
 	{
 		static auto arrow_down = icons::getInterfaceIcon("arrow-down", FromDIP(icon_size_ * 0.75))
-									 .GetBitmap(wxDefaultSize);
+									 .GetBitmapFor(this);
+
+		auto a_width = FromPhys(arrow_down.GetWidth());
+		auto a_height = FromPhys(arrow_down.GetHeight());
 
 		gc->DrawBitmap(
 			arrow_down,
-			width - arrow_down.GetWidth() - pad_outer_,
-			height / 2. - arrow_down.GetHeight() / 2.,
-			arrow_down.GetWidth(),
-			arrow_down.GetHeight());
+			width - a_width - pad_outer_,
+			height / 2. - a_height / 2.,
+			a_width,
+			a_height);
 	}
 
 	delete gc;