From 36a4bd7229a562d414513073d1123080b9615cd9 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 26 Feb 2019 19:57:41 +0100 Subject: Use slide size from stylesheet when appropriate --- libstorycode/slide.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'libstorycode/slide.c') diff --git a/libstorycode/slide.c b/libstorycode/slide.c index 809f2cb..9db5995 100644 --- a/libstorycode/slide.c +++ b/libstorycode/slide.c @@ -40,8 +40,8 @@ Slide *slide_new() if ( s == NULL ) return NULL; s->n_items = 0; s->items = NULL; - s->logical_w = 1024.0; - s->logical_h = 768.0; + s->logical_w = -1.0; + s->logical_h = -1.0; return s; } @@ -198,9 +198,16 @@ int slide_set_logical_size(Slide *s, double w, double h) } -int slide_get_logical_size(Slide *s, double *w, double *h) +int slide_get_logical_size(Slide *s, Stylesheet *ss, double *w, double *h) { if ( s == NULL ) return 1; + + if ( s->logical_w < 0.0 ) { + /* Slide-specific value not set, use stylesheet */ + stylesheet_get_slide_default_size(ss, w, h); + return 0; + } + *w = s->logical_w; *h = s->logical_h; return 0; -- cgit v1.2.3