From a9b76831103ac6d2b6a002d8ddf2c6bf2e2430dc Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Mon, 11 Feb 2002 16:28:17 +0000 Subject: [PATCH] Set title_scale to 1.0. 2002-02-11 Anders Carlsson * src/theme.c (meta_frame_layout_new): Set title_scale to 1.0. --- ChangeLog | 3 +-- src/theme-parser.c | 3 ++- src/theme.c | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82986783d..fb46d85c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,6 @@ 2002-02-11 Anders Carlsson - * src/theme-parser.c (parse_toplevel_element): Always set - title_scale_val. + * src/theme.c (meta_frame_layout_new): Set title_scale to 1.0 2002-02-11 Bastien Nocera diff --git a/src/theme-parser.c b/src/theme-parser.c index ff66a9ebd..48b632867 100644 --- a/src/theme-parser.c +++ b/src/theme-parser.c @@ -776,7 +776,8 @@ parse_toplevel_element (GMarkupParseContext *context, if (has_title) /* only if explicit, otherwise inherit */ info->layout->has_title = has_title_val; - info->layout->title_scale = title_scale_val; + if (title_scale) + info->layout->title_scale = title_scale_val; meta_theme_insert_layout (info->theme, name, info->layout); diff --git a/src/theme.c b/src/theme.c index 5e9dd8909..f241593d9 100644 --- a/src/theme.c +++ b/src/theme.c @@ -334,6 +334,7 @@ meta_frame_layout_new (void) layout->button_height = -1; layout->has_title = TRUE; + layout->title_scale = 1.0; init_border (&layout->button_border);