diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2015-08-16 18:15:46 +0200 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2015-08-16 18:15:46 +0200 |
| commit | 321afdd0e417c701fbf9797ccfc3fd59a86d4dc2 (patch) | |
| tree | 8dc56f70c27d6e81e40f7d9585810e9f8e58906f /src/slideshow.c | |
| parent | f0b6caf6998fc4998b14e25ccc9318349ad552ad (diff) | |
Top frame is created by rendering pipeline, but owned by caller
Diffstat (limited to 'src/slideshow.c')
| -rw-r--r-- | src/slideshow.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/src/slideshow.c b/src/slideshow.c index b156a06..8124268 100644 --- a/src/slideshow.c +++ b/src/slideshow.c @@ -53,7 +53,7 @@ struct _slideshow struct inhibit_sys *inhibit; int linked; cairo_surface_t *surface; - struct frame top; + struct frame *top; }; @@ -85,7 +85,8 @@ void slideshow_rerender(SlideShow *ss) ss->surface = render_sc(ss->cur_slide->scblocks, ss->slide_width, ss->slide_height, ss->p->slide_width, ss->p->slide_height, - stylesheets, NULL, ss->p->is, ISZ_SLIDESHOW, n); + stylesheets, NULL, ss->p->is, ISZ_SLIDESHOW, n, + &ss->top); } @@ -268,26 +269,6 @@ SlideShow *try_start_slideshow(SlideWindow *sw, struct presentation *p) ss->inhibit = inhibit_prepare(); } - ss->top.children = NULL; - ss->top.num_children = 0; - ss->top.max_children = 0; - ss->top.lines = NULL; - ss->top.n_lines = 0; - ss->top.max_lines = 0; - ss->top.pad_l = 0; - ss->top.pad_r = 0; - ss->top.pad_t = 0; - ss->top.pad_b = 0; - ss->top.x = 0.0; - ss->top.y = 0.0; - ss->top.w = slide_width; - ss->top.h = slide_height; - ss->top.grad = GRAD_NONE; - ss->top.bgcol[0] = 1.0; - ss->top.bgcol[1] = 1.0; - ss->top.bgcol[2] = 1.0; - ss->top.bgcol[3] = 1.0; - ss->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); ss->drawingarea = gtk_drawing_area_new(); |