dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/widgets/gimpnavigationview.c hardcode the colors to black and white. 

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.


svn path=/trunk/; revision=26719
This commit is contained in:
Sven Neumann 2008-08-22 21:44:52 +00:00 committed by Sven Neumann
parent 943c4dba85
commit ec12326ccb
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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.
2008-08-22 Sven Neumann <sven@gimp.org> 2008-08-22 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpscrolledpreview.[ch]: draw the navigation * libgimpwidgets/gimpscrolledpreview.[ch]: draw the navigation

14
app/widgets/gimpnavigationview.c
View File

@ -479,8 +479,8 @@ gimp_navigation_view_transform (GimpNavigationView *nav_view)
nav_view->p_x = RINT (nav_view->x * ratiox); nav_view->p_x = RINT (nav_view->x * ratiox);
nav_view->p_y = RINT (nav_view->y * ratioy); nav_view->p_y = RINT (nav_view->y * ratioy);
nav_view->p_width = RINT (nav_view->width * ratiox); nav_view->p_width = ceil (nav_view->width * ratiox);
nav_view->p_height = RINT (nav_view->height * ratioy); nav_view->p_height = ceil (nav_view->height * ratioy);
} }
static void static void
@ -492,7 +492,6 @@ gimp_navigation_view_draw_marker (GimpNavigationView *nav_view,
if (view->renderer->viewable && nav_view->width && nav_view->height) if (view->renderer->viewable && nav_view->width && nav_view->height)
{ {
GtkWidget *widget = GTK_WIDGET (view); GtkWidget *widget = GTK_WIDGET (view);
GdkColor *color = &widget->style->fg[widget->state];
cairo_translate (cr, widget->allocation.x, widget->allocation.y); cairo_translate (cr, widget->allocation.x, widget->allocation.y);
cairo_rectangle (cr, cairo_rectangle (cr,
@ -502,11 +501,7 @@ gimp_navigation_view_draw_marker (GimpNavigationView *nav_view,
nav_view->p_x, nav_view->p_y, nav_view->p_x, nav_view->p_y,
nav_view->p_width, nav_view->p_height); nav_view->p_width, nav_view->p_height);
cairo_set_source_rgba (cr, cairo_set_source_rgba (cr, 0, 0, 0, 0.5);
color->red / 65535.,
color->green / 65535.,
color->blue / 65535., 0.5);
cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD); cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
cairo_fill (cr); cairo_fill (cr);
@ -514,8 +509,7 @@ gimp_navigation_view_draw_marker (GimpNavigationView *nav_view,
nav_view->p_x, nav_view->p_y, nav_view->p_x, nav_view->p_y,
nav_view->p_width, nav_view->p_height); 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_set_line_width (cr, 2);
cairo_stroke (cr); cairo_stroke (cr);
} }

11
libgimpwidgets/gimpscrolledpreview.c
View File

@ -708,7 +708,6 @@ gimp_scrolled_preview_nav_popup_expose (GtkWidget *widget,
GimpScrolledPreview *preview) GimpScrolledPreview *preview)
{ {
GtkAdjustment *adj; GtkAdjustment *adj;
GdkColor *color;
cairo_t *cr; cairo_t *cr;
gdouble x, y; gdouble x, y;
gdouble w, h; gdouble w, h;
@ -741,19 +740,13 @@ gimp_scrolled_preview_nav_popup_expose (GtkWidget *widget,
cairo_rectangle (cr, x, y, w, h); cairo_rectangle (cr, x, y, w, h);
color = &widget->style->fg[widget->state]; cairo_set_source_rgba (cr, 0, 0, 0, 0.5);
cairo_set_source_rgba (cr,
color->red / 65535.,
color->green / 65535.,
color->blue / 65535., 0.5);
cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD); cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
cairo_fill (cr); cairo_fill (cr);
cairo_rectangle (cr, x, y, w, h); 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_set_line_width (cr, 2);
cairo_stroke (cr); cairo_stroke (cr);