diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2013-02-03 23:22:14 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2013-02-03 23:22:14 +0100 |
| commit | ecb437e07db5d0edc3ee57f682b277ab8238537b (patch) | |
| tree | 69c8e3182a3eff7be1a9bacaa79fdb6f3be2dc3e /src/slideshow.c | |
| parent | 0372cf9ea14ea9ab5c7229e5a1badda042304109 (diff) | |
Fix broken slideshow rendering logic
Diffstat (limited to 'src/slideshow.c')
| -rw-r--r-- | src/slideshow.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/slideshow.c b/src/slideshow.c index 3361ab0..881ec47 100644 --- a/src/slideshow.c +++ b/src/slideshow.c @@ -74,6 +74,8 @@ static gboolean ss_draw_sig(GtkWidget *da, cairo_t *cr, struct presentation *p) int h; + /* FIXME: Assumes that monitor and slide sizes are such that + * letterboxing at sides. This needn't be the case. */ h = p->proj_slide_width * p->slide_height / p->slide_width; /* Get the overall size */ @@ -82,7 +84,7 @@ static gboolean ss_draw_sig(GtkWidget *da, cairo_t *cr, struct presentation *p) yoff = (allocation.height - h)/2.0; /* Draw the slide from the cache */ - cairo_rectangle(cr, 0.0, 0.0, width, height); + cairo_rectangle(cr, xoff, yoff, p->proj_slide_width, h); cairo_set_source_surface(cr, p->cur_proj_slide->rendered_proj, xoff, yoff); cairo_fill(cr); @@ -134,14 +136,6 @@ void end_slideshow(struct presentation *p) gtk_widget_destroy(p->ss_drawingarea); gtk_widget_destroy(p->slideshow); p->slideshow = NULL; - - if ( (p->cur_proj_slide != NULL) - && (p->cur_proj_slide->rendered_edit != NULL) ) - { - cairo_surface_destroy(p->cur_proj_slide->rendered_proj); - p->cur_proj_slide->rendered_proj = NULL; - } - p->cur_proj_slide = NULL; redraw_editor(p); } |