Author: everaldo
Date: 2007-03-01 06:33:24 -0500 (Thu, 01 Mar 2007)
New Revision: 73585
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
Log:
2007-03-01 Everaldo Canuto <[EMAIL PROTECTED]>
* LinkLabel.cs: Improve CalcTrimRectangle.
* ThemeWin32Classic.cs: Fix some compilation problem under VS 2003.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-03-01 10:08:20 UTC (rev 73584)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-03-01 11:33:24 UTC (rev 73585)
@@ -1,9 +1,8 @@
-2007-02-29 Carlos Alberto Cortez <[EMAIL PROTECTED]>
+2007-03-01 Everaldo Canuto <[EMAIL PROTECTED]>
- * ListView.cs: First patch to add support for virtual mode:
- Add checks for ListViewItemCollection, add the RetrieveVirtualItem
- and CacheVirtualItems 2.0 events, VirtualMode and VirtualSize
- properties, as well as other checks in our implementation.
+ * LinkLabel.cs: Improve CalcTrimRectangle.
+
+ * ThemeWin32Classic.cs: Fix some compilation problem under VS 2003.
2007-02-28 Everaldo Canuto <[EMAIL PROTECTED]>
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
2007-03-01 10:08:20 UTC (rev 73584)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
2007-03-01 11:33:24 UTC (rev 73585)
@@ -554,22 +554,22 @@
internal Rectangle CalcTrimRectangle ()
{
- const string text = "X";
+ const string text = "X12"; // Magic
// Measure total area including padding area.
SizeF size = DeviceContext.MeasureString (text,
link_font);
Rectangle rect = new Rectangle (0, 0, (int) size.Width,
(int) size.Height);
// Measure only font area without padding area.
- CharacterRange[] ranges = { new CharacterRange(0, 1) };
+ CharacterRange[] ranges = { new CharacterRange(0,
text.Length) };
string_format.SetMeasurableCharacterRanges (ranges);
Region[] regions = DeviceContext.MeasureCharacterRanges
(text, link_font, rect, string_format);
// Calculate diference.
RectangleF rectf = regions [0].GetBounds
(DeviceContext);
- return new Rectangle ((int) rectf.X, (int) rectf.Y,
- rect.Width - (int)
rectf.Width - ((int) rectf.X * 2),
+ return new Rectangle ((int) rectf.X, (int) rectf.Y,
+ rect.Width - (int)
rectf.Width - ((int) rectf.X * 2),
rect.Height - (int)
rectf.Height - ((int) rectf.Y * 2));
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
2007-03-01 10:08:20 UTC (rev 73584)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
2007-03-01 11:33:24 UTC (rev 73585)
@@ -1688,10 +1688,11 @@
CPDrawFocusRectangle (dc, rect,
label.ForeColor, label.BackColor);
// To adjust diference between measurement and
draw string.
- rect.X -= label.factor.X;
- rect.Y -= label.factor.Y;
- rect.Width += label.factor.Width;
- rect.Height += label.factor.Height;
+ Rectangle rectf = label.factor;
+ rect.X -= rectf.X;
+ rect.Y -= rectf.Y;
+ rect.Width += rectf.Width;
+ rect.Height += rectf.Height;
dc.DrawString (label.pieces[i].text,
label.GetPieceFont (label.pieces[i]), ResPool.GetSolidBrush
(label.GetPieceColor (label.pieces[i], i)),
rect, label.string_format);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
