From acd2cbabdab057bb70ac43fa866bf69ea4ad2254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=CC=87evgen=20Baida?= Date: Mon, 19 Feb 2024 21:55:21 +0100 Subject: [PATCH] Calculate `closeSize` and `closeMargin` unconditionally --- .../Forms/ThemedControls/ThemedDocumentControlHandler.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Eto/Forms/ThemedControls/ThemedDocumentControlHandler.cs b/src/Eto/Forms/ThemedControls/ThemedDocumentControlHandler.cs index 67db27207..a0486c3e7 100644 --- a/src/Eto/Forms/ThemedControls/ThemedDocumentControlHandler.cs +++ b/src/Eto/Forms/ThemedControls/ThemedDocumentControlHandler.cs @@ -693,7 +693,7 @@ void CalculateTab(ThemedDocumentPageHandler tab, int i, ref float posx) size.Width += textoffset; } - var closesize = UseFixedTabHeight ? minImageSquareSide : tabDrawable.Height / 2; + var closesize = (int)Math.Floor(tabDrawable.Height * 0.6); var tabRect = new RectangleF(posx, 0, size.Width + (tab.Closable ? closesize + tabPadding.Horizontal + tabPadding.Right : tabPadding.Horizontal), tabDrawable.Height); if (i == selectedIndex && draggingLocation != null) @@ -703,7 +703,7 @@ void CalculateTab(ThemedDocumentPageHandler tab, int i, ref float posx) tab.Rect = tabRect; - tab.CloseRect = new RectangleF(tabRect.X + tab.Rect.Width - tabPadding.Right - closesize, tabDrawable.Height / 4, closesize, closesize); + tab.CloseRect = new RectangleF(tabRect.X + tab.Rect.Width - tabPadding.Right - closesize, (tabDrawable.Height - closesize) / 2, closesize, closesize); tab.TextRect = new RectangleF(tabRect.X + tabPadding.Left + textoffset, (tabDrawable.Height - size.Height) / 2, textSize.Width, textSize.Height); posx += tab.Rect.Width; @@ -722,7 +722,7 @@ void DrawTab(Graphics g, ThemedDocumentPageHandler tab, int i) var tabRect = tab.Rect; var textRect = tab.TextRect; var closerect = tab.CloseRect; - var closemargin = UseFixedTabHeight ? 3 : closerect.Height / 3; + var closemargin = closerect.Height / 5; var textcolor = Enabled ? TabForegroundColor : DisabledForegroundColor; var backcolor = TabBackgroundColor;