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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-09-28 14:51:43 +0300 (Fri, 28 Sep 2007)
New Revision: 14171

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtknotebook.c
Log:
2007-09-28  Xan Lopez  <xan.lopez at nokia.com>

	* gtk/gtknotebook.c (gtk_notebook_paint): paint the box_gap with the
	notebook_show_arrow detail when arrows are shown to get correct theming.

	Fixes: MB#1084


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-09-28 11:45:55 UTC (rev 14170)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-09-28 11:51:43 UTC (rev 14171)
@@ -1,3 +1,10 @@
+2007-09-28  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_paint): paint the box_gap with the
+	notebook_show_arrow detail when arrows are shown to get correct theming.
+
+	Fixes: MB#1084
+
 2007-09-26  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk/gtkmenutoolbutton.c (gtk_menu_tool_button_init): chain

Modified: projects/haf/trunk/gtk+/gtk/gtknotebook.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtknotebook.c	2007-09-28 11:45:55 UTC (rev 14170)
+++ projects/haf/trunk/gtk+/gtk/gtknotebook.c	2007-09-28 11:51:43 UTC (rev 14171)
@@ -4567,9 +4567,28 @@
 	  break;
 	}
     }
+#if defined(MAEMO_CHANGES)
+  showarrow = FALSE;
+  children = gtk_notebook_search_page (notebook, NULL, step, TRUE);
+  while (children && !showarrow)
+    {
+      page = children->data;
+      children = gtk_notebook_search_page (notebook, children,
+                                           step, TRUE);
+      if (!GTK_WIDGET_MAPPED (page->tab_label))
+        showarrow = TRUE;
+    }
+#endif
   gtk_paint_box_gap (widget->style, widget->window,
 		     GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-		     area, widget, "notebook",
+		     area, widget, 
+#if defined(MAEMO_CHANGES)
+                     (showarrow && notebook->scrollable)
+                       ? "notebook_show_arrow"
+                       : "notebook",
+#else
+                     "notebook",
+#endif
 		     x, y, width, height,
 		     tab_pos, gap_x, gap_width);