[gtk+/extended-layout-jhs: 46/64] Seems there is no point in distinguishing between GTK_PACK_START and



commit 0b19061623f4cac3f4f99e8e5c57093986478d12
Author: Mathias Hasselmann <mathias hasselmann gmx de>
Date:   Wed Aug 1 13:02:36 2007 +0000

    Seems there is no point in distinguishing between GTK_PACK_START and
    
    2007-08-01  Mathias Hasselmann  <mathias hasselmann gmx de>
    
    	* gtk/gtkcellview.c: Seems there is no point in distinguishing between
    	GTK_PACK_START and GTK_PACK_END during size allocation. The loops only
    	differ in the packing check.
    
    svn path=/branches/extended-layout/; revision=18564

 ChangeLog.gtk-extended-layout |    6 ++++++
 gtk/gtkcellview.c             |   29 -----------------------------
 2 files changed, 6 insertions(+), 29 deletions(-)
---
diff --git a/ChangeLog.gtk-extended-layout b/ChangeLog.gtk-extended-layout
index a695f70..d3acab9 100644
--- a/ChangeLog.gtk-extended-layout
+++ b/ChangeLog.gtk-extended-layout
@@ -1,5 +1,11 @@
 2007-08-01  Mathias Hasselmann  <mathias hasselmann gmx de>
 
+	* gtk/gtkcellview.c: Seems there is no point in distinguishing between
+	GTK_PACK_START and GTK_PACK_END during size allocation. The loops only
+	differ in the packing check.
+
+2007-08-01  Mathias Hasselmann  <mathias hasselmann gmx de>
+
 	* gtk/gtkcellview.c: Fix up the mess I commited before.
 	Rule of the thumb: Never write code when tired or in hurry.
 
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 22a80bc..500a152 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -355,39 +355,10 @@ gtk_cell_view_size_allocate (GtkWidget     *widget,
   else
     extra = 0;
 
-  /* iterate list for PACK_START cells */
   for (i = cellview->priv->cell_list; i; i = i->next)
     {
       GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
 
-      if (info->pack == GTK_PACK_END)
-        continue;
-
-      if (!info->cell->visible)
-        continue;
-
-      info->real_width = info->requested_width;
-
-      if (info->expand)
-        {
-          if (1 == nexpand_cells)
-            info->real_width += available;
-          else
-            info->real_width += extra;
-
-          nexpand_cells -= 1;
-          available -= extra;
-        }
-    }
-
-  /* iterate list for PACK_END cells */
-  for (i = cellview->priv->cell_list; i; i = i->next)
-    {
-      GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)i->data;
-
-      if (info->pack == GTK_PACK_START)
-        continue;
-
       if (!info->cell->visible)
         continue;
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]