Use standard image size 16x16 when using fixed tab height

picoe · Nov 16, 2023 · e99d2eb · e99d2eb
1 parent 6389fe0
commit e99d2eb
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/Eto/Forms/ThemedControls/ThemedDocumentControlHandler.cs b/src/Eto/Forms/ThemedControls/ThemedDocumentControlHandler.cs
@@ -413,10 +413,9 @@ void CalculateTabHeight(bool force = false)
 	{
 		if (!force && !Widget.Loaded)
 			return;
-		var fontHeight = CalculateFontHeight();
 
-		var height = useFixedTabHeight ? fontHeight : Math.Max(maxImageSize.Height, fontHeight);
-		tabDrawable.Height = height + TabPadding.Vertical; // 2 px padding at top and bottom
+		var tabContentHeight = useFixedTabHeight ? minImageSquareSide : Math.Max(maxImageSize.Height, CalculateFontHeight());
+		tabDrawable.Height = tabContentHeight + TabPadding.Vertical; // 2 px padding at top and bottom
 	}
 
 	private int CalculateFontHeight()
@@ -430,10 +429,9 @@ void CalculateImageSizes(bool force = false)
 		if (!force && !Widget.Loaded)
 			return;
 
-		var fontHeight = CalculateFontHeight();
-		maxImageSize = new Size(fontHeight, fontHeight);
+		maxImageSize = new Size(minImageSquareSide, minImageSquareSide);
 
-		if(UseFixedTabHeight)
+		if (UseFixedTabHeight)
 			return;
 
 		for (int i = 0; i < pages.Count; i++)