TabControlPainter.cs: Horizontally center Text and Image when SizeMode = Fixed.

[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms.Theming / Default / TabControlPainter.cs

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/Default/TabControlPainter.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/Default/TabControlPainter.cs
index 061694459530903091341aeb839d6a078d8db36c..f3d4e9f181e792a7b2a5d9f8bedccbce0377f6ab 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/Default/TabControlPainter.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.Theming/Default/TabControlPainter.cs
@@ -167,7 +167,7 @@ namespace System.Windows.Forms.Theming.Default
 \r
                public TabControlPainter ()\r
                {\r
-                       defaultItemSize = new Size (42, 21);\r
+                       defaultItemSize = new Size (42, 16);\r
                        defaultPadding = new Point (6, 3);\r
                        selectedTabDelta = new Rectangle (2, 2, 4, 3);\r
                        selectedSpacing = 0;\r
@@ -188,8 +188,9 @@ namespace System.Windows.Forms.Theming.Default
                        imagePadding = new Point (2, 3);\r
 \r
                        defaultFormatting = new StringFormat();\r
+                       // Horizontal Alignment is handled in the Draw method\r
                        defaultFormatting.Alignment = StringAlignment.Near;\r
-                       defaultFormatting.LineAlignment = StringAlignment.Near;\r
+                       defaultFormatting.LineAlignment = StringAlignment.Center;\r
                        defaultFormatting.FormatFlags = StringFormatFlags.NoWrap | StringFormatFlags.NoClip;\r
                        defaultFormatting.HotkeyPrefix = HotkeyPrefix.Show;\r
 \r
@@ -229,10 +230,7 @@ namespace System.Windows.Forms.Theming.Default
                public Rectangle GetTabPanelRect (System.Windows.Forms.TabControl tab)\r
                {       \r
                        // Offset the tab page (panel) from the top corner\r
-                       Rectangle res = new Rectangle (tab.ClientRectangle.X,\r
-                               tab.ClientRectangle.Y,\r
-                               tab.ClientRectangle.Width,\r
-                               tab.ClientRectangle.Height);\r
+                       Rectangle res = tab.ClientRectangle;\r
 \r
                        if (tab.TabCount == 0)\r
                                return res;\r
@@ -272,6 +270,12 @@ namespace System.Windows.Forms.Theming.Default
                                end = 0;\r
                                delta = -1;\r
                        }\r
+\r
+                       if (tab.SizeMode == TabSizeMode.Fixed)\r
+                               defaultFormatting.Alignment = StringAlignment.Center;\r
+                       else\r
+                               defaultFormatting.Alignment = StringAlignment.Near;\r
+\r
                        int counter = start;\r
                        for (; counter != end; counter += delta) {\r
                                for (int i = tab.SliderPos; i < tab.TabPages.Count; i++) {\r
@@ -414,16 +418,17 @@ namespace System.Windows.Forms.Theming.Default
                                }\r
                        }\r
 \r
-                       interior = new Rectangle (bounds.Left + focusRectSpacing.X + borderThickness.Left, \r
-                               bounds.Top + focusRectSpacing.Y +  + borderThickness.Top,\r
-                               bounds.Width - (focusRectSpacing.X * 2) - borderThickness.Width, \r
-                               bounds.Height - (focusRectSpacing.Y * 2) - borderThickness.Height);\r
+                       Point padding = tab.Padding;\r
+                       interior = new Rectangle (bounds.Left + padding.X - 1, // substract a little offset\r
+                               bounds.Top + padding.Y,\r
+                               bounds.Width - (padding.X * 2), \r
+                               bounds.Height - (padding.Y * 2));\r
 \r
                        if (tab.DrawMode == TabDrawMode.Normal && page.Text != null) {\r
                                if (tab.Alignment == TabAlignment.Left) {\r
                                        dc.TranslateTransform (bounds.Left, bounds.Bottom);\r
                                        dc.RotateTransform (-90);\r
-                                       dc.DrawString (page.Text, page.Font,\r
+                                       dc.DrawString (page.Text, tab.Font,\r
                                                SystemBrushes.ControlText, \r
                                                tab.Padding.X - 2, // drawstring adds some extra unwanted leading spaces, so trimming\r
                                                tab.Padding.Y,\r
@@ -432,7 +437,7 @@ namespace System.Windows.Forms.Theming.Default
                                } else if (tab.Alignment == TabAlignment.Right) {\r
                                        dc.TranslateTransform (bounds.Right, bounds.Top);\r
                                        dc.RotateTransform (90);\r
-                                       dc.DrawString (page.Text, page.Font,\r
+                                       dc.DrawString (page.Text, tab.Font,\r
                                                SystemBrushes.ControlText, \r
                                                tab.Padding.X - 2, // drawstring adds some extra unwanted leading spaces, so trimming\r
                                                tab.Padding.Y,\r
@@ -442,12 +447,23 @@ namespace System.Windows.Forms.Theming.Default
                                        Rectangle str_rect = interior;\r
 \r
                                        if (tab.ImageList != null && page.ImageIndex >= 0 && page.ImageIndex < tab.ImageList.Images.Count) {\r
-                                               int image_y = interior.Y + (interior.Height - tab.ImageList.ImageSize.Height) / 2;\r
-                                               tab.ImageList.Draw (dc, new Point (interior.X, image_y), page.ImageIndex);\r
+                                               int image_x;\r
+                                               if (tab.SizeMode != TabSizeMode.Fixed) {\r
+                                                       image_x = str_rect.X;\r
+                                               }\r
+                                               else {\r
+                                                       image_x = str_rect.X + (str_rect.Width - tab.ImageList.ImageSize.Width) / 2;\r
+                                                       if (page.Text != null) {\r
+                                                               SizeF textSize = dc.MeasureString(page.Text, page.Font, str_rect.Size);\r
+                                                               image_x -= (int)(textSize.Width / 2);\r
+                                                       }\r
+                                               }\r
+                                               int image_y = str_rect.Y + (str_rect.Height - tab.ImageList.ImageSize.Height) / 2;\r
+                                               tab.ImageList.Draw (dc, new Point (image_x, image_y), page.ImageIndex);\r
                                                str_rect.X += tab.ImageList.ImageSize.Width + 2;\r
                                                str_rect.Width -= tab.ImageList.ImageSize.Width + 2;\r
                                        }\r
-                                       dc.DrawString (page.Text, page.Font,\r
+                                       dc.DrawString (page.Text, tab.Font,\r
                                                SystemBrushes.ControlText,\r
                                                str_rect, \r
                                                defaultFormatting);\r
@@ -464,8 +480,11 @@ namespace System.Windows.Forms.Theming.Default
                                return res;\r
                        }\r
 \r
+                       // TabControl ignores the value of ShowFocusCues\r
                        if (page.Parent.Focused && is_selected) {\r
-                               ThemeEngine.Current.CPDrawFocusRectangle (dc, interior, tab.ForeColor, tab.BackColor);\r
+                               Rectangle focus_rect = bounds;\r
+                               focus_rect.Inflate (-2, -2);\r
+                               ThemeEngine.Current.CPDrawFocusRectangle (dc, focus_rect, tab.BackColor, tab.ForeColor);\r
                        }\r
 \r
                        return res;\r