gtk-css-engine r127 - in trunk: . libccd/ccd themes/Gilouche-CSS/gtk-2.0

[robsta svn gnome org]

Author: robsta
Date: Thu Sep 25 13:26:54 2008
New Revision: 127
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=127&view=rev

Log:
* libccd/ccd/ccd-background.c: do not round background-image offsets
  because this leasts to 1px-off errors. 
* themes/Gilouche-CSS/gtk-2.0/Makefile.am:
* themes/Gilouche-CSS/gtk-2.0/styles.css:
Use CSS borders	for check- and option-styling, and make them cover all
of their allocated area.


Removed:
   trunk/themes/Gilouche-CSS/gtk-2.0/check-inactive.png
   trunk/themes/Gilouche-CSS/gtk-2.0/check.png
   trunk/themes/Gilouche-CSS/gtk-2.0/radiobutton-inactive.png
   trunk/themes/Gilouche-CSS/gtk-2.0/radiobutton.png
Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/libccd/ccd/ccd-background.c
   trunk/themes/Gilouche-CSS/gtk-2.0/Makefile.am
   trunk/themes/Gilouche-CSS/gtk-2.0/check-inactive-selected.png
   trunk/themes/Gilouche-CSS/gtk-2.0/check-selected.png
   trunk/themes/Gilouche-CSS/gtk-2.0/radiobutton-inactive-selected.png
   trunk/themes/Gilouche-CSS/gtk-2.0/radiobutton-selected.png
   trunk/themes/Gilouche-CSS/gtk-2.0/scale-slider-vertical.png
   trunk/themes/Gilouche-CSS/gtk-2.0/styles.css

Modified: trunk/libccd/ccd/ccd-background.c
==============================================================================
--- trunk/libccd/ccd/ccd-background.c	(original)
+++ trunk/libccd/ccd/ccd-background.c	Thu Sep 25 13:26:54 2008
@@ -341,7 +341,7 @@
 				  width + tile_width, height + tile_height,
 				  tile_width, tile_height);
 
-	cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
+	cairo_pattern_set_extend (pattern, CAIRO_EXTEND_NONE);
 	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern), pattern = NULL;
 	cairo_fill_preserve (cr);
@@ -363,7 +363,7 @@
 				  width + tile_width, tile_height,
 				  tile_width, tile_height);
 
-	cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
+	cairo_pattern_set_extend (pattern, CAIRO_EXTEND_NONE);
 	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern), pattern = NULL;
 	cairo_fill_preserve (cr);
@@ -385,7 +385,7 @@
 				  tile_width, height + tile_height,
 				  tile_width, tile_height);
 
-	cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
+	cairo_pattern_set_extend (pattern, CAIRO_EXTEND_NONE);
 	cairo_set_source (cr, pattern);
 	cairo_pattern_destroy (pattern), pattern = NULL;
 	cairo_fill_preserve (cr);
@@ -397,7 +397,7 @@
 	   int32_t			 width,
 	   int32_t			 height)
 {
-	cairo_pattern_set_extend (bg_image->image.pattern, CAIRO_EXTEND_PAD);
+	cairo_pattern_set_extend (bg_image->image.pattern, CAIRO_EXTEND_NONE);
 	cairo_set_source (cr, bg_image->image.pattern);
 	cairo_fill_preserve (cr);
 }
@@ -472,7 +472,10 @@
 			 * background pattern. */
 			xoff = fmod (xoff, tile_width) - tile_width;
 			yoff = fmod (yoff, tile_height) - tile_height;
-			cairo_translate (cr, x + lround (xoff), y + lround (yoff));
+			/* FIXME: not rounding can make the background edges
+			 * blurry, but when rounding we might be 1px off.
+			cairo_translate (cr, x + lround (xoff), y + lround (yoff)); */
+			cairo_translate (cr, x + xoff, y + yoff);
 			cairo_scale (cr, dx, dy);
 			repeat (bg_image, cr, width / dx, height / dy,
 				tile_width / dx, tile_height / dy);
