banshee r3943 - in trunk/banshee: . src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView

[gburt svn gnome org]

Author: gburt
Date: Wed May 21 21:55:28 2008
New Revision: 3943
URL: http://svn.gnome.org/viewvc/banshee?rev=3943&view=rev

Log:
2008-05-21  Scott Peterson  <lunchtimemama gmail com>

	* src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Headers.cs:
	Make sure that a columns max height is not less that its min height. This
	fixes some aweful bugs.



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs	Wed May 21 21:55:28 2008
@@ -170,9 +170,8 @@
                 if (header_cell != null) {
                     min_width = header_cell.MinWidth;
                 }
-                column_cache[i].MinWidth = min_width;
-                column_cache[i].MaxWidth = column_cache[i].Column.MaxWidth;
                 min_header_width += column_cache[i].MinWidth = Math.Max (min_width, column_cache[i].Column.MinWidth);
+                column_cache[i].MaxWidth = Math.Max (column_cache[i].Column.MaxWidth, column_cache[i].MinWidth);
             }
             
             if (min_header_width >= header_interaction_alloc.Width) {
@@ -236,8 +235,7 @@
                 column_cache[i].ElasticWidth += delta;
             }
             
-            remaining_width = Math.Round (remaining_width);
-            return remaining_width;
+            return Math.Round (remaining_width);
         }
         
         protected virtual void OnColumnControllerUpdated ()
@@ -303,7 +301,7 @@
             for (int i = resizing_column_index + 1; i < column_cache.Length; i++) {
                 total_elastic_width += column_cache[i].ElasticWidth = sign == 1
                     ? column_cache[i].Width - column_cache[i].MinWidth
-                    : column_cache[i].Column.MaxWidth - column_cache[i].Width;
+                    : column_cache[i].MaxWidth - column_cache[i].Width;
             }
             
             if (total_elastic_width == 0) {