Author: aolk
Date: 2006-07-14 12:05:23 -0400 (Fri, 14 Jul 2006)
New Revision: 62605
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
Log:
2006-07-14 Alexander Olk <[EMAIL PROTECTED]>
* ThemeWin32Classic.cs: Fixed position of CPDrawScrollButton Up and
Down arrows
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-07-14 15:52:39 UTC (rev 62604)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-07-14 16:05:23 UTC (rev 62605)
@@ -1,3 +1,8 @@
+2006-07-14 Alexander Olk <[EMAIL PROTECTED]>
+
+ * ThemeWin32Classic.cs: Fixed position of CPDrawScrollButton Up and
+ Down arrows
+
2006-07-14 Jonathan Pobst <[EMAIL PROTECTED]>
WebBrowserProgressChangedEventHandler.cs, BindingCompleteEventArgs.cs,
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
2006-07-14 15:52:39 UTC (rev 62604)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
2006-07-14 16:05:23 UTC (rev 62605)
@@ -5290,6 +5290,7 @@
default:
case ScrollButton.Down:
int x_middle = (int)Math.Round
(rect.Width / 2.0f) - 1;
+ int y_middle = (int)Math.Round
(rect.Height / 2.0f) - 1;
if (x_middle == 1)
x_middle = 2;
@@ -5305,13 +5306,8 @@
}
arrow [0].X = rect.X + x_middle;
- arrow [0].Y = rect.Bottom -
triangle_height - 1;
- if (arrow [0].Y > rect.Height)
- arrow [0].Y = rect.Bottom - 3;
+ arrow [0].Y = rect.Y + y_middle +
triangle_height / 2;
- if (arrow [0].Y - 1 == rect.Y)
- arrow [0].Y += 1;
-
arrow [1].X = arrow [0].X +
triangle_height - 1;
arrow [1].Y = arrow [0].Y -
triangle_height + 1;
arrow [2].X = arrow [0].X -
triangle_height + 1;
@@ -5331,15 +5327,17 @@
arrow [2].X += 1;
}
}
-
-
break;
case ScrollButton.Up:
x_middle = (int)Math.Round (rect.Width
/ 2.0f) - 1;
+ y_middle = (int)Math.Round (rect.Height
/ 2.0f);
if (x_middle == 1)
x_middle = 2;
+ if (y_middle == 1)
+ y_middle = 2;
+
if (rect.Height < 8) {
triangle_height = 2;
fill_rect = false;
@@ -5350,12 +5348,7 @@
}
arrow [0].X = rect.X + x_middle;
- arrow [0].Y = rect.Y + triangle_height;
- if (arrow [0].Y > rect.Height)
- arrow [0].Y = 2;
-
- if (arrow [0].Y + 1 == rect.Bottom - 1)
- arrow [0].Y -= 1;
+ arrow [0].Y = rect.Y + y_middle -
triangle_height / 2;
arrow [1].X = arrow [0].X +
triangle_height - 1;
arrow [1].Y = arrow [0].Y +
triangle_height - 1;
@@ -5375,11 +5368,10 @@
arrow [2].X += 1;
}
}
-
break;
case ScrollButton.Left:
- int y_middle = (int)Math.Round
(rect.Height / 2.0f) - 1;
+ y_middle = (int)Math.Round (rect.Height
/ 2.0f) - 1;
if (y_middle == 1)
y_middle = 2;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
