From 33643d0642e5d4228abf0bb19711ada837f6dff5 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Mon, 24 Jan 2022 21:50:52 +0100 Subject: [PATCH] Theme array fix inheriting. --- source/theme.c | 5 +++-- test/theme-parser-test.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/theme.c b/source/theme.c index 57c0c98f..1d530fd3 100644 --- a/source/theme.c +++ b/source/theme.c @@ -1283,8 +1283,9 @@ static GList *rofi_theme_get_array_inside(Property *p, const widget *widget, } GList *rofi_theme_get_array_distance(const widget *widget, const char *property) { - ThemeWidget *wid2 = rofi_theme_find_widget(widget->name, widget->state, TRUE); - Property *p = rofi_theme_find_property(wid2, P_ARRAY, property, TRUE); + ThemeWidget *wid2 = + rofi_theme_find_widget(widget->name, widget->state, FALSE); + Property *p = rofi_theme_find_property(wid2, P_ARRAY, property, FALSE); GList *list = rofi_theme_get_array_inside(p, widget, property, P_PADDING); GList *retv = NULL; for (GList *iter = g_list_first(list); iter != NULL; diff --git a/test/theme-parser-test.c b/test/theme-parser-test.c index cd10934b..b16dcc43 100644 --- a/test/theme-parser-test.c +++ b/test/theme-parser-test.c @@ -1261,7 +1261,7 @@ END_TEST START_TEST(test_prepare_array) { widget wid; wid.name = "element-text"; - wid.state = NULL; + wid.state = "normal.normal"; rofi_theme_parse_string("element-text { tabs: { 10, 20px, 30px, 40px };}"); ck_assert_ptr_nonnull(rofi_theme); // ck_assert_ptr_null ( rofi_theme->widgets );