diff --git a/lexer/theme-lexer.l b/lexer/theme-lexer.l index 8f09646e..3f3dab8a 100644 --- a/lexer/theme-lexer.l +++ b/lexer/theme-lexer.l @@ -767,12 +767,10 @@ if ( queue == NULL ) { . { yytext[yyleng-1] = '\0'; - fprintf(stderr,"prop found: |%s|\n", yytext); return T_ERROR_PROPERTY; } . { yytext[yyleng-1] = '\0'; - fprintf(stderr,"namestr found: |%s|\n", yytext); return T_ERROR_NAMESTRING; } %% diff --git a/source/theme.c b/source/theme.c index 7035344b..3f755e13 100644 --- a/source/theme.c +++ b/source/theme.c @@ -768,14 +768,36 @@ ThemeWidget *rofi_theme_find_widget ( const char *name, const char *state, gbool return widget; } +static int rofi_theme_get_position_inside ( Property *p, const widget *widget, const char *property, int def ) +{ + if ( p ) { + if ( p->type == P_INHERIT ) { + if ( widget->parent ) { + ThemeWidget *parent= rofi_theme_find_widget ( widget->parent->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( parent, P_COLOR, property, FALSE ); + return rofi_theme_get_position_inside ( p, widget, property, def ); + } + return def; + } + return p->value.i; + } + g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property ); + return def; +} int rofi_theme_get_position ( const widget *widget, const char *property, int def ) { ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); Property *p = rofi_theme_find_property ( wid, P_POSITION, property, FALSE ); + return rofi_theme_get_position_inside ( p, widget, property, def ); +} +static int rofi_theme_get_integer_inside ( Property *p, const widget *widget, const char *property, int def ) +{ if ( p ) { if ( p->type == P_INHERIT ) { if ( widget->parent ) { - return rofi_theme_get_position ( widget->parent, property, def ); + ThemeWidget *parent= rofi_theme_find_widget ( widget->parent->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( parent, P_COLOR, property, FALSE ); + return rofi_theme_get_integer_inside ( p, widget, property, def ); } return def; } @@ -784,31 +806,20 @@ int rofi_theme_get_position ( const widget *widget, const char *property, int de g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property ); return def; } - int rofi_theme_get_integer ( const widget *widget, const char *property, int def ) { ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); Property *p = rofi_theme_find_property ( wid, P_INTEGER, property, FALSE ); - if ( p ) { - if ( p->type == P_INHERIT ) { - if ( widget->parent ) { - return rofi_theme_get_integer ( widget->parent, property, def ); - } - return def; - } - return p->value.i; - } - g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property ); - return def; + return rofi_theme_get_integer_inside ( p, widget, property, def ); } -RofiDistance rofi_theme_get_distance ( const widget *widget, const char *property, int def ) +static RofiDistance rofi_theme_get_distance_inside ( Property *p, const widget *widget, const char *property, int def ) { - ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); - Property *p = rofi_theme_find_property ( wid, P_PADDING, property, FALSE ); if ( p ) { if ( p->type == P_INHERIT ) { if ( widget->parent ) { - return rofi_theme_get_distance ( widget->parent, property, def ); + ThemeWidget *parent= rofi_theme_find_widget ( widget->parent->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( parent, P_COLOR, property, FALSE ); + return rofi_theme_get_distance_inside ( p, widget->parent, property, def ); } return (RofiDistance){ .base = { def, ROFI_PU_PX, ROFI_DISTANCE_MODIFIER_NONE, NULL, NULL }, .style = ROFI_HL_SOLID }; } @@ -822,15 +833,44 @@ RofiDistance rofi_theme_get_distance ( const widget *widget, const char *propert g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property ); return (RofiDistance){ .base = { def, ROFI_PU_PX, ROFI_DISTANCE_MODIFIER_NONE, NULL, NULL }, .style = ROFI_HL_SOLID }; } +RofiDistance rofi_theme_get_distance ( const widget *widget, const char *property, int def ) +{ + ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( wid, P_PADDING, property, FALSE ); + return rofi_theme_get_distance_inside ( p, widget, property, def ); +} +static int rofi_theme_get_boolean_inside ( Property *p, const widget *widget, const char *property, int def ) +{ + if ( p ) { + if ( p->type == P_INHERIT ) { + if ( widget->parent ) { + ThemeWidget *parent= rofi_theme_find_widget ( widget->parent->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( parent, P_COLOR, property, FALSE ); + return rofi_theme_get_boolean_inside ( p, widget, property, def ); + } + return def; + } + return p->value.b; + } + g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property ); + return def; +} int rofi_theme_get_boolean ( const widget *widget, const char *property, int def ) { ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); Property *p = rofi_theme_find_property ( wid, P_BOOLEAN, property, FALSE ); + return rofi_theme_get_boolean_inside ( p, widget, property, def ); +} + +static RofiOrientation rofi_theme_get_orientation_inside ( Property *p, const widget *widget, const char *property, RofiOrientation def ) +{ if ( p ) { if ( p->type == P_INHERIT ) { if ( widget->parent ) { - return rofi_theme_get_boolean ( widget->parent, property, def ); + ThemeWidget *parent= rofi_theme_find_widget ( widget->parent->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( parent, P_COLOR, property, FALSE ); + return rofi_theme_get_orientation_inside ( p, widget, property, def ); } return def; } @@ -843,26 +883,17 @@ RofiOrientation rofi_theme_get_orientation ( const widget *widget, const char *p { ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); Property *p = rofi_theme_find_property ( wid, P_ORIENTATION, property, FALSE ); - if ( p ) { - if ( p->type == P_INHERIT ) { - if ( widget->parent ) { - return rofi_theme_get_orientation ( widget->parent, property, def ); - } - return def; - } - return p->value.b; - } - g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property ); - return def; + return rofi_theme_get_orientation_inside ( p, widget, property, def ); } -RofiCursorType rofi_theme_get_cursor_type ( const widget *widget, const char *property, RofiCursorType def ) + +static RofiCursorType rofi_theme_get_cursor_type_inside ( Property *p, const widget *widget, const char *property, RofiCursorType def ) { - ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); - Property *p = rofi_theme_find_property ( wid, P_CURSOR, property, FALSE ); if ( p ) { if ( p->type == P_INHERIT ) { if ( widget->parent ) { - return rofi_theme_get_cursor_type ( widget->parent, property, def ); + ThemeWidget *parent= rofi_theme_find_widget ( widget->parent->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( parent, P_COLOR, property, FALSE ); + return rofi_theme_get_cursor_type_inside ( p, widget, property, def ); } return def; } @@ -871,15 +902,20 @@ RofiCursorType rofi_theme_get_cursor_type ( const widget *widget, const char *pr g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property ); return def; } - -const char *rofi_theme_get_string ( const widget *widget, const char *property, const char *def ) +RofiCursorType rofi_theme_get_cursor_type ( const widget *widget, const char *property, RofiCursorType def ) { ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); - Property *p = rofi_theme_find_property ( wid, P_STRING, property, FALSE ); + Property *p = rofi_theme_find_property ( wid, P_CURSOR, property, FALSE ); + return rofi_theme_get_cursor_type_inside ( p, widget, property, def ); +} +static const char *rofi_theme_get_string_inside ( Property *p, const widget *widget, const char *property, const char *def ) +{ if ( p ) { if ( p->type == P_INHERIT ) { if ( widget->parent ) { - return rofi_theme_get_string ( widget->parent, property, def ); + ThemeWidget *parent= rofi_theme_find_widget ( widget->parent->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( parent, P_COLOR, property, FALSE ); + return rofi_theme_get_string_inside ( p, widget, property, def ); } return def; } @@ -888,14 +924,20 @@ const char *rofi_theme_get_string ( const widget *widget, const char *property, g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property ); return def; } -double rofi_theme_get_double ( const widget *widget, const char *property, double def ) +const char *rofi_theme_get_string ( const widget *widget, const char *property, const char *def ) { ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); - Property *p = rofi_theme_find_property ( wid, P_DOUBLE, property, FALSE ); + 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 ( ThemeWidget *wid, Property *p, const widget *widget, const char *property, double def ) +{ if ( p ) { if ( p->type == P_INHERIT ) { if ( widget->parent ) { - return rofi_theme_get_double ( widget->parent, property, def ); + ThemeWidget *parent= rofi_theme_find_widget ( widget->parent->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( parent, P_COLOR, property, FALSE ); + return rofi_theme_get_double_inside ( parent, p, widget, property, def ); } return def; } @@ -906,7 +948,9 @@ double rofi_theme_get_double ( const widget *widget, const char *property, doubl if ( p ) { if ( p->type == P_INHERIT ) { if ( widget->parent ) { - return rofi_theme_get_double ( widget->parent, property, def ); + ThemeWidget *parent= rofi_theme_find_widget ( widget->parent->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( parent, P_COLOR, property, FALSE ); + return rofi_theme_get_double_inside ( parent, p, widget->parent, property, def ); } return def; } @@ -915,36 +959,51 @@ double rofi_theme_get_double ( const widget *widget, const char *property, doubl g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property ); return def; } -void rofi_theme_get_color ( const widget *widget, const char *property, cairo_t *d ) +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_COLOR, property, FALSE ); + Property *p = rofi_theme_find_property ( wid, P_DOUBLE, property, FALSE ); + return rofi_theme_get_double_inside ( wid, p, widget, property, def ); +} +static void rofi_theme_get_color_inside ( const widget *widget, Property *p, const char *property, cairo_t *d ) +{ if ( p ) { if ( p->type == P_INHERIT ) { if ( widget->parent ) { - rofi_theme_get_color ( widget->parent, property, d ); + ThemeWidget *parent= rofi_theme_find_widget ( widget->parent->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( parent, P_COLOR, property, FALSE ); + rofi_theme_get_color_inside ( widget, p, property, d ); } return; } cairo_set_source_rgba ( d, - p->value.color.red, - p->value.color.green, - p->value.color.blue, - p->value.color.alpha - ); + p->value.color.red, + p->value.color.green, + p->value.color.blue, + p->value.color.alpha + ); } else { g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property ); } } -gboolean rofi_theme_get_image ( const widget *widget, const char *property, cairo_t *d ) + +void rofi_theme_get_color ( const widget *widget, const char *property, cairo_t *d ) { ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); - Property *p = rofi_theme_find_property ( wid, P_IMAGE , property, FALSE ); + Property *p = rofi_theme_find_property ( wid, P_COLOR, property, FALSE ); + rofi_theme_get_color_inside ( widget, p, property, d ); +} + + +static gboolean rofi_theme_get_image_inside ( Property *p, const widget *widget, const char *property, cairo_t *d ) +{ if ( p ) { if ( p->type == P_INHERIT ) { if ( widget->parent ) { - return rofi_theme_get_image ( widget->parent, property, d ); + ThemeWidget *parent= rofi_theme_find_widget ( widget->parent->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( parent, P_COLOR, property, FALSE ); + return rofi_theme_get_image_inside ( p, widget, property, d ); } return FALSE; } @@ -1037,14 +1096,20 @@ gboolean rofi_theme_get_image ( const widget *widget, const char *property, cair } return FALSE; } -RofiPadding rofi_theme_get_padding ( const widget *widget, const char *property, RofiPadding pad ) +gboolean rofi_theme_get_image ( const widget *widget, const char *property, cairo_t *d ) { ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); - Property *p = rofi_theme_find_property ( wid, P_PADDING, property, FALSE ); + Property *p = rofi_theme_find_property ( wid, P_IMAGE , property, FALSE ); + return rofi_theme_get_image_inside (p, widget, property, d); +} +static RofiPadding rofi_theme_get_padding_inside ( Property *p, const widget *widget, const char *property, RofiPadding pad ) +{ if ( p ) { if ( p->type == P_INHERIT ) { if ( widget->parent ) { - return rofi_theme_get_padding ( widget->parent, property, pad ); + ThemeWidget *parent= rofi_theme_find_widget ( widget->parent->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( parent, P_COLOR, property, FALSE ); + return rofi_theme_get_padding_inside ( p, widget, property, pad ); } return pad; } @@ -1059,15 +1124,21 @@ RofiPadding rofi_theme_get_padding ( const widget *widget, const char *property, g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property ); return pad; } - -GList *rofi_theme_get_list ( const widget *widget, const char * property, const char *defaults ) +RofiPadding rofi_theme_get_padding ( const widget *widget, const char *property, RofiPadding pad ) +{ + ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( wid, P_PADDING, property, FALSE ); + return rofi_theme_get_padding_inside ( p, widget, property, pad ); +} + +static GList *rofi_theme_get_list_inside ( Property *p, const widget *widget, const char * property, const char *defaults ) { - ThemeWidget *wid2 = rofi_theme_find_widget ( widget->name, widget->state, TRUE ); - Property *p = rofi_theme_find_property ( wid2, P_LIST, property, TRUE ); if ( p ) { if ( p->type == P_INHERIT ) { if ( widget->parent ) { - return rofi_theme_get_list ( widget->parent, property, defaults ); + ThemeWidget *parent= rofi_theme_find_widget ( widget->parent->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( parent, P_COLOR, property, FALSE ); + return rofi_theme_get_list_inside ( p, widget, property, defaults ); } } else if ( p->type == P_LIST ) { @@ -1085,15 +1156,21 @@ GList *rofi_theme_get_list ( const widget *widget, const char * property, const } return NULL; } - -RofiHighlightColorStyle rofi_theme_get_highlight ( widget *widget, const char *property, RofiHighlightColorStyle th ) +GList *rofi_theme_get_list ( const widget *widget, const char * property, const char *defaults ) +{ + ThemeWidget *wid2 = rofi_theme_find_widget ( widget->name, widget->state, TRUE ); + Property *p = rofi_theme_find_property ( wid2, P_LIST, property, TRUE ); + return rofi_theme_get_list_inside ( p, widget, property, defaults ); +} + +static RofiHighlightColorStyle rofi_theme_get_highlight_inside ( Property *p, widget *widget, const char *property, RofiHighlightColorStyle th ) { - ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); - Property *p = rofi_theme_find_property ( wid, P_HIGHLIGHT, property, FALSE ); if ( p ) { if ( p->type == P_INHERIT ) { if ( widget->parent ) { - return rofi_theme_get_highlight ( widget->parent, property, th ); + ThemeWidget *parent= rofi_theme_find_widget ( widget->parent->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( parent, P_COLOR, property, FALSE ); + return rofi_theme_get_highlight_inside ( p, widget->parent, property, th ); } return th; } @@ -1102,7 +1179,12 @@ RofiHighlightColorStyle rofi_theme_get_highlight ( widget *widget, const char *p g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property ); return th; } - +RofiHighlightColorStyle rofi_theme_get_highlight ( widget *widget, const char *property, RofiHighlightColorStyle th ) +{ + ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( wid, P_HIGHLIGHT, property, FALSE ); + return rofi_theme_get_highlight_inside ( p, widget, property, th ); +} static int get_pixels ( RofiDistanceUnit *unit, RofiOrientation ori ) { int val = unit->distance; @@ -1394,14 +1476,14 @@ ThemeMediaType rofi_theme_parse_media_type ( const char *type ) return THEME_MEDIA_TYPE_INVALID; } -gboolean rofi_theme_has_property ( const widget *widget, const char *property ) +static gboolean rofi_theme_has_property_inside ( Property *p, const widget *widget, const char *property ) { - ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); - Property *p = rofi_theme_find_property ( wid, P_STRING, property, FALSE ); if ( p ) { if ( p->type == P_INHERIT ) { if ( widget->parent ) { - return rofi_theme_has_property ( widget->parent, property ); + ThemeWidget *parent= rofi_theme_find_widget ( widget->parent->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( parent, P_COLOR, property, FALSE ); + return rofi_theme_has_property_inside ( p, widget, property ); } return FALSE; } @@ -1409,3 +1491,9 @@ gboolean rofi_theme_has_property ( const widget *widget, const char *property ) } return FALSE; } +gboolean rofi_theme_has_property ( const widget *widget, const char *property ) +{ + ThemeWidget *wid = rofi_theme_find_widget ( widget->name, widget->state, FALSE ); + Property *p = rofi_theme_find_property ( wid, P_STRING, property, FALSE ); + return rofi_theme_has_property_inside ( p, widget, property ); +} diff --git a/themes/Adapta-Nokto.rasi b/themes/Adapta-Nokto.rasi index 7e063699..442f3cd3 100644 --- a/themes/Adapta-Nokto.rasi +++ b/themes/Adapta-Nokto.rasi @@ -65,7 +65,12 @@ element { border: 0; padding: 1px ; } -element.normal.normal { +element-text { + background-color: inherit; + text-color: inherit; +} + +element normal.normal { background-color: @normal-background; text-color: @normal-foreground; } diff --git a/themes/Arc-Dark.rasi b/themes/Arc-Dark.rasi index 56e7de74..de23dfc3 100644 --- a/themes/Arc-Dark.rasi +++ b/themes/Arc-Dark.rasi @@ -63,6 +63,10 @@ element { border: 0; padding: 1px ; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { background-color: @normal-background; text-color: @normal-foreground; diff --git a/themes/Arc.rasi b/themes/Arc.rasi index 9eaa18f5..04309598 100644 --- a/themes/Arc.rasi +++ b/themes/Arc.rasi @@ -64,6 +64,10 @@ element { border: 0; padding: 1px ; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { background-color: @normal-background; text-color: @normal-foreground; diff --git a/themes/DarkBlue.rasi b/themes/DarkBlue.rasi index 9065c09c..6be7ddd2 100644 --- a/themes/DarkBlue.rasi +++ b/themes/DarkBlue.rasi @@ -64,6 +64,10 @@ element { border: 0; padding: 1px ; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { background-color: @normal-background; text-color: @normal-foreground; diff --git a/themes/Indego.rasi b/themes/Indego.rasi index 3242a335..8e188a23 100644 --- a/themes/Indego.rasi +++ b/themes/Indego.rasi @@ -64,6 +64,10 @@ element { border: 0; padding: 1px ; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { background-color: @normal-background; text-color: @normal-foreground; diff --git a/themes/Monokai.rasi b/themes/Monokai.rasi index bc3a3dab..613d4d02 100644 --- a/themes/Monokai.rasi +++ b/themes/Monokai.rasi @@ -64,6 +64,10 @@ element { border: 0; padding: 1px ; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { background-color: @normal-background; text-color: @normal-foreground; diff --git a/themes/Paper.rasi b/themes/Paper.rasi index 03233e34..67a98b1a 100644 --- a/themes/Paper.rasi +++ b/themes/Paper.rasi @@ -64,6 +64,10 @@ element { border: 0; padding: 1px ; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { background-color: @normal-background; text-color: @normal-foreground; diff --git a/themes/Pop-Dark.rasi b/themes/Pop-Dark.rasi index 54b0f93c..352107ce 100644 --- a/themes/Pop-Dark.rasi +++ b/themes/Pop-Dark.rasi @@ -60,6 +60,10 @@ listview { element { border: 0; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { text-color: @normal-foreground; background-color: @normal-background; diff --git a/themes/android_notification.rasi b/themes/android_notification.rasi index 85a02083..6bbd8bb9 100644 --- a/themes/android_notification.rasi +++ b/themes/android_notification.rasi @@ -64,6 +64,10 @@ element { border: 0; padding: 1px ; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { background-color: @normal-background; text-color: @normal-foreground; diff --git a/themes/arthur.rasi b/themes/arthur.rasi index e9f982b8..437778a7 100644 --- a/themes/arthur.rasi +++ b/themes/arthur.rasi @@ -111,6 +111,10 @@ element { color: @foreground; font:inherit; } +element-text { + background-color: inherit; + text-color: inherit; +} element selected.normal { background-color: @blue; } diff --git a/themes/blue.rasi b/themes/blue.rasi index 185a287f..540d1b0b 100644 --- a/themes/blue.rasi +++ b/themes/blue.rasi @@ -64,6 +64,10 @@ element { border: 0; padding: 1px ; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { background-color: @normal-background; text-color: @normal-foreground; diff --git a/themes/c64.rasi b/themes/c64.rasi index dc970d44..b796b236 100644 --- a/themes/c64.rasi +++ b/themes/c64.rasi @@ -67,6 +67,10 @@ element { border: 0; padding: 1px ; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { background-color: @normal-background; text-color: @normal-foreground; diff --git a/themes/fancy.rasi b/themes/fancy.rasi index 1f6e9df8..050ca581 100644 --- a/themes/fancy.rasi +++ b/themes/fancy.rasi @@ -148,6 +148,10 @@ element { border-color: transparent; padding: 4px ; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { background-color: @normal-background; text-color: @normal-foreground; diff --git a/themes/glue_pro_blue.rasi b/themes/glue_pro_blue.rasi index d50c5f60..42f8631b 100644 --- a/themes/glue_pro_blue.rasi +++ b/themes/glue_pro_blue.rasi @@ -63,6 +63,10 @@ element { border: 0; padding: 1px ; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { background-color: @normal-background; text-color: @normal-foreground; diff --git a/themes/gruvbox-common.rasi b/themes/gruvbox-common.rasi index f9c73171..36bd0cbd 100644 --- a/themes/gruvbox-common.rasi +++ b/themes/gruvbox-common.rasi @@ -125,3 +125,7 @@ textbox-prompt-sep { text-color: @normal-foreground; margin: 0 0.3em 0 0; } +element-text { + background-color: inherit; + text-color: inherit; +} diff --git a/themes/lb.rasi b/themes/lb.rasi index 9f2c47e8..fb7ef0a6 100644 --- a/themes/lb.rasi +++ b/themes/lb.rasi @@ -64,6 +64,10 @@ element { border: 0; padding: 1px ; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { background-color: @normal-background; text-color: @normal-foreground; diff --git a/themes/paper-float.rasi b/themes/paper-float.rasi index 33df6bfb..fbf38f3f 100644 --- a/themes/paper-float.rasi +++ b/themes/paper-float.rasi @@ -55,6 +55,10 @@ element { padding: 2px; highlight: bold ; } +element-text { + background-color: inherit; + text-color: inherit; +} element normal.normal { text-color: #002B36FF; background-color: #F5F5F500; diff --git a/themes/purple.rasi b/themes/purple.rasi index 1819cd70..1c414276 100644 --- a/themes/purple.rasi +++ b/themes/purple.rasi @@ -63,6 +63,10 @@ element { border: 0; padding: 1px ; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { background-color: @normal-background; text-color: @normal-foreground; diff --git a/themes/sidebar.rasi b/themes/sidebar.rasi index e9cd3d1f..69cd0a81 100644 --- a/themes/sidebar.rasi +++ b/themes/sidebar.rasi @@ -76,6 +76,10 @@ listview { dynamic: false; lines: 0; } +element-text { + background-color: inherit; + text-color: inherit; +} element selected normal { background-color: @blue; } diff --git a/themes/solarized.rasi b/themes/solarized.rasi index dae7b9af..9107fa90 100644 --- a/themes/solarized.rasi +++ b/themes/solarized.rasi @@ -63,6 +63,10 @@ element { border: 0; padding: 1px ; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { background-color: @normal-background; text-color: @normal-foreground; diff --git a/themes/solarized_alternate.rasi b/themes/solarized_alternate.rasi index 81a41ef1..77154fca 100644 --- a/themes/solarized_alternate.rasi +++ b/themes/solarized_alternate.rasi @@ -63,6 +63,10 @@ element { border: 0; padding: 1px ; } +element-text { + background-color: inherit; + text-color: inherit; +} element.normal.normal { background-color: @normal-background; text-color: @normal-foreground;