gtk-engines r1332 - in trunk: . engines/clearlooks/src themes/Clearlooks/gtk-2.0

[bberg svn gnome org]

Author: bberg
Date: Sun Mar  8 13:50:43 2009
New Revision: 1332
URL: http://svn.gnome.org/viewvc/gtk-engines?rev=1332&view=rev

Log:
2009-03-08  Benjamin Berg  <benjamin sipsolutions net>

	* engines/clearlooks/src/clearlooks_draw.c:
	(clearlooks_draw_entry_progress):
	* themes/Clearlooks/gtk-2.0/gtkrc:
	Fix the radius of the clearlooks entry progress drawing and do the
	necessary changes in the theme.


Modified:
   trunk/ChangeLog
   trunk/engines/clearlooks/src/clearlooks_draw.c
   trunk/themes/Clearlooks/gtk-2.0/gtkrc

Modified: trunk/engines/clearlooks/src/clearlooks_draw.c
==============================================================================
--- trunk/engines/clearlooks/src/clearlooks_draw.c	(original)
+++ trunk/engines/clearlooks/src/clearlooks_draw.c	Sun Mar  8 13:50:43 2009
@@ -491,8 +491,8 @@
 		entry_radius = params->radius;
 	}
 
-	radius = MAX (0, entry_radius - MAX (MAX (progress->border.left, progress->border.right),
-	                                     MAX (progress->border.top, progress->border.bottom)));
+	radius = MAX (0, entry_radius + 1.0 - MAX (MAX (progress->border.left, progress->border.right),
+	                                           MAX (progress->border.top, progress->border.bottom)));
 
 	if (progress->max_size_known) {
 		/* Clip to the max size, and then draw a (larger) rectangle ... */

Modified: trunk/themes/Clearlooks/gtk-2.0/gtkrc
==============================================================================
--- trunk/themes/Clearlooks/gtk-2.0/gtkrc	(original)
+++ trunk/themes/Clearlooks/gtk-2.0/gtkrc	Sun Mar  8 13:50:43 2009
@@ -41,6 +41,8 @@
 	# Without this, gecko will fill in the background of the entry.
 	GtkEntry::honors-transparent-bg-hint = 1
 
+	GtkEntry::progress-border = { 2, 2, 2, 2 }
+
 	####################
 	# Color Definitions
 	####################
@@ -92,6 +94,14 @@
 	ythickness = 3
 }
 
+style "entry" {
+	xthickness = 3
+	ythickness = 3
+
+	bg[SELECTED] = mix (0.4, @selected_bg_color, @base_color)
+	fg[SELECTED] = @text_color
+}
+
 style "spinbutton" {
 
 	engine "clearlooks" {
@@ -324,7 +334,7 @@
 class "GtkSeparator" style "wide"
 class "GtkFrame" style "wide"
 class "GtkCalendar" style "wide"
-class "GtkEntry" style "wider"
+class "GtkEntry" style "entry"
 
 class "GtkSpinButton" style "spinbutton"
 class "GtkScale" style "scale"