Author: jackson
Date: 2005-03-23 16:19:25 -0500 (Wed, 23 Mar 2005)
New Revision: 42174

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TabControl.cs
Log:
        * TabControl.cs: Account for the drawing of tabs borders when
        invalidating. If the slider was clicked dont do click detection on
        the tabs.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2005-03-23 21:04:55 UTC (rev 42173)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2005-03-23 21:19:25 UTC (rev 42174)
@@ -1,5 +1,11 @@
 2005-03-23  Jackson Harper  <[EMAIL PROTECTED]>
 
+       * TabControl.cs: Account for the drawing of tabs borders when
+       invalidating. If the slider was clicked dont do click detection on
+       the tabs.
+
+2005-03-23  Jackson Harper  <[EMAIL PROTECTED]>
+
        * TabControl.cs: Fix typo, emilinates an unneeded expose event.
 
 2005-03-22  Jonathan Chambers  <[EMAIL PROTECTED]>

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TabControl.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TabControl.cs    
2005-03-23 21:04:55 UTC (rev 42173)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TabControl.cs    
2005-03-23 21:19:25 UTC (rev 42174)
@@ -17,7 +17,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-// Copyright (c) 2004 Novell, Inc.
+// Copyright (c) 2004-2005 Novell, Inc.
 //
 // Authors:
 //     Jackson Harper ([EMAIL PROTECTED])
@@ -240,8 +240,12 @@
                                        Refresh ();
                                } else {
                                        SizeTabs ();
+                                       // The lines are drawn on the edges of 
the tabs so the invalid area should
+                                       // needs to include the extra pixels of 
line width.
+                                       if (appearance == TabAppearance.Normal)
+                                               invalid.Inflate (4, 4);
                                        Invalidate (invalid);
-                                }
+                               }
                        }
                }
 
@@ -453,6 +457,7 @@
                                        } else {
                                                Invalidate (right);
                                        }
+                                       return;
                                } else if (left.Contains (e.X, e.Y)) {
                                        left_slider_state = ButtonState.Pushed;
                                        if (CanScrollLeft) {
@@ -462,6 +467,7 @@
                                        } else {
                                                Invalidate (left);
                                        }
+                                       return;
                                }
                        }
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to