From: Étienne Buira <[email protected]>
---
src/pixbuf-renderer.c | 17 +----------------
src/renderer-tiles.c | 12 +++++++-----
2 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/src/pixbuf-renderer.c b/src/pixbuf-renderer.c
index 32f8641..3271787 100644
--- a/src/pixbuf-renderer.c
+++ b/src/pixbuf-renderer.c
@@ -890,28 +890,13 @@ static void pr_scroller_stop(PixbufRenderer *pr)
void pixbuf_renderer_set_color(PixbufRenderer *pr, GdkColor *color)
{
- GtkStyle *style;
GtkWidget *widget;
g_return_if_fail(IS_PIXBUF_RENDERER(pr));
widget = GTK_WIDGET(pr);
- if (color) {
- GdkColor *slot;
-
- style = gtk_style_copy(gtk_widget_get_style(widget));
- slot = &style->bg[GTK_STATE_NORMAL];
-
- slot->red = color->red;
- slot->green = color->green;
- slot->blue = color->blue;
- }
- else {
- style = gtk_style_copy(gtk_widget_get_default_style());
- }
-
- gtk_widget_set_style(widget, style);
+ gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, color);
pr->renderer->update_viewport(pr->renderer);
if (pr->renderer2) pr->renderer2->update_viewport(pr->renderer2);
diff --git a/src/renderer-tiles.c b/src/renderer-tiles.c
index f48fe57..931a667 100644
--- a/src/renderer-tiles.c
+++ b/src/renderer-tiles.c
@@ -192,11 +192,13 @@ static void rt_border_draw(RendererTiles *rt, gint x,
gint y, gint w, gint h)
{
PixbufRenderer *pr = rt->pr;
GtkWidget *box;
+ const GtkStyle *boxStyle;
GdkWindow *window;
gint rx, ry, rw, rh;
cairo_t *cr;
box = GTK_WIDGET(pr);
+ boxStyle = gtk_widget_get_style(box);
window = gtk_widget_get_window(box);
if (!window) return;
@@ -211,7 +213,7 @@ static void rt_border_draw(RendererTiles *rt, gint x, gint
y, gint w, gint h)
pr->viewport_width, pr->viewport_height,
&rx, &ry, &rw, &rh))
{
- cairo_set_source_rgb(cr, 0, 0, 0);
+ gdk_cairo_set_source_color(cr,
&boxStyle->bg[GTK_STATE_NORMAL]);
cairo_rectangle(cr, rx + rt->stereo_off_x, ry +
rt->stereo_off_y, rw, rh);
cairo_fill(cr);
cairo_destroy(cr);
@@ -228,7 +230,7 @@ static void rt_border_draw(RendererTiles *rt, gint x, gint
y, gint w, gint h)
pr->x_offset, pr->viewport_height,
&rx, &ry, &rw, &rh))
{
- cairo_set_source_rgb(cr, 0, 0, 0);
+ gdk_cairo_set_source_color(cr,
&boxStyle->bg[GTK_STATE_NORMAL]);
cairo_rectangle(cr, rx + rt->stereo_off_x, ry +
rt->stereo_off_y, rw, rh);
cairo_fill(cr);
rt_overlay_draw(rt, rx, ry, rw, rh, NULL);
@@ -239,7 +241,7 @@ static void rt_border_draw(RendererTiles *rt, gint x, gint
y, gint w, gint h)
pr->viewport_width - pr->vis_width -
pr->x_offset, pr->viewport_height,
&rx, &ry, &rw, &rh))
{
- cairo_set_source_rgb(cr, 0, 0, 0);
+ gdk_cairo_set_source_color(cr,
&boxStyle->bg[GTK_STATE_NORMAL]);
cairo_rectangle(cr, rx + rt->stereo_off_x, ry +
rt->stereo_off_y, rw, rh);
cairo_fill(cr);
rt_overlay_draw(rt, rx, ry, rw, rh, NULL);
@@ -253,7 +255,7 @@ static void rt_border_draw(RendererTiles *rt, gint x, gint
y, gint w, gint h)
pr->vis_width, pr->y_offset,
&rx, &ry, &rw, &rh))
{
- cairo_set_source_rgb(cr, 0, 0, 0);
+ gdk_cairo_set_source_color(cr,
&boxStyle->bg[GTK_STATE_NORMAL]);
cairo_rectangle(cr, rx + rt->stereo_off_x, ry +
rt->stereo_off_y, rw, rh);
cairo_fill(cr);
rt_overlay_draw(rt, rx, ry, rw, rh, NULL);
@@ -264,7 +266,7 @@ static void rt_border_draw(RendererTiles *rt, gint x, gint
y, gint w, gint h)
pr->vis_width, pr->viewport_height -
pr->vis_height - pr->y_offset,
&rx, &ry, &rw, &rh))
{
- cairo_set_source_rgb(cr, 0, 0, 0);
+ gdk_cairo_set_source_color(cr,
&boxStyle->bg[GTK_STATE_NORMAL]);
cairo_rectangle(cr, rx + rt->stereo_off_x, ry +
rt->stereo_off_y, rw, rh);
cairo_fill(cr);
rt_overlay_draw(rt, rx, ry, rw, rh, NULL);
--
2.3.6
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
Geeqie-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-devel