@@ -481,7 +484,10 @@
 			/* Normalise vertical offset, we don't create an infinite
 			 * background pattern. */
 			xoff = fmod (xoff, tile_width) - tile_width;
-			cairo_translate (cr, x + lround (xoff), y + lround (yoff));
+			/* FIXME: not rounding can make the background edges
+			 * blurry, but when rounding we might be 1px off.
+			cairo_translate (cr, x + lround (xoff), y + lround (yoff)); */
+			cairo_translate (cr, x + xoff, y + yoff);
 			cairo_scale (cr, dx, dy);
 			repeat_x (bg_image, cr, width / dx, height / dy,
 				  tile_width / dx, tile_height / dy);
@@ -490,13 +496,19 @@
 			/* Normalise horizontal offset, we don't create an infinite
 			 * background pattern. */
 			yoff = fmod (yoff, tile_height) - tile_height;
-			cairo_translate (cr, x + lround (xoff), y + lround (yoff));
+			/* FIXME: not rounding can make the background edges
+			 * blurry, but when rounding we might be 1px off.
+			cairo_translate (cr, x + lround (xoff), y + lround (yoff)); */
+			cairo_translate (cr, x + xoff, y + yoff);
 			cairo_scale (cr, dx, dy);
 			repeat_y (bg_image, cr, width / dx, height / dy,
 				  tile_width / dx, tile_height / dy);
 			break;
 		case CCD_BACKGROUND_NO_REPEAT:
-			cairo_translate (cr, x + lround (xoff), y + lround (yoff));
+			/* FIXME: not rounding can make the background edges
+			 * blurry, but when rounding we might be 1px off.
+			cairo_translate (cr, x + lround (xoff), y + lround (yoff)); */
+			cairo_translate (cr, x + xoff, y + yoff);
 			cairo_scale (cr, dx, dy);
 			no_repeat (bg_image, cr, width / dx, height / dy);
 			break;

Modified: trunk/themes/Gilouche-CSS/gtk-2.0/Makefile.am
==============================================================================
--- trunk/themes/Gilouche-CSS/gtk-2.0/Makefile.am	(original)
+++ trunk/themes/Gilouche-CSS/gtk-2.0/Makefile.am	Thu Sep 25 13:26:54 2008
@@ -9,14 +9,10 @@
 	arrow-left.svg \
 	arrow-right.svg \
 	button-back.png \
-	check-inactive.png \
 	check-inactive-selected.png \
-	check.png \
 	check-selected.png \
 	progressbar.png \
-	radiobutton-inactive.png \
 	radiobutton-inactive-selected.png \
-	radiobutton.png \
 	radiobutton-selected.png \
 	resizegrip.png \
 	scale-slider.png \

Modified: trunk/themes/Gilouche-CSS/gtk-2.0/check-inactive-selected.png
==============================================================================
Binary files trunk/themes/Gilouche-CSS/gtk-2.0/check-inactive-selected.png	(original) and trunk/themes/Gilouche-CSS/gtk-2.0/check-inactive-selected.png	Thu Sep 25 13:26:54 2008 differ

Modified: trunk/themes/Gilouche-CSS/gtk-2.0/check-selected.png
==============================================================================
Binary files trunk/themes/Gilouche-CSS/gtk-2.0/check-selected.png	(original) and trunk/themes/Gilouche-CSS/gtk-2.0/check-selected.png	Thu Sep 25 13:26:54 2008 differ

Modified: trunk/themes/Gilouche-CSS/gtk-2.0/radiobutton-inactive-selected.png
==============================================================================
Binary files trunk/themes/Gilouche-CSS/gtk-2.0/radiobutton-inactive-selected.png	(original) and trunk/themes/Gilouche-CSS/gtk-2.0/radiobutton-inactive-selected.png	Thu Sep 25 13:26:54 2008 differ

