Attachment 170708 Details for Bug 322421

[patch] Proposed patch

d2 (text/plain), 6.78 KB, created by Thomas Wiest on 2006-11-03 20:21:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Wiest

Created: 2006-11-03 20:21:00 UTC

Size: 6.78 KB

patch

obsolete

>Index: System.Windows.Forms/ChangeLog
>===================================================================
>--- System.Windows.Forms/ChangeLog	(revision 67315)
>+++ System.Windows.Forms/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2006-11-03  Rolf Bjarne Kvinge <RKvinge@novell.com>
>+
>+	* TrackBar.cs: The control is completely invalidated on 
>+	Got/LostFocus to draw the focus rectangle correctly. 
>+	Fixes #79341.
>+
>+	* ThemeWin32Classic.cs: The TrackBar thumb is now centered
>+	on the mouse when moved and it doesn't move when grabbed
>+	until the mouse moves as well. Also fixed some wrong 
>+	calculations when clicking on the thumb (control thought
>+	click was outside of thumb and didn't grab it).
>+	Fixes some of the issues in #79718.
>+
> 2006-11-03  Jackson Harper  <jackson@ximian.com>
> 
> 	* TextBoxBase.cs: Don't bail from the scrollbar calcs for non
>Index: System.Windows.Forms/TrackBar.cs
>===================================================================
>--- System.Windows.Forms/TrackBar.cs	(revision 67315)
>+++ System.Windows.Forms/TrackBar.cs	(working copy)
>@@ -64,7 +64,9 @@
> 		internal int thumb_mouseclick;		
> 		private bool mouse_clickmove;
> 		private bool is_moving_right; // which way the thumb should move when mouse is down (right=up, left=down) 
>-	
>+		internal int mouse_down_x_offset; // how far from left side of thumb was the mouse clicked.
>+		internal bool mouse_moved; // has the mouse moved since it was clicked?
>+		
> 		#region events
> 		[Browsable (false)]
> 		[EditorBrowsable (EditorBrowsableState.Never)]
>@@ -143,6 +145,8 @@
> 			MouseUp += new MouseEventHandler (OnMouseUpTB); 
> 			MouseMove += new MouseEventHandler (OnMouseMoveTB);
> 			KeyDown += new KeyEventHandler (OnKeyDownTB);
>+			LostFocus += new EventHandler (OnLostFocusTB);
>+			GotFocus += new EventHandler (OnGotFocusTB);
> 			holdclick_timer.Elapsed += new ElapsedEventHandler (OnFirstClickTimer);
> 
> 			SetStyle (ControlStyles.UserPaint | ControlStyles.Opaque, false);
>@@ -515,8 +519,8 @@
>     		{
>     			if (!Enabled) return;			    			
> 
>+			mouse_moved = false;
> 			bool fire_timer = false;
>-    			
>     			Point point = new Point (e.X, e.Y);
> 
> 			if (orientation == Orientation.Horizontal) {
>@@ -525,6 +529,7 @@
> 					this.Capture = true;
> 					thumb_pressed = true;
> 					thumb_mouseclick = e.X;
>+					mouse_down_x_offset = e.X - thumb_pos.X;
> 					Invalidate (thumb_area);
> 				}
> 				else {
>@@ -542,10 +547,14 @@
> 				}
> 			}
> 			else {
>-				if (thumb_pos.Contains (point)) {
>+				Rectangle vertical_thumb_pos = thumb_pos;
>+				vertical_thumb_pos.Width = thumb_pos.Height;
>+				vertical_thumb_pos.Height = thumb_pos.Width;
>+				if (vertical_thumb_pos.Contains (point)) {
> 					this.Capture = true;
> 					thumb_pressed = true;
> 					thumb_mouseclick = e.Y;
>+					mouse_down_x_offset = e.Y - thumb_pos.Y;
> 					Invalidate (thumb_area);
> 				}
> 				else {
>@@ -572,7 +581,9 @@
>     		private void OnMouseMoveTB (object sender, MouseEventArgs e)
>     		{    			
>     			if (!Enabled) return;
>-    		
>+
>+    			mouse_moved = true;
>+
>     			/* Moving the thumb */
>     			if (thumb_pressed) {
> 								 				
>@@ -595,6 +606,15 @@
> 			ThemeEngine.Current.DrawTrackBar (pevent.Graphics, pevent.ClipRectangle, this);
> 		}
> 
>+		private void OnLostFocusTB (object sender, EventArgs e)
>+		{
>+			Invalidate();
>+		}
>+
>+		private void OnGotFocusTB (object sender, EventArgs e)
>+		{
>+			Invalidate();
>+		}
> 		private void OnKeyDownTB (object sender, KeyEventArgs e) 
> 		{
> 			switch (e.KeyCode) {
>Index: System.Windows.Forms/ThemeWin32Classic.cs
>===================================================================
>--- System.Windows.Forms/ThemeWin32Classic.cs	(revision 67315)
>+++ System.Windows.Forms/ThemeWin32Classic.cs	(working copy)
>@@ -4222,15 +4222,23 @@
> 			
> 			/* Convert thumb position from mouse position to value*/
> 			if (mouse_value) {
>-				if (value_pos < thumb_area.Bottom)
>-					value_pos = (int) ((thumb_area.Bottom - value_pos) / pixels_betweenticks);
>-				else
>-					value_pos = 0;			
>+				if (tb.mouse_moved) {
>+					value_pos += (int) pixels_betweenticks / 2;
>+					if (value_pos < thumb_area.Bottom) {
>+						value_pos = (int) ((thumb_area.Bottom - value_pos - (int)(thumb_pos.Width / 2)) / pixels_betweenticks);
>+					} else {
>+						value_pos = 0;			
>+					}
>+	
>+					if (value_pos + tb.Minimum > tb.Maximum)
>+						value_pos = tb.Maximum - tb.Minimum;
>+					else if (value_pos + tb.Minimum < tb.Minimum)
>+						value_pos = 0;
> 
>-				if (value_pos + tb.Minimum > tb.Maximum)
>-					value_pos = tb.Maximum - tb.Minimum;
>-
>-				tb.Value = value_pos + tb.Minimum;
>+					tb.Value = value_pos + tb.Minimum;	
>+				} else {
>+					value_pos = tb.Value - tb.Minimum;
>+				}
> 			}			
> 
> 			// thumb_pos.Y = channel_startpoint.Y ; // + (int) (pixels_betweenticks * (float) value_pos);
>@@ -4366,7 +4374,7 @@
> 			Does not matter the size of the control, Win32 always draws:
> 				- Ticks starting from pixel 13, 8
> 				- Channel starting at pos 8, 19 and ends at Width - 8
>-				- Autosize makes always the control 40 pixels height
>+				- Autosize makes always the control DefaultSize.Height pixels high
> 				- Ticks are draw at (channel.Witdh - 10) / (Maximum - Minimum)
> 				
> 		*/
>@@ -4428,15 +4436,22 @@
> 
> 			/* Convert thumb position from mouse position to value*/
> 			if (mouse_value) {			
>-				if (value_pos >= channel_startpoint.X)
>-					value_pos = (int)(((float) (value_pos - channel_startpoint.X)) / pixels_betweenticks);
>-				else
>-					value_pos = 0;				
>+				if (tb.mouse_moved) {
>+					value_pos += (int) pixels_betweenticks / 2;
>+					if (value_pos >= channel_startpoint.X) {
>+						value_pos = (int)(((float) (value_pos - channel_startpoint.X - (int)(thumb_pos.Width / 2))) / pixels_betweenticks);
>+					} else
>+						value_pos = 0;				
>+	
>+					if (value_pos + tb.Minimum > tb.Maximum)
>+						value_pos = tb.Maximum - tb.Minimum;
>+					else if(value_pos + tb.Minimum < tb.Minimum)
>+						value_pos = 0;
> 
>-				if (value_pos + tb.Minimum > tb.Maximum)
>-					value_pos = tb.Maximum - tb.Minimum;
>-                                
>-				tb.Value = value_pos + tb.Minimum;
>+					tb.Value = value_pos + tb.Minimum;
>+				} else {
>+					value_pos = tb.Value - tb.Minimum;
>+				}
> 			}			
> 			
> 			thumb_pos.X = channel_startpoint.X + (int) (pixels_betweenticks * (float) value_pos);
>@@ -4594,13 +4609,8 @@
> 				dc.FillRectangle (ResPool.GetSolidBrush (tb.BackColor), clip_rectangle);
> 			}
> 			
>-
> 			if (tb.Focused) {
>-				Brush brush = ResPool.GetHatchBrush (HatchStyle.Percent50, ColorControl, Color.Black);
>-				dc.FillRectangle (brush, area.X, area.Y, area.Width - 1, 1);
>-				dc.FillRectangle (brush, area.X, area.Y + area.Height - 1, area.Width - 1, 1);
>-				dc.FillRectangle (brush, area.X, area.Y, 1, area.Height - 1);
>-				dc.FillRectangle (brush, area.X + area.Width - 1, area.Y, 1, area.Height - 1);
>+				CPDrawFocusRectangle(dc, area, tb.ForeColor, tb.BackColor);
> 			}
> 
> 			if (tb.Orientation == Orientation.Vertical) {

Actions: View | Diff

Attachments on bug 322421: 170704 | 170705 | 170706 | 170707 | 170708 | 170709