diff options
| author | Dave Davenport <qball@blame.services> | 2021-08-27 00:18:14 +0200 |
|---|---|---|
| committer | Dave Davenport <qball@blame.services> | 2021-08-27 00:18:14 +0200 |
| commit | 0b83ab96ce55008e6619d99cecac190b71587d49 (patch) | |
| tree | fdcf7835c13bea1f7c6d11f53f81bda84c4fe44b | |
| parent | e4d5c10e4755b88f969590c6f6dc524cae95c722 (diff) | |
[Theme] double inheritance integer fallback fix
| -rw-r--r-- | source/theme.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/theme.c b/source/theme.c index 96d505ef..975a5f1f 100644 --- a/source/theme.c +++ b/source/theme.c @@ -944,7 +944,7 @@ const char *rofi_theme_get_string(const widget *widget, const char *property, Property *p = rofi_theme_find_property(wid, P_STRING, property, FALSE); return rofi_theme_get_string_inside(p, widget, property, def); } -static double rofi_theme_get_double_inside(Property *p, +static double rofi_theme_get_double_inside(const widget *orig, Property *p, const widget *widget, const char *property, double def) { if (p) { @@ -954,14 +954,14 @@ static double rofi_theme_get_double_inside(Property *p, rofi_theme_find_widget(widget->parent->name, widget->state, FALSE); Property *pv = rofi_theme_find_property(parent, P_DOUBLE, property, FALSE); - return rofi_theme_get_double_inside(pv, widget, property, def); + return rofi_theme_get_double_inside(orig, pv, widget, property, def); } return def; } return p->value.f; } ThemeWidget *wid = - rofi_theme_find_widget(widget->name, widget->state, FALSE); + rofi_theme_find_widget(orig->name, widget->state, FALSE); // Fallback to integer if double is not found. p = rofi_theme_find_property(wid, P_INTEGER, property, FALSE); return rofi_theme_get_integer_inside(p, widget, property, def); @@ -970,7 +970,7 @@ double rofi_theme_get_double(const widget *widget, const char *property, double def) { ThemeWidget *wid = rofi_theme_find_widget(widget->name, widget->state, FALSE); Property *p = rofi_theme_find_property(wid, P_DOUBLE, property, FALSE); - return rofi_theme_get_double_inside(p, widget, property, def); + return rofi_theme_get_double_inside(widget, p, widget, property, def); } static void rofi_theme_get_color_inside(const widget *widget, Property *p, const char *property, cairo_t *d) { |