diff options
| author | Eberhard Beilharz <eb1@sil.org> | 2014-12-09 19:22:30 +0300 |
|---|---|---|
| committer | Eberhard Beilharz <eb1@sil.org> | 2014-12-09 19:22:30 +0300 |
| commit | c66e9e63c26fea991936d9ba27979c0850bf7467 (patch) | |
| tree | 91262cc0ca926b7b59ac3ff472db4f61870db9b0 /mcs/class/Managed.Windows.Forms | |
| parent | 8a249042e42338499e15814073537a3b99086066 (diff) | |
[MWF] Don't truncate text on ToolStripButton
Previous code subtracted 4 pixels of the height of the text of a
toolstrip button, presumably to leave a margin. However, margins
are handled elsewhere, so we ended up with truncated text.
Diffstat (limited to 'mcs/class/Managed.Windows.Forms')
| -rw-r--r-- | mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs index 34102f4e924..c9fd272e24e 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripItem.cs @@ -1632,14 +1632,14 @@ namespace System.Windows.Forms image_rect = AlignInRectangle (contentRectangle, GetImageSize (), this.image_align); break; case TextImageRelation.ImageAboveText: - text_area = new Rectangle (contentRectangle.Left, contentRectangle.Bottom - (text_size.Height - 4), contentRectangle.Width, text_size.Height - 4); + text_area = new Rectangle (contentRectangle.Left, contentRectangle.Bottom - text_size.Height, contentRectangle.Width, text_size.Height); image_area = new Rectangle (contentRectangle.Left, contentRectangle.Top, contentRectangle.Width, contentRectangle.Height - text_area.Height); text_rect = AlignInRectangle (text_area, this.text_size, this.text_align); image_rect = AlignInRectangle (image_area, GetImageSize (), this.image_align); break; case TextImageRelation.TextAboveImage: - text_area = new Rectangle (contentRectangle.Left, contentRectangle.Top, contentRectangle.Width, text_size.Height - 4); + text_area = new Rectangle (contentRectangle.Left, contentRectangle.Top, contentRectangle.Width, text_size.Height); image_area = new Rectangle (contentRectangle.Left, text_area.Bottom, contentRectangle.Width, contentRectangle.Height - text_area.Height); text_rect = AlignInRectangle (text_area, this.text_size, this.text_align); |