2008-10-18 Carlos Alberto Cortez <calberto.cortez@gmail.com>

	* ListView.cs: If both scrollbars are visible, the vertical one
	shouldn't extend too far down.
	Fixes #435771.


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

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog

@@ -1,3 +1,9 @@
+2008-10-18  Carlos Alberto Cortez <calberto.cortez@gmail.com>
+
+	* ListView.cs: If both scrollbars are visible, the vertical one
+	shouldn't extend too far down.
+	Fixes #435771.
+
 2008-10-17  Jonathan Pobst  <monkey@jpobst.com>
 
 	* DataGridView.cs: Add the ability to resize columns and rows with

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListView.cs

@@ -1383,16 +1383,14 @@ private void CalculateScrollBars ()
 			if (v_scroll.is_visible) {
 				v_scroll.Location = new Point (client_area.Right - v_scroll.Width, client_area.Y);
 				v_scroll.Minimum = 0;
+				v_scroll.Maximum = layout_ht;
 
-				// if h_scroll is visible, adjust the maximum of the
+				// if h_scroll is visible, adjust the height of
 				// v_scroll to account for the height of h_scroll
-				if (h_scroll.Visible) {
-					v_scroll.Maximum = layout_ht + h_scroll.Height;
-					v_scroll.Height = client_area.Height; // - h_scroll.Height already done 
-				} else {
-					v_scroll.Maximum = layout_ht;
+				if (h_scroll.Visible)
+					v_scroll.Height = client_area.Height - h_scroll.Height;
+				else
 					v_scroll.Height = client_area.Height;
-				}
 
 				v_scroll.LargeChange = client_area.Height;
 				v_scroll.SmallChange = Font.Height;