diff options
| -rw-r--r-- | src/stylesheet.c | 18 | ||||
| -rw-r--r-- | src/stylesheet.h | 18 |
2 files changed, 17 insertions, 19 deletions
diff --git a/src/stylesheet.c b/src/stylesheet.c index c16424a..9d8024e 100644 --- a/src/stylesheet.c +++ b/src/stylesheet.c @@ -281,8 +281,8 @@ static void default_stylesheet(StyleSheet *ss) ly->margin_right = 20.0; ly->margin_top = 20.0; ly->margin_bottom = 20.0; - ly->just = J_CENTER; - ly->vert = V_TOP; + ly->halign = J_CENTER; + ly->valign = V_TOP; ly->offset_x = 0.0; ly->offset_y = 0.0; /* irrelevant */ @@ -294,8 +294,8 @@ static void default_stylesheet(StyleSheet *ss) ly->margin_right = 20.0; ly->margin_top = 20.0; ly->margin_bottom = 20.0; - ly->just = J_CENTER; - ly->vert = V_CENTER; + ly->halign = J_CENTER; + ly->valign = V_CENTER; ly->offset_x = -200.0; ly->offset_y = +300.0; @@ -303,13 +303,12 @@ static void default_stylesheet(StyleSheet *ss) st->font = strdup("Sans 30"); ly = new_layout_element(ss, st->name); ly->text_style = st; - ly->text_style = st; ly->margin_left = 20.0; ly->margin_right = 20.0; ly->margin_top = 20.0; ly->margin_bottom = 20.0; - ly->just = J_CENTER; - ly->vert = V_CENTER; + ly->halign = J_CENTER; + ly->valign = V_CENTER; ly->offset_x = +200.0; ly->offset_y = -300.0; @@ -318,13 +317,12 @@ static void default_stylesheet(StyleSheet *ss) ly = new_layout_element(ss, "Slide content"); ly->text_style = st; - ly->text_style = st; ly->margin_left = 20.0; ly->margin_right = 20.0; ly->margin_top = 20.0; ly->margin_bottom = 20.0; - ly->just = J_CENTER; - ly->vert = V_CENTER; + ly->halign = J_CENTER; + ly->valign = V_CENTER; ly->offset_x = +200.0; ly->offset_y = -300.0; diff --git a/src/stylesheet.h b/src/stylesheet.h index 3e1c8be..8886283 100644 --- a/src/stylesheet.h +++ b/src/stylesheet.h @@ -55,19 +55,19 @@ enum vert_pos struct layout_element { - char *name; + char *name; struct text_style *text_style; - double margin_left; - double margin_right; - double margin_top; - double margin_bottom; + double margin_left; + double margin_right; + double margin_top; + double margin_bottom; - enum justify just; - enum vert_pos vert; + enum justify halign; + enum vert_pos valign; - double offset_x; - double offset_y; + double offset_x; + double offset_y; }; |