diff options
Diffstat (limited to 'render/theme.c')
| -rw-r--r-- | render/theme.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/render/theme.c b/render/theme.c index daf2fddf..f3f7e5f4 100644 --- a/render/theme.c +++ b/render/theme.c @@ -1472,30 +1472,30 @@ static void parse_style(gchar *tex, RrSurfaceColorType *grad, } else { *grad = RR_SURFACE_SOLID; } + } - if (strstr(tex, "sunken") != NULL) - *relief = RR_RELIEF_SUNKEN; - else if (strstr(tex, "flat") != NULL) - *relief = RR_RELIEF_FLAT; - else - *relief = RR_RELIEF_RAISED; - - *border = FALSE; - if (*relief == RR_RELIEF_FLAT) { - if (strstr(tex, "border") != NULL) - *border = TRUE; - } else { - if (strstr(tex, "bevel2") != NULL) - *bevel = RR_BEVEL_2; - else - *bevel = RR_BEVEL_1; - } + if (strstr(tex, "sunken") != NULL) + *relief = RR_RELIEF_SUNKEN; + else if ((strstr(tex, "flat") != NULL) || (*grad == RR_SURFACE_PARENTREL)) + *relief = RR_RELIEF_FLAT; + else + *relief = RR_RELIEF_RAISED; - if (strstr(tex, "interlaced") != NULL) - *interlaced = TRUE; + *border = FALSE; + if (*relief == RR_RELIEF_FLAT) { + if (strstr(tex, "border") != NULL) + *border = TRUE; + } else { + if (strstr(tex, "bevel2") != NULL) + *bevel = RR_BEVEL_2; else - *interlaced = FALSE; + *bevel = RR_BEVEL_1; } + + if (strstr(tex, "interlaced") != NULL) + *interlaced = TRUE; + else + *interlaced = FALSE; } static xmlNodePtr find_node(xmlNodePtr n, const gchar *names[]) |