2005-09-26 Jordi Mas i Hernandez <jordi@ximian.com>

	* ListBox.cs: Fixes navigation to the last item in multicolumn lists

svn path=/trunk/mcs/; revision=50746

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 83428f66cdce8c64f58f457015c68b36ba80460e..495dd6ae274aed37168d99ddfb463600b4216596 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-26  Jordi Mas i Hernandez <jordi@ximian.com>
+        
+       * ListBox.cs: Fixes navigation to the last item in multicolumn lists
+
 2005-09-25  Jackson Harper  <jackson@ximian.com>
 
        * TreeView.cs: Update the node bounds correctly regardless of

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListBox.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListBox.cs
index 738c93b150cf775ba46e4fc7619924fdd3fa4084..6bc33b4596eca44591bbcdb67425915a5c954179 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListBox.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListBox.cs
@@ -1186,10 +1186,14 @@ namespace System.Windows.Forms
 
                private void UpdatedTopItem ()
                {
-                       if (multicolumn) {
-                               int col = (LBoxInfo.top_item / LBoxInfo.page_size);
-                               hscrollbar_ctrl.Value = col;
-                       }                               
+                       if (multicolumn) {                              
+                               int col = LBoxInfo.top_item / LBoxInfo.page_size;
+                               
+                               if (col > hscrollbar_ctrl.Maximum)
+                                       hscrollbar_ctrl.Value = hscrollbar_ctrl.Maximum;
+                               else
+                                       hscrollbar_ctrl.Value = col;
+                       }
                        else {
                                if (LBoxInfo.top_item > vscrollbar_ctrl.Maximum)
                                        vscrollbar_ctrl.Value = vscrollbar_ctrl.Maximum;