Modified: trunk/themes/Gilouche-CSS/gtk-2.0/radiobutton-selected.png
==============================================================================
Binary files trunk/themes/Gilouche-CSS/gtk-2.0/radiobutton-selected.png	(original) and trunk/themes/Gilouche-CSS/gtk-2.0/radiobutton-selected.png	Thu Sep 25 13:26:54 2008 differ

Modified: trunk/themes/Gilouche-CSS/gtk-2.0/scale-slider-vertical.png
==============================================================================
Binary files trunk/themes/Gilouche-CSS/gtk-2.0/scale-slider-vertical.png	(original) and trunk/themes/Gilouche-CSS/gtk-2.0/scale-slider-vertical.png	Thu Sep 25 13:26:54 2008 differ

Modified: trunk/themes/Gilouche-CSS/gtk-2.0/styles.css
==============================================================================
--- trunk/themes/Gilouche-CSS/gtk-2.0/styles.css	(original)
+++ trunk/themes/Gilouche-CSS/gtk-2.0/styles.css	Thu Sep 25 13:26:54 2008
@@ -16,17 +16,18 @@
 /* Checkboxes */
 
 check {
-	background-image: url(check.png);
-	background-position: center;
-	background-repeat: no-repeat;
+	border: 1px solid #948156;
+	border-radius: 2px;
 }
 
 check:insensitive {
-	background-image: url(check-inactive.png);
+	border: 1px solid #c6b182;
 }
 
 check[shadow=in] {
 	background-image: url(check-selected.png);
+	background-position: center;
+	background-repeat: no-repeat;
 }
 
 check:insensitive[shadow=in] {
@@ -35,21 +36,24 @@
 
 /* radiobuttons */
 option {
-	background-image: url(radiobutton.png);
-	background-position: center;
-	background-repeat: no-repeat;
+	border: 1px solid #948156;
+	border-radius: 50%;
 }
 
 option:insensitive {
-	background-image: url(radiobutton-inactive.png);
+	border: 1px solid #c6b182;
 }
 
 option[shadow=in] {
 	background-image: url(radiobutton-selected.png);
+	background-position: center;
+	background-repeat: no-repeat;
 }
 
 option:insensitive[shadow=in] {
 	background-image: url(radiobutton-inactive-selected.png);
+	background-position: center;
+	background-repeat: no-repeat;
 }
 
 /* arrows */
@@ -121,14 +125,14 @@
 GtkHScrollbar slider {
 	background-image: url(slider-background-horizontal.png);
 	background-position: center;
-	background-repeat: no-repeat;
+	background-repeat: repeat-x;
 	border: 1px solid #c6b182;
 }
 /* vertical scrollbar */
 GtkVScrollbar slider {
 	background-image: url(slider-background.png);
 	background-position: center;
-	background-repeat: no-repeat;
+	background-repeat: repeat-y;
 	border: 1px solid #c6b182;
 }
 
@@ -158,6 +162,7 @@
 
 extension[gap=bottom]:normal {
 	border: 1px solid #a28f62;
+	background-color: #fbf8f1;
 	background-image: url(tab-back.png);
 	background-position: left top;
 	background-repeat: repeat-x;
@@ -165,6 +170,7 @@
 
 extension[gap=left]:normal {
 	border: 1px solid #a28f62;
+	background-color: #fbf8f1;
 	background-image: url(tab-back-right.png);
 	background-position: right top;
 	background-repeat: repeat-y;
@@ -172,6 +178,7 @@
 
 extension[gap=top]:normal {
 	border: 1px solid #a28f62;
+	background-color: #fbf8f1;
 	background-image: url(tab-back-down.png);
 	background-position: left bottom;
 	background-repeat: repeat-x;
@@ -179,6 +186,7 @@
 
 extension[gap=right]:normal {
 	border: 1px solid #a28f62;
+	background-color: #fbf8f1;
 	background-image: url(tab-back-left.png);
 	background-position: left top;
 	background-repeat: repeat-y;