[maemo-commits] [maemo-commits] r9425 - in projects/haf/trunk/sapwood: . src

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-01-29 16:27:26 +0200 (Mon, 29 Jan 2007)
New Revision: 9425

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/src/sapwood-draw.c
Log:
Add simple pattern matching for (treeview) details

2007-01-29  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* src/sapwood-draw.c (match_theme_image): Add simple pattern matching
	for the 'detail' to simplify treeview theming. Only leading wildcard
	is supported. In gtkrc 'detail = "*_start"' will match all details
	ending with "_start" such as "cell_even_start", "cell_odd_start",
	"cell_even_ruled_start", etc.


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2007-01-29 14:23:24 UTC (rev 9424)
+++ projects/haf/trunk/sapwood/ChangeLog	2007-01-29 14:27:26 UTC (rev 9425)
@@ -1,5 +1,13 @@
 2007-01-29  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
+	* src/sapwood-draw.c (match_theme_image): Add simple pattern matching
+	for the 'detail' to simplify treeview theming. Only leading wildcard
+	is supported. In gtkrc 'detail = "*_start"' will match all details
+	ending with "_start" such as "cell_even_start", "cell_odd_start",
+	"cell_even_ruled_start", etc.
+
+2007-01-29  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
 	* demos/Makefile.am
 	* demos/treeview.c
 	* demos/treeview.gtkrc

Modified: projects/haf/trunk/sapwood/src/sapwood-draw.c
===================================================================
--- projects/haf/trunk/sapwood/src/sapwood-draw.c	2007-01-29 14:23:24 UTC (rev 9424)
+++ projects/haf/trunk/sapwood/src/sapwood-draw.c	2007-01-29 14:27:26 UTC (rev 9425)
@@ -81,10 +81,22 @@
 	  match_data->gap_side != image->match_data.gap_side)
 	continue;
 
-      if (image->match_data.detail &&
-	  (!match_data->detail ||
-	   strcmp (match_data->detail, image->match_data.detail) != 0))
-      continue;
+      /* simple pattern matching for (treeview) details
+       * in gtkrc 'detail = "*_start"' will match all calls with detail ending
+       * with '_start' such as 'cell_even_start', 'cell_odd_start', etc.
+       */
+      if (image->match_data.detail)
+        {
+          if (!match_data->detail)
+            continue;
+          else if (image->match_data.detail[0] == '*')
+            {
+              if (!g_str_has_suffix (match_data->detail, image->match_data.detail + 1))
+                continue;
+            }
+          else if (strcmp (match_data->detail, image->match_data.detail) != 0)
+            continue;
+        }
 
       return image;
     }