diff --git a/app/widgets/gimpviewrenderer.c b/app/widgets/gimpviewrenderer.c index 26b86af668..a0eefb313c 100644 --- a/app/widgets/gimpviewrenderer.c +++ b/app/widgets/gimpviewrenderer.c @@ -142,8 +142,8 @@ gimp_view_renderer_class_init (GimpViewRendererClass *klass) object_class->dispose = gimp_view_renderer_dispose; object_class->finalize = gimp_view_renderer_finalize; - klass->default_bg = GIMP_VIEW_BG_USE_STYLE; - klass->follow_theme_bg = GIMP_VIEW_BG_USE_STYLE; + klass->default_bg = GIMP_VIEW_BG_STYLE; + klass->follow_theme_bg = GIMP_VIEW_BG_STYLE; klass->frame = NULL; klass->frame_left = 0; @@ -168,7 +168,7 @@ gimp_view_renderer_init (GimpViewRenderer *renderer) renderer->border_type = GIMP_VIEW_BORDER_BLACK; renderer->border_color = gegl_color_new ("black"); - renderer->surface_bg = GIMP_VIEW_BG_USE_STYLE; + renderer->surface_bg = GIMP_VIEW_BG_STYLE; renderer->size = -1; renderer->priv->needs_render = TRUE; @@ -805,7 +805,7 @@ gimp_view_renderer_real_draw (GimpViewRenderer *renderer, cairo_fill (cr); break; - case GIMP_VIEW_BG_USE_STYLE: + case GIMP_VIEW_BG_STYLE: break; } @@ -855,8 +855,8 @@ gimp_view_renderer_real_render (GimpViewRenderer *renderer, { fg_color = gimp_get_style_color (widget, GTK_STYLE_PROPERTY_COLOR); - inside_bg = GIMP_VIEW_BG_USE_STYLE; - outside_bg = GIMP_VIEW_BG_USE_STYLE; + inside_bg = GIMP_VIEW_BG_STYLE; + outside_bg = GIMP_VIEW_BG_STYLE; } pixbuf = gimp_viewable_get_pixbuf (renderer->viewable, @@ -1244,7 +1244,7 @@ gimp_view_render_temp_buf_to_surface (GimpViewRenderer *renderer, cairo_paint (cr); break; - case GIMP_VIEW_BG_USE_STYLE: + case GIMP_VIEW_BG_STYLE: break; } @@ -1277,7 +1277,7 @@ gimp_view_render_temp_buf_to_surface (GimpViewRenderer *renderer, cairo_fill (cr); break; - case GIMP_VIEW_BG_USE_STYLE: + case GIMP_VIEW_BG_STYLE: break; } } diff --git a/app/widgets/gimpviewrendererbrush.c b/app/widgets/gimpviewrendererbrush.c index c0477078d7..3518ae91ee 100644 --- a/app/widgets/gimpviewrendererbrush.c +++ b/app/widgets/gimpviewrendererbrush.c @@ -65,7 +65,7 @@ gimp_view_renderer_brush_class_init (GimpViewRendererBrushClass *klass) object_class->finalize = gimp_view_renderer_brush_finalize; renderer_class->default_bg = GIMP_VIEW_BG_WHITE; - renderer_class->follow_theme_bg = GIMP_VIEW_BG_USE_STYLE; + renderer_class->follow_theme_bg = GIMP_VIEW_BG_STYLE; renderer_class->render = gimp_view_renderer_brush_render; renderer_class->draw = gimp_view_renderer_brush_draw; @@ -115,7 +115,7 @@ gimp_view_renderer_brush_render (GimpViewRenderer *renderer, GIMP_GUI_CONFIG (renderer->context->gimp->config)->viewables_follow_theme) { fg_color = gimp_get_style_color (widget, GTK_STYLE_PROPERTY_COLOR); - bg_style = GIMP_VIEW_BG_USE_STYLE; + bg_style = GIMP_VIEW_BG_STYLE; } temp_buf = gimp_viewable_get_new_preview (renderer->viewable, @@ -179,7 +179,7 @@ gimp_view_renderer_brush_render_timeout (gpointer data) if (renderer->context && GIMP_GUI_CONFIG (renderer->context->gimp->config)->viewables_follow_theme) { - bg_style = GIMP_VIEW_BG_USE_STYLE; + bg_style = GIMP_VIEW_BG_STYLE; fg_color = gimp_get_style_color (renderbrush->widget, GTK_STYLE_PROPERTY_COLOR); diff --git a/app/widgets/gimpviewrendererfont.c b/app/widgets/gimpviewrendererfont.c index d0b70d4061..0c9c94c143 100644 --- a/app/widgets/gimpviewrendererfont.c +++ b/app/widgets/gimpviewrendererfont.c @@ -41,7 +41,7 @@ gimp_view_renderer_font_class_init (GimpViewRendererFontClass *klass) GimpViewRendererClass *renderer_class = GIMP_VIEW_RENDERER_CLASS (klass); renderer_class->default_bg = GIMP_VIEW_BG_WHITE; - renderer_class->follow_theme_bg = GIMP_VIEW_BG_USE_STYLE; + renderer_class->follow_theme_bg = GIMP_VIEW_BG_STYLE; } static void diff --git a/app/widgets/gimpviewrendererpalette.c b/app/widgets/gimpviewrendererpalette.c index 43ff1a3bdd..bb4ead85bb 100644 --- a/app/widgets/gimpviewrendererpalette.c +++ b/app/widgets/gimpviewrendererpalette.c @@ -56,8 +56,8 @@ gimp_view_renderer_palette_class_init (GimpViewRendererPaletteClass *klass) object_class->finalize = gimp_view_renderer_palette_finalize; - renderer_class->default_bg = GIMP_VIEW_BG_USE_STYLE; - renderer_class->follow_theme_bg = GIMP_VIEW_BG_USE_STYLE; + renderer_class->default_bg = GIMP_VIEW_BG_STYLE; + renderer_class->follow_theme_bg = GIMP_VIEW_BG_STYLE; renderer_class->render = gimp_view_renderer_palette_render; } diff --git a/app/widgets/widgets-enums.h b/app/widgets/widgets-enums.h index 72fa52dee3..aed1e64d19 100644 --- a/app/widgets/widgets-enums.h +++ b/app/widgets/widgets-enums.h @@ -128,7 +128,7 @@ typedef enum /*< skip >*/ { GIMP_VIEW_BG_CHECKS, GIMP_VIEW_BG_WHITE, - GIMP_VIEW_BG_USE_STYLE + GIMP_VIEW_BG_STYLE } GimpViewBG; typedef enum /*< skip >*/