Author: jackson
Date: 2006-12-11 17:37:37 -0500 (Mon, 11 Dec 2006)
New Revision: 69368

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs
Log:

        * TextBoxBase.cs: We need to cap this value, since Maximum -
        ViewPortHeight can be less than zero.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-12-11 22:17:16 UTC (rev 69367)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-12-11 22:37:37 UTC (rev 69368)
@@ -1,3 +1,8 @@
+2006-12-11  Jackson Harper  <[EMAIL PROTECTED]>
+
+       * TextBoxBase.cs: We need to cap this value, since Maximum -
+       ViewPortHeight can be less than zero.
+
 2006-12-11  Everaldo Canuto  <[EMAIL PROTECTED]>
 
        * ToolBarButton.cs: Fix text positon. 

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs   
2006-12-11 22:17:16 UTC (rev 69367)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextControl.cs   
2006-12-11 22:37:37 UTC (rev 69368)
@@ -1461,6 +1461,10 @@
 
                                DisplayCaret ();
                        }
+
+                       if (owner.IsHandleCreated && selection_visible) {
+                               InvalidateSelectionArea ();
+                       }
                }
 
                internal void CaretLostFocus() {
@@ -1515,7 +1519,7 @@
                                return;
                        }
 
-                       if (owner.Focused && !selection_visible) {
+                       if (owner.Focused && (!selection_visible || 
owner.show_caret_w_selection)) {
                                XplatUI.CaretVisible(owner.Handle, true);
                        }
                }

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

Reply via email to