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

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-02-05 19:03:00 +0200 (Mon, 05 Feb 2007)
New Revision: 9655

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c
Log:
Paint the scroll arrow backgrounds with different details

2007-02-05  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* gtk/gtkmenu.c (gtk_menu_paint): Paint the scroll arrow backgrounds
	using 'menu_scroll_arrow_up' and 'menu_scroll_arrow_down' details
	instead of generic 'menu' (#404571)
	This keeps sapwood from applying window shape mask to inappropriate
	places.


Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-05 16:50:47 UTC (rev 9654)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-05 17:03:00 UTC (rev 9655)
@@ -1,3 +1,11 @@
+2007-02-05  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* gtk/gtkmenu.c (gtk_menu_paint): Paint the scroll arrow backgrounds
+	using 'menu_scroll_arrow_up' and 'menu_scroll_arrow_down' details
+	instead of generic 'menu' (#404571)
+	This keeps sapwood from applying window shape mask to inappropriate
+	places.
+
 2007-02-05  Michael Natterer  <mitch at imendio.com>
 
 	Merge from upstream trunk:

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c	2007-02-05 16:50:47 UTC (rev 9654)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkmenu.c	2007-02-05 17:03:00 UTC (rev 9655)
@@ -2581,7 +2581,12 @@
 			 widget->window,
 			 priv->upper_arrow_state,
 			 GTK_SHADOW_OUT,
-			 &event->area, widget, "menu",
+			 &event->area, widget,
+#ifdef MAEMO_CHANGES
+			 "menu_scroll_arrow_up",
+#else
+			 "menu",
+#endif
 			 border_x,
 			 border_y,
 			 width - 2 * border_x,
@@ -2605,7 +2610,12 @@
 			 widget->window,
 			 priv->lower_arrow_state,
 			 GTK_SHADOW_OUT,
-			 &event->area, widget, "menu",
+			 &event->area, widget,
+#ifdef MAEMO_CHANGES
+			 "menu_scroll_arrow_down",
+#else
+			 "menu",
+#endif
 			 border_x,
 			 height - border_y - scroll_arrow_height,
 			 width - 2*border_x,