gtk-css-engine r105 - in trunk: . libccd/ccd themes/gtk-css-test/gtk-2.0

[robsta svn gnome org]

Author: robsta
Date: Mon Sep 15 09:35:35 2008
New Revision: 105
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=105&view=rev

Log:
* libccd/ccd/ccd-border.c: background includes area "under" borders. 


Modified:
   trunk/   (props changed)
   trunk/libccd/ccd/ccd-border.c
   trunk/themes/gtk-css-test/gtk-2.0/styles.css

Modified: trunk/libccd/ccd/ccd-border.c
==============================================================================
--- trunk/libccd/ccd/ccd-border.c	(original)
+++ trunk/libccd/ccd/ccd-border.c	Mon Sep 15 09:35:35 2008
@@ -712,7 +712,7 @@
 
 	if (left) {
 		line_func = get_line_draw_func (left, path_only);
-		xoff = left ? left->width / 2. : 0;
+		xoff = !path_only && left ? left->width / 2. : 0;
 		yoff = rbl;
 		x1 = x + xoff;
 		y1 = y + height - yoff;
@@ -729,8 +729,8 @@
 
 	if (left_top) {
 		join_func = get_join_draw_func (left, top, path_only);
-		xoff = left ? left->width / 2. : 0;
-		yoff = top ? top->width / 2. : 0;
+		xoff = !path_only && left ? left->width / 2. : 0;
+		yoff = !path_only && top ? top->width / 2. : 0;
 		x1 = x + xoff;
 		y1 = y + rlt + yoff;
 		xc = x1 + rlt;
@@ -747,7 +747,7 @@
 	if (top) {
 		line_func = get_line_draw_func (top, path_only);
 		xoff = rlt;
-		yoff = top ? top->width / 2. : 0;
+		yoff = !path_only && top ? top->width / 2. : 0;
 		x1 = x + xoff;
 		y1 = y + yoff;
 		x2 = x + width - rtr;
@@ -763,8 +763,8 @@
 
 	if (top_right) {
 		join_func = get_join_draw_func (top, right, path_only);
-		xoff = right ? right->width / 2. : 0;
-		yoff = top ? top->width / 2. : 0;
+		xoff = !path_only && right ? right->width / 2. : 0;
+		yoff = !path_only && top ? top->width / 2. : 0;
 		x1 = x + width - xoff;
 		y1 = y + yoff;
 		xc = x1 - rtr;
@@ -780,7 +780,7 @@
 
 	if (right) {
 		line_func = get_line_draw_func (right, path_only);
-		xoff = right ? right->width / 2. : 0;
+		xoff = !path_only && right ? right->width / 2. : 0;
 		yoff = rtr;
 		x1 = x + width - xoff;
 		y1 = y + yoff;
@@ -797,8 +797,8 @@
 
 	if (right_bottom) {
 		join_func = get_join_draw_func (right, bottom, path_only);
-		xoff = right ? right->width / 2. : 0;
-		yoff = bottom ? bottom->width / 2. : 0;
+		xoff = !path_only && right ? right->width / 2. : 0;
+		yoff = !path_only && bottom ? bottom->width / 2. : 0;
 		x1 = x + width - xoff;
 		y1 = y + height - yoff;
 		xc = x1 - rrb;
@@ -815,7 +815,7 @@
 	if (bottom) {
 		line_func = get_line_draw_func (bottom, path_only);
 		xoff = rrb;
-		yoff = bottom ? bottom->width / 2. : 0;
+		yoff = !path_only && bottom ? bottom->width / 2. : 0;
 		x1 = x + width - xoff;
 		y1 = y + height - yoff;
 		x2 = x + rbl;
@@ -831,8 +831,8 @@
 
 	if (bottom_left) {
 		join_func = get_join_draw_func (bottom, left, path_only);
-		xoff = left ? left->width / 2. : 0;
-		yoff = bottom ? bottom->width / 2. : 0;
+		xoff = !path_only && left ? left->width / 2. : 0;
+		yoff = !path_only && bottom ? bottom->width / 2. : 0;
 		x1 = x + xoff;
 		y1 = y + height - yoff;
 		xc = x1 + rbl;

Modified: trunk/themes/gtk-css-test/gtk-2.0/styles.css
==============================================================================
--- trunk/themes/gtk-css-test/gtk-2.0/styles.css	(original)
+++ trunk/themes/gtk-css-test/gtk-2.0/styles.css	Mon Sep 15 09:35:35 2008
@@ -103,6 +103,11 @@
 }
 */
 
+extension {
+	background: khaki;
+	border: 1px solid black;
+}
+
 box {
 	background: khaki;
 	border: 1px solid black;