[maemo-commits] [maemo-commits] r17301 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-01-27 19:08:59 +0200 (Tue, 27 Jan 2009)
New Revision: 17301

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkiconview.c
   projects/haf/trunk/gtk+/gtk/gtktreeview.c
Log:
2009-01-27  Kristian Rietveld  <kris at imendio.com>

	Fixes: NB#93725 - Finish theming of GtkTreeView and GtkIconView
	Part 2 / 2.

	* gtk/gtktreeview.c (gtk_tree_view_style_set): update row
	header layout,
	(hildon_tree_view_set_row_header_func): use SmallSystemFont.

	* gtk/gtkiconview.c (gtk_icon_view_style_set),
	(hildon_icon_view_set_row_header_func): likewise.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-01-27 16:44:04 UTC (rev 17300)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-01-27 17:08:59 UTC (rev 17301)
@@ -1,6 +1,18 @@
 2009-01-27  Kristian Rietveld  <kris at imendio.com>
 
 	Fixes: NB#93725 - Finish theming of GtkTreeView and GtkIconView
+	Part 2 / 2.
+
+	* gtk/gtktreeview.c (gtk_tree_view_style_set): update row
+	header layout,
+	(hildon_tree_view_set_row_header_func): use SmallSystemFont.
+
+	* gtk/gtkiconview.c (gtk_icon_view_style_set),
+	(hildon_icon_view_set_row_header_func): likewise.
+
+2009-01-27  Kristian Rietveld  <kris at imendio.com>
+
+	Fixes: NB#93725 - Finish theming of GtkTreeView and GtkIconView
 	Part 1.
 
 	* gtk/gtktreeview.c (gtk_tree_view_destroy),

Modified: projects/haf/trunk/gtk+/gtk/gtkiconview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkiconview.c	2009-01-27 16:44:04 UTC (rev 17300)
+++ projects/haf/trunk/gtk+/gtk/gtkiconview.c	2009-01-27 17:08:59 UTC (rev 17301)
@@ -1373,8 +1373,21 @@
   /* Reset the UI mode */
   hildon_icon_view_set_hildon_ui_mode (icon_view, icon_view->priv->hildon_ui_mode);
 
-  /* FIXME: might want to update the row_header_layout if it exists */
+  if (icon_view->priv->row_header_layout)
+    {
+      /* Update font of the row header */
+      GtkStyle *font_style;
 
+      font_style = gtk_rc_get_style_by_paths (gtk_settings_get_default (),
+                                              "SmallSystemFont",
+                                              NULL, G_TYPE_NONE);
+      if (font_style)
+        {
+          pango_layout_set_font_description (icon_view->priv->row_header_layout,
+                                             font_style->font_desc);
+        }
+    }
+
   if (icon_view->priv->tickmark_icon)
     g_object_unref (icon_view->priv->tickmark_icon);
 
@@ -8105,9 +8118,19 @@
 
   if (func && !icon_view->priv->row_header_layout)
     {
+      GtkStyle *font_style;
+
       icon_view->priv->row_header_layout =
           gtk_widget_create_pango_layout (GTK_WIDGET (icon_view), "");
-      /* FIXME: set specific font settings, etc */
+
+      font_style = gtk_rc_get_style_by_paths (gtk_settings_get_default (),
+                                              "SmallSystemFont",
+                                              NULL, G_TYPE_NONE);
+      if (font_style)
+        {
+          pango_layout_set_font_description (icon_view->priv->row_header_layout,
+                                             font_style->font_desc);
+        }
     }
   else if (!func && icon_view->priv->row_header_layout)
     {

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-01-27 16:44:04 UTC (rev 17300)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-01-27 17:08:59 UTC (rev 17301)
@@ -9084,8 +9084,21 @@
   /* Reset the UI mode */
   hildon_tree_view_set_hildon_ui_mode (tree_view, tree_view->priv->hildon_ui_mode);
 
-  /* FIXME: possibly update row_header_layout if it exists */
+  if (tree_view->priv->row_header_layout)
+    {
+      /* Update font of the row header */
+      GtkStyle *font_style;
 
+      font_style = gtk_rc_get_style_by_paths (gtk_settings_get_default (),
+                                              "SmallSystemFont",
+                                              NULL, G_TYPE_NONE);
+      if (font_style)
+        {
+          pango_layout_set_font_description (tree_view->priv->row_header_layout,
+                                             font_style->font_desc);
+        }
+    }
+
   if (tree_view->priv->tickmark_icon)
     g_object_unref (tree_view->priv->tickmark_icon);
 
@@ -16624,9 +16637,19 @@
 
   if (func && !tree_view->priv->row_header_layout)
     {
+      GtkStyle *font_style;
+
       tree_view->priv->row_header_layout =
           gtk_widget_create_pango_layout (GTK_WIDGET (tree_view), "");
-      /* FIXME: set specific font settings, etc */
+
+      font_style = gtk_rc_get_style_by_paths (gtk_settings_get_default (),
+                                              "SmallSystemFont",
+                                              NULL, G_TYPE_NONE);
+      if (font_style)
+        {
+          pango_layout_set_font_description (tree_view->priv->row_header_layout,
+                                             font_style->font_desc);
+        }
     }
   else if (!func && tree_view->priv->row_header_layout)
     {