Mercurial > hg > forks > geeqie
changeset 2090:3f0bbd79773c
renamed renderer->update_sizes to update_viewport
| author | Vladimir Nadvornik <nadvornik@suse.cz> |
|---|---|
| date | Sat, 18 Aug 2012 18:05:20 +0200 |
| parents | 60c803c18a3f |
| children | f8e5de56fc04 |
| files | src/pixbuf-renderer.c src/pixbuf-renderer.h src/renderer-clutter.c src/renderer-tiles.c |
| diffstat | 4 files changed, 10 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/pixbuf-renderer.c Sat Aug 18 17:52:39 2012 +0200 +++ b/src/pixbuf-renderer.c Sat Aug 18 18:05:20 2012 +0200 @@ -912,8 +912,8 @@ gtk_widget_set_style(widget, style); - pr->renderer->update_sizes(pr->renderer); - if (pr->renderer2) pr->renderer2->update_sizes(pr->renderer2); + pr->renderer->update_viewport(pr->renderer); + if (pr->renderer2) pr->renderer2->update_viewport(pr->renderer2); } /* @@ -1818,8 +1818,8 @@ if (pr->renderer2) pr->renderer2->update_zoom(pr->renderer2, FALSE); } - pr->renderer->update_sizes(pr->renderer); - if (pr->renderer2) pr->renderer2->update_sizes(pr->renderer2); + pr->renderer->update_viewport(pr->renderer); + if (pr->renderer2) pr->renderer2->update_viewport(pr->renderer2); /* ensure scroller remains visible */ @@ -2413,9 +2413,6 @@ pr_pixbuf_size_sync(pr); pr_zoom_sync(pr, pr->zoom, PR_ZOOM_FORCE, 0, 0); - - pr->renderer->update_sizes(pr->renderer); - if (pr->renderer2) pr->renderer2->update_sizes(pr->renderer2); } gint pixbuf_renderer_get_orientation(PixbufRenderer *pr)
--- a/src/pixbuf-renderer.h Sat Aug 18 17:52:39 2012 +0200 +++ b/src/pixbuf-renderer.h Sat Aug 18 18:05:20 2012 +0200 @@ -77,7 +77,7 @@ void (*area_changed)(void *renderer, gint src_x, gint src_y, gint src_w, gint src_h); /* pixbuf area changed */ void (*invalidate_region)(void *renderer, gint x, gint y, gint w, gint h); void (*scroll)(void *renderer, gint x_off, gint y_off); /* scroll */ - void (*update_sizes)(void *renderer); /* window / wiewport / borders / border color has changed */ + void (*update_viewport)(void *renderer); /* window / wiewport / border color has changed */ void (*update_pixbuf)(void *renderer, gboolean lazy); /* pixbuf has changed */ void (*update_zoom)(void *renderer, gboolean lazy); /* zoom has changed */
--- a/src/renderer-clutter.c Sat Aug 18 17:52:39 2012 +0200 +++ b/src/renderer-clutter.c Sat Aug 18 18:05:20 2012 +0200 @@ -718,7 +718,7 @@ } -static void rc_update_sizes(void *renderer) +static void rc_update_viewport(void *renderer) { RendererClutter *rc = (RendererClutter *)renderer; ClutterColor stage_color = { 0x00, 0x00, 0x00, 0xff }; @@ -750,7 +750,7 @@ rc->stereo_off_y = rc->pr->stereo_fixed_y_left; } } - DEBUG_0("rc_update_sizes scale %d %d", rc->pr->width, rc->pr->height); + DEBUG_0("rc_update_viewport scale %d %d", rc->pr->width, rc->pr->height); clutter_stage_set_color(CLUTTER_STAGE(rc->stage), &stage_color); @@ -827,7 +827,7 @@ rc->f.update_zoom = rc_update_zoom; rc->f.invalidate_region = rc_invalidate_region; rc->f.scroll = rc_scroll; - rc->f.update_sizes = rc_update_sizes; + rc->f.update_viewport = rc_update_viewport; rc->f.overlay_add = rc_overlay_add;
--- a/src/renderer-tiles.c Sat Aug 18 17:52:39 2012 +0200 +++ b/src/renderer-tiles.c Sat Aug 18 18:05:20 2012 +0200 @@ -2077,7 +2077,7 @@ rt_overlay_draw((RendererTiles *)renderer, x, y, w, h, NULL); } -static void renderer_update_sizes(void *renderer) +static void renderer_update_viewport(void *renderer) { RendererTiles *rt = (RendererTiles *)renderer; @@ -2210,7 +2210,7 @@ rt->f.update_zoom = renderer_update_zoom; rt->f.invalidate_region = renderer_invalidate_region; rt->f.scroll = rt_scroll; - rt->f.update_sizes = renderer_update_sizes; + rt->f.update_viewport = renderer_update_viewport; rt->f.overlay_add = renderer_tiles_overlay_add;