gtk-css-engine r112 - in trunk: . libccd/ccd

[robsta svn gnome org]

Author: robsta
Date: Tue Sep 16 13:20:56 2008
New Revision: 112
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=112&view=rev

Log:
* libccd/ccd/ccd-border.c:
* libccd/ccd/ccd-border.h:
More consistent naming in the `border join' struct (s/radius_spec/spec).


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/libccd/ccd/ccd-border.c
   trunk/libccd/ccd/ccd-border.h

Modified: trunk/libccd/ccd/ccd-border.c
==============================================================================
--- trunk/libccd/ccd/ccd-border.c	(original)
+++ trunk/libccd/ccd/ccd-border.c	Tue Sep 16 13:20:56 2008
@@ -116,7 +116,7 @@
 	(join_).flags |= CCD_BORDER_FLAGS_COMMON_RADIUS;	       \
 }								       \
 if (spec_ != CCD_PROPERTY_SPEC_UNSET) {				       \
-	(join_).radius_spec = spec_;				       \
+	(join_).spec = spec_;					       \
 }
 
 #define SET_SPECIFIC_RADIUS(spec_, join_, val_)			       \
@@ -125,7 +125,7 @@
 	(join_).flags |= CCD_BORDER_FLAGS_SPECIFIC_RADIUS;	       \
 }								       \
 if (spec_ != CCD_PROPERTY_SPEC_UNSET) {				       \
-	(join_).radius_spec = spec_;				       \
+	(join_).spec = spec_;					       \
 }
 
 #define _PI (_pi ())
@@ -740,10 +740,10 @@
 	double		rlt, rtr, rrb, rbl;
 	bool		have_segment;
 
-	rlt = left_top && left_top->radius_spec ? left_top->radius : 0;
-	rtr = top_right && top_right->radius_spec ? top_right->radius : 0;
-	rrb = right_bottom && right_bottom->radius_spec ? right_bottom->radius : 0;
-	rbl = bottom_left && bottom_left->radius_spec ? bottom_left->radius : 0;
+	rlt = left_top && left_top->spec ? left_top->radius : 0;
+	rtr = top_right && top_right->spec ? top_right->radius : 0;
+	rrb = right_bottom && right_bottom->spec ? right_bottom->radius : 0;
+	rbl = bottom_left && bottom_left->spec ? bottom_left->radius : 0;
 	if (!(CCD_BORDER_ROUNDING_UNRESTRICTED & visibility_flags)) {
 		ccd_border_clamp_radii (x, y, width, height, 
 					&rlt, &rtr, &rrb, &rbl);
@@ -936,7 +936,7 @@
 void
 ccd_border_join_dump (ccd_border_join_t const *self)
 {
-	if (self->radius_spec != CCD_PROPERTY_SPEC_UNSET) {
+	if (self->spec != CCD_PROPERTY_SPEC_UNSET) {
 		printf ("%.1f ", self->radius);
 	}
 

Modified: trunk/libccd/ccd/ccd-border.h
==============================================================================
--- trunk/libccd/ccd/ccd-border.h	(original)
+++ trunk/libccd/ccd/ccd-border.h	Tue Sep 16 13:20:56 2008
@@ -82,18 +82,18 @@
 } ccd_border_stroke_t; 
 
 #define CCD_BORDER_JOIN_IS_SET(join_) 				\
-	((join_).radius_spec != CCD_PROPERTY_SPEC_UNSET)
+	((join_).spec != CCD_PROPERTY_SPEC_UNSET)
 
-#define CCD_BORDER_JOIN_ASSIGN(lhs_, rhs_) {		\
-	(lhs_).radius		= (rhs_).radius;	\
-	(lhs_).radius_spec	= (rhs_).radius_spec;	\
-	(lhs_).flags		= (rhs_).flags;		\
+#define CCD_BORDER_JOIN_ASSIGN(lhs_, rhs_) {			\
+	(lhs_).radius	= (rhs_).radius;			\
+	(lhs_).spec	= (rhs_).spec;				\
+	(lhs_).flags	= (rhs_).flags;				\
 }
 
 /* TODO just call it "spec"? */
 typedef struct {
 	double			radius;
-	ccd_property_spec_t	radius_spec;	
+	ccd_property_spec_t	spec;	
 	unsigned int		flags;
 } ccd_border_join_t;