gtk-engines r1214 - in branches/gtk-engines-2-14: . engines/clearlooks/src

[bberg svn gnome org]

Author: bberg
Date: Mon Jun 16 19:05:01 2008
New Revision: 1214
URL: http://svn.gnome.org/viewvc/gtk-engines?rev=1214&view=rev

Log:
2008-06-16  Benjamin Berg  <benjamin sipsolutions net>

	* engines/clearlooks/src/clearlooks_draw*.c:
	(*_draw_list_view_header):
	* engines/clearlooks/src/clearlooks_style.c:
	(clearlooks_style_draw_box):
	* engines/clearlooks/src/clearlooks_types.h:
	Change the header button position enum to be a bitfield.
	(Bug #511958, Marcus Brinkmann)


Modified:
   branches/gtk-engines-2-14/ChangeLog
   branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw.c
   branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw_glossy.c
   branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw_gummy.c
   branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw_inverted.c
   branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_style.c
   branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_types.h

Modified: branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw.c
==============================================================================
--- branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw.c	(original)
+++ branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw.c	Mon Jun 16 19:05:01 2008
@@ -1402,7 +1402,7 @@
 	cairo_set_line_width (cr, 1.0);
 
 	/* Draw highlight */
-	if (header->order == CL_ORDER_FIRST)
+	if (header->order & CL_ORDER_FIRST)
 	{
 		cairo_move_to (cr, 0.5, height-1);
 		cairo_line_to (cr, 0.5, 0.5);
@@ -1432,8 +1432,8 @@
 	cairo_pattern_destroy (pattern);
 
 	/* Draw resize grip */
-	if ((params->ltr && header->order != CL_ORDER_LAST) ||
-	    (!params->ltr && header->order != CL_ORDER_FIRST) || header->resizable)
+	if ((params->ltr && !(header->order & CL_ORDER_LAST)) ||
+	    (!params->ltr && !(header->order & CL_ORDER_FIRST)) || header->resizable)
 	{
 		SeparatorParameters separator;
 		separator.horizontal = FALSE;

Modified: branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw_glossy.c
==============================================================================
--- branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw_glossy.c	(original)
+++ branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw_glossy.c	Mon Jun 16 19:05:01 2008
@@ -1097,7 +1097,7 @@
 	cairo_pattern_destroy (pattern);
 	
 	/* Draw highlight */
-	if (header->order == CL_ORDER_FIRST)
+	if (header->order & CL_ORDER_FIRST)
 	{
 		cairo_move_to (cr, 0.5, height-1);
 		cairo_line_to (cr, 0.5, 0.5);
@@ -1111,8 +1111,8 @@
 	cairo_stroke (cr);
 	
 	/* Draw resize grip */
-	if ((params->ltr && header->order != CL_ORDER_LAST) ||
-	    (!params->ltr && header->order != CL_ORDER_FIRST) || header->resizable)
+	if ((params->ltr && !(header->order & CL_ORDER_LAST)) ||
+	    (!params->ltr && !(header->order & CL_ORDER_FIRST)) || header->resizable)
 	{
 		SeparatorParameters separator;
 		separator.horizontal = FALSE;

Modified: branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw_gummy.c
==============================================================================
--- branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw_gummy.c	(original)
+++ branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw_gummy.c	Mon Jun 16 19:05:01 2008
@@ -1223,7 +1223,7 @@
 	cairo_pattern_destroy (pattern);
 
 	/* Draw highlight */
-	if (header->order == CL_ORDER_FIRST)
+	if (header->order & CL_ORDER_FIRST)
 	{
 		cairo_move_to (cr, 0.5, height-1.5);
 		cairo_line_to (cr, 0.5, 0.5);
@@ -1237,8 +1237,8 @@
 	cairo_stroke (cr);
 
 	/* Draw resize grip */
-	if ((params->ltr && header->order != CL_ORDER_LAST) ||
-	    (!params->ltr && header->order != CL_ORDER_FIRST) || header->resizable)
+	if ((params->ltr && !(header->order & CL_ORDER_LAST)) ||
+	    (!params->ltr && !(header->order & CL_ORDER_FIRST)) || header->resizable)
 	{
 		SeparatorParameters separator;
 		separator.horizontal = FALSE;

Modified: branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw_inverted.c
==============================================================================
--- branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw_inverted.c	(original)
+++ branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_draw_inverted.c	Mon Jun 16 19:05:01 2008
@@ -745,7 +745,7 @@
 	cairo_set_line_width (cr, 1.0);
 	
 	/* Draw highlight */
-	if (header->order == CL_ORDER_FIRST)
+	if (header->order & CL_ORDER_FIRST)
 	{
 		cairo_move_to (cr, 0.5, height-1);
 		cairo_line_to (cr, 0.5, 0.5);
@@ -775,8 +775,8 @@
 	cairo_pattern_destroy (pattern);
 	
 	/* Draw resize grip */
-	if ((params->ltr && header->order != CL_ORDER_LAST) ||
-	    (!params->ltr && header->order != CL_ORDER_FIRST) || header->resizable)
+	if ((params->ltr && !(header->order & CL_ORDER_LAST)) ||
+	    (!params->ltr && !(header->order & CL_ORDER_FIRST)) || header->resizable)
 	{
 		SeparatorParameters separator;
 		separator.horizontal = FALSE;

Modified: branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_style.c
==============================================================================
--- branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_style.c	(original)
+++ branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_style.c	Mon Jun 16 19:05:01 2008
@@ -487,7 +487,7 @@
 		gint columns, column_index;
 		gboolean resizable = TRUE;
 
-		/* XXX: This makes unknown treeview header CL_ORDER_MIDDLE, in need for something nicer */
+		/* XXX: This makes unknown treeview header "middle", in need for something nicer */
 		columns = 3;
 		column_index = 1;
 
@@ -509,12 +509,11 @@
 
 		header.resizable = resizable;
 
+		header.order = 0;
 		if (column_index == 0)
-			header.order = params.ltr ? CL_ORDER_FIRST : CL_ORDER_LAST;
-		else if (column_index == columns-1)
-			header.order = params.ltr ? CL_ORDER_LAST : CL_ORDER_FIRST;
-		else
-			header.order = CL_ORDER_MIDDLE;
+			header.order |= params.ltr ? CL_ORDER_FIRST : CL_ORDER_LAST;
+		if (column_index == columns-1)
+			header.order |= params.ltr ? CL_ORDER_LAST : CL_ORDER_FIRST;
 
 		gtk_style_apply_default_background (style, window, FALSE, state_type, area, x, y, width, height);
 

Modified: branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_types.h
==============================================================================
--- branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_types.h	(original)
+++ branches/gtk-engines-2-14/engines/clearlooks/src/clearlooks_types.h	Mon Jun 16 19:05:01 2008
@@ -42,9 +42,8 @@
 
 typedef enum
 {
-	CL_ORDER_FIRST,
-	CL_ORDER_MIDDLE,
-	CL_ORDER_LAST
+	CL_ORDER_FIRST    = 1 << 0,
+	CL_ORDER_LAST     = 1 << 1,
 } ClearlooksOrder;
 
 typedef enum