diff options
author | Dave Davenport <qball@gmpclient.org> | 2017-06-02 16:44:16 +0200 |
---|---|---|
committer | Dave Davenport <qball@gmpclient.org> | 2017-06-02 16:44:16 +0200 |
commit | 3e4622807425d9ca9964591a9c7c5b8e0fdd7c18 (patch) | |
tree | cf1bce9e71e98955353d31eb03349714ed4d7854 /source | |
parent | ea7d20d1503836eba0c16f8a1960b8f462911f0f (diff) |
Change Padding to RofiPadding
Diffstat (limited to 'source')
-rw-r--r-- | source/theme.c | 10 | ||||
-rw-r--r-- | source/widgets/box.c | 2 | ||||
-rw-r--r-- | source/widgets/widget.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/theme.c b/source/theme.c index 12e5fa37..6d620faa 100644 --- a/source/theme.c +++ b/source/theme.c @@ -54,8 +54,8 @@ const char *PropertyTypeName[] = { "Boolean", /** Color */ "Color", - /** Padding */ - "Padding", + /** RofiPadding */ + "RofiPadding", /** Link to global setting */ "Reference", /** Position */ @@ -447,7 +447,7 @@ Property *rofi_theme_find_property ( ThemeWidget *widget, PropertyType type, con if ( p->type == type ) { return p; } - // Padding and integer can be converted. + // RofiPadding and integer can be converted. if ( p->type == P_INTEGER && type == P_PADDING ) { return p; } @@ -588,7 +588,7 @@ void rofi_theme_get_color ( const widget *widget, const char *property, cairo_t g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property ); } } -Padding rofi_theme_get_padding ( const widget *widget, const char *property, Padding pad ) +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 ); @@ -598,7 +598,7 @@ Padding rofi_theme_get_padding ( const widget *widget, const char *property, Pad } else { RofiDistance d = (RofiDistance){ p->value.i, ROFI_PU_PX, ROFI_HL_SOLID }; - return (Padding){ d, d, d, d }; + return (RofiPadding){ d, d, d, d }; } } g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property ); diff --git a/source/widgets/box.c b/source/widgets/box.c index 8fd8ead1..6784f0ff 100644 --- a/source/widgets/box.c +++ b/source/widgets/box.c @@ -42,7 +42,7 @@ struct _box widget widget; RofiOrientation type; int max_size; - // Padding between elements + // RofiPadding between elements RofiDistance spacing; GList *children; diff --git a/source/widgets/widget.c b/source/widgets/widget.c index ab0ca2f2..9e1016b2 100644 --- a/source/widgets/widget.c +++ b/source/widgets/widget.c @@ -38,10 +38,10 @@ void widget_init ( widget *widget, WidgetType type, const char *name ) { widget->type = type; widget->name = g_strdup ( name ); - widget->def_padding = (Padding){ { WIDGET_DEFAULT_PADDING, ROFI_PU_PX, ROFI_HL_SOLID }, { WIDGET_DEFAULT_PADDING, ROFI_PU_PX, ROFI_HL_SOLID }, { WIDGET_DEFAULT_PADDING, ROFI_PU_PX, ROFI_HL_SOLID }, { WIDGET_DEFAULT_PADDING, ROFI_PU_PX, ROFI_HL_SOLID } }; - widget->def_border = (Padding){ { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID } }; - widget->def_border_radius = (Padding){ { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID } }; - widget->def_margin = (Padding){ { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID } }; + widget->def_padding = (RofiPadding){ { WIDGET_DEFAULT_PADDING, ROFI_PU_PX, ROFI_HL_SOLID }, { WIDGET_DEFAULT_PADDING, ROFI_PU_PX, ROFI_HL_SOLID }, { WIDGET_DEFAULT_PADDING, ROFI_PU_PX, ROFI_HL_SOLID }, { WIDGET_DEFAULT_PADDING, ROFI_PU_PX, ROFI_HL_SOLID } }; + widget->def_border = (RofiPadding){ { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID } }; + widget->def_border_radius = (RofiPadding){ { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID } }; + widget->def_margin = (RofiPadding){ { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID }, { 0, ROFI_PU_PX, ROFI_HL_SOLID } }; widget->padding = rofi_theme_get_padding ( widget, "padding", widget->def_padding ); widget->border = rofi_theme_get_padding ( widget, "border", widget->def_border ); |