gimp r26719 - in trunk: . app/widgets libgimpwidgets

[neo svn gnome org]

Author: neo
Date: Fri Aug 22 21:44:52 2008
New Revision: 26719
URL: http://svn.gnome.org/viewvc/gimp?rev=26719&view=rev

Log:
2008-08-22  Sven Neumann  <sven gimp org>

	* app/widgets/gimpnavigationview.c
	* libgimpwidgets/gimpscrolledpreview.c: hardcode the colors to
	black and white. Using theme colors doesn't make sense here.



Modified:
   trunk/ChangeLog
   trunk/app/widgets/gimpnavigationview.c
   trunk/libgimpwidgets/gimpscrolledpreview.c

Modified: trunk/app/widgets/gimpnavigationview.c
==============================================================================
--- trunk/app/widgets/gimpnavigationview.c	(original)
+++ trunk/app/widgets/gimpnavigationview.c	Fri Aug 22 21:44:52 2008
@@ -479,8 +479,8 @@
   nav_view->p_x = RINT (nav_view->x * ratiox);
   nav_view->p_y = RINT (nav_view->y * ratioy);
 
-  nav_view->p_width  = RINT (nav_view->width  * ratiox);
-  nav_view->p_height = RINT (nav_view->height * ratioy);
+  nav_view->p_width  = ceil (nav_view->width  * ratiox);
+  nav_view->p_height = ceil (nav_view->height * ratioy);
 }
 
 static void
@@ -492,7 +492,6 @@
   if (view->renderer->viewable && nav_view->width && nav_view->height)
     {
       GtkWidget *widget = GTK_WIDGET (view);
-      GdkColor  *color  = &widget->style->fg[widget->state];
 
       cairo_translate (cr, widget->allocation.x, widget->allocation.y);
       cairo_rectangle (cr,
@@ -502,11 +501,7 @@
                        nav_view->p_x, nav_view->p_y,
                        nav_view->p_width, nav_view->p_height);
 
-      cairo_set_source_rgba (cr,
-                             color->red   / 65535.,
-                             color->green / 65535.,
-                             color->blue  / 65535., 0.5);
-
+      cairo_set_source_rgba (cr, 0, 0, 0, 0.5);
       cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
       cairo_fill (cr);
 
@@ -514,8 +509,7 @@
                        nav_view->p_x, nav_view->p_y,
                        nav_view->p_width, nav_view->p_height);
 
-      gdk_cairo_set_source_color  (cr, &widget->style->bg[widget->state]);
-
+      cairo_set_source_rgb (cr, 1, 1, 1);
       cairo_set_line_width (cr, 2);
       cairo_stroke (cr);
     }

Modified: trunk/libgimpwidgets/gimpscrolledpreview.c
==============================================================================
--- trunk/libgimpwidgets/gimpscrolledpreview.c	(original)
+++ trunk/libgimpwidgets/gimpscrolledpreview.c	Fri Aug 22 21:44:52 2008
@@ -708,7 +708,6 @@
                                         GimpScrolledPreview *preview)
 {
   GtkAdjustment *adj;
-  GdkColor      *color;
   cairo_t       *cr;
   gdouble        x, y;
   gdouble        w, h;
@@ -741,19 +740,13 @@
 
   cairo_rectangle (cr, x, y, w, h);
 
-  color = &widget->style->fg[widget->state];
-  cairo_set_source_rgba (cr,
-                         color->red   / 65535.,
-                         color->green / 65535.,
-                         color->blue  / 65535., 0.5);
-
+  cairo_set_source_rgba (cr, 0, 0, 0, 0.5);
   cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
   cairo_fill (cr);
 
   cairo_rectangle (cr, x, y, w, h);
 
-  gdk_cairo_set_source_color  (cr, &widget->style->bg[widget->state]);
-
+  cairo_set_source_rgb (cr, 1, 1, 1);
   cairo_set_line_width (cr, 2);
   cairo_stroke (cr);