[maemo-commits] [maemo-commits] r9847 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-02-14 14:09:39 +0200 (Wed, 14 Feb 2007)
New Revision: 9847

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeviewcolumn.c
Log:
2007-02-14  Kristian Rietveld  <kris at imendio.com>

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_create_button),
	(gtk_tree_view_column_update_button): make the alignment expand
	the child so ellipsizing labels in column headers work
	correctly.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-14 12:07:32 UTC (rev 9846)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-14 12:09:39 UTC (rev 9847)
@@ -1,5 +1,12 @@
 2007-02-14  Kristian Rietveld  <kris at imendio.com>
 
+	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_create_button),
+	(gtk_tree_view_column_update_button): make the alignment expand
+	the child so ellipsizing labels in column headers work
+	correctly.
+
+2007-02-14  Kristian Rietveld  <kris at imendio.com>
+
 	* gtk/gtkbutton.c (gtk_button_class_init),
 	(gtk_button_size_request), (gtk_button_size_allocate),
 	(_gtk_button_paint): add tree-view-separator-area style

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeviewcolumn.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeviewcolumn.c	2007-02-14 12:07:32 UTC (rev 9846)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeviewcolumn.c	2007-02-14 12:09:39 UTC (rev 9847)
@@ -808,7 +808,11 @@
 		    G_CALLBACK (gtk_tree_view_column_button_clicked),
 		    tree_column);
 
+#ifdef MAEMO_CHANGES
+  tree_column->alignment = gtk_alignment_new (tree_column->xalign, 0.5, 1.0, 1.0);
+#else /* !MAEMO_CHANGES */
   tree_column->alignment = gtk_alignment_new (tree_column->xalign, 0.5, 0.0, 0.0);
+#endif /* !MAEMO_CHANGES */
 
   hbox = gtk_hbox_new (FALSE, 2);
   tree_column->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_IN);
@@ -873,7 +877,11 @@
 
   /* Set up the actual button */
   gtk_alignment_set (GTK_ALIGNMENT (alignment), tree_column->xalign,
+#ifdef MAEMO_CHANGES
+		     0.5, 1.0, 1.0);
+#else /* !MAEMO_CHANGES */
 		     0.5, 0.0, 0.0);
+#endif /* !MAEMO_CHANGES */
       
   if (tree_column->child)
     {
@@ -883,6 +891,9 @@
 				current_child);
 	  gtk_container_add (GTK_CONTAINER (alignment),
 			     tree_column->child);
+#ifdef MAEMO_CHANGES
+	  current_child = tree_column->child;
+#endif /* MAEMO_CHANGES */
 	}
     }
   else 
@@ -905,6 +916,16 @@
 					  "");
     }
 
+#ifdef MAEMO_CHANGES
+  if (GTK_IS_MISC (current_child))
+    {
+      gfloat yalign;
+
+      gtk_misc_get_alignment (GTK_MISC (current_child), NULL, &yalign);
+      gtk_misc_set_alignment (GTK_MISC (current_child), tree_column->xalign, yalign);
+    }
+#endif /* MAEMO_CHANGES */
+
   if (GTK_IS_TREE_SORTABLE (model)
       && gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (model),
 					       &sort_column_id,