static gboolean find_int(ParseState *ps, xmlNodePtr n, const gchar *names[],
gint *integer, gint lower, gint upper);
static gboolean find_string(ParseState *ps, xmlNodePtr n, const gchar *names[],
- const gchar **string);
+ gchar **string);
static gboolean find_color(ParseState *ps, xmlNodePtr n, const gchar *names[],
RrColor **color, gchar *alpha);
static gboolean find_point(ParseState *ps, xmlNodePtr n, const gchar *names[],
ParseState ps;
xmlNodePtr root;
RrJustify winjust, mtitlejust;
- const gchar *str;
+ gchar *str;
RrTheme *theme;
if (name) {
winjust = RR_JUSTIFY_RIGHT;
else if (strcmp(str, "center") == 0)
winjust = RR_JUSTIFY_CENTER;
+ g_free(str);
}
if (menu_title_font) {
mtitlejust = RR_JUSTIFY_RIGHT;
else if (strcmp(str, "center") == 0)
mtitlejust = RR_JUSTIFY_CENTER;
+ g_free(str);
}
if (menu_item_font) {
MAX(theme->padding * 2, ut + ub));
*/
theme->title_height = theme->label_height + theme->paddingy * 2;
- /* this should match the above title_height given the same font size
- for both. */
- theme->menu_title_height = theme->menu_title_font_height +
+
+ RrMargins(theme->a_menu_title, &ul, &ut, &ur, &ub);
+ theme->menu_title_label_height = theme->menu_title_font_height+ut+ub;
+ theme->menu_title_height = theme->menu_title_label_height +
theme->paddingy * 2;
}
theme->button_size = theme->label_height - 2;
}
static gboolean find_string(ParseState *ps, xmlNodePtr n, const gchar *names[],
- const gchar **string)
+ gchar **string)
{
if ((n = find_node(n, names))) {
*string = parse_string(ps->doc, n);