Merge pull request #949 from ermshiperete/bug-novell-463149

[MWF] Fix text position on buttons (#463149)

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs
index 3b21e391a293de272100e402a3615df12f5bda2b..6f3be9db10be9310c4830d8d11564c5497078377 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs
@@ -487,8 +487,8 @@ namespace System.Windows.Forms
                        if ((flags & TextFormatFlags.WordEllipsis) == TextFormatFlags.WordEllipsis || (flags & TextFormatFlags.EndEllipsis) == TextFormatFlags.EndEllipsis || (flags & TextFormatFlags.WordBreak) == TextFormatFlags.WordBreak) {
                                r.Width -= 4;
                        }
-                       if ((flags & TextFormatFlags.VerticalCenter) == TextFormatFlags.VerticalCenter) {
-                               r.Y += 1;
+                       if ((flags & TextFormatFlags.VerticalCenter) == TextFormatFlags.VerticalCenter && XplatUI.RunningOnUnix) {
+                               r.Y -= 1;
                        }
 
                        return r;