From 7352f1c2bacb1da3dc603f88da54176ddc5f9107 Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Fri, 2 Jun 2017 16:21:05 +0200 Subject: Change PixelWidth to RofiPixelUnit. --- source/theme.c | 18 +++++++++--------- source/widgets/widget.c | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'source') diff --git a/source/theme.c b/source/theme.c index edfc4be5..80ed1c2e 100644 --- a/source/theme.c +++ b/source/theme.c @@ -131,16 +131,16 @@ void rofi_theme_free ( ThemeWidget *widget ) */ static void rofi_theme_print_distance ( Distance d ) { - if ( d.type == PW_PX ) { + if ( d.type == ROFI_PU_PX ) { printf ( "%upx ", (unsigned int) d.distance ); } - else if ( d.type == PW_PERCENT ) { + else if ( d.type == ROFI_PU_PERCENT ) { printf ( "%f%% ", d.distance ); } else { printf ( "%fem ", d.distance ); } - if ( d.style == DASH ) { + if ( d.style == ROFI_HL_DASH ) { printf ( "dash " ); } } @@ -511,14 +511,14 @@ static Distance _rofi_theme_get_distance ( const widget *widget, const char *pro Property *p = rofi_theme_find_property ( wid, P_PADDING, property, exact ); if ( p ) { if ( p->type == P_INTEGER ) { - return (Distance){ p->value.i, PW_PX, SOLID }; + return (Distance){ p->value.i, ROFI_PU_PX, ROFI_HL_SOLID }; } else { return p->value.padding.left; } } g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property ); - return (Distance){ def, PW_PX, SOLID }; + return (Distance){ def, ROFI_PU_PX, ROFI_HL_SOLID }; } @@ -597,7 +597,7 @@ Padding rofi_theme_get_padding ( const widget *widget, const char *property, Pad pad = p->value.padding; } else { - Distance d = (Distance){ p->value.i, PW_PX, SOLID }; + Distance d = (Distance){ p->value.i, ROFI_PU_PX, ROFI_HL_SOLID }; return (Padding){ d, d, d, d }; } } @@ -639,10 +639,10 @@ ThemeHighlight rofi_theme_get_highlight ( widget *widget, const char *property, int distance_get_pixel ( Distance d, Orientation ori ) { - if ( d.type == PW_EM ) { + if ( d.type == ROFI_PU_EM ) { return d.distance * textbox_get_estimated_char_height (); } - else if ( d.type == PW_PERCENT ) { + else if ( d.type == ROFI_PU_PERCENT ) { if ( ori == ORIENTATION_VERTICAL ) { int height = 0; rofi_view_get_current_monitor ( NULL, &height ); @@ -659,7 +659,7 @@ int distance_get_pixel ( Distance d, Orientation ori ) void distance_get_linestyle ( Distance d, cairo_t *draw ) { - if ( d.style == DASH ) { + if ( d.style == ROFI_HL_DASH ) { const double dashes[1] = { 4 }; cairo_set_dash ( draw, dashes, 1, 0.0 ); } diff --git a/source/widgets/widget.c b/source/widgets/widget.c index e0e89374..20fb09c9 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, PW_PX, SOLID }, { WIDGET_DEFAULT_PADDING, PW_PX, SOLID }, { WIDGET_DEFAULT_PADDING, PW_PX, SOLID }, { WIDGET_DEFAULT_PADDING, PW_PX, SOLID } }; - widget->def_border = (Padding){ { 0, PW_PX, SOLID }, { 0, PW_PX, SOLID }, { 0, PW_PX, SOLID }, { 0, PW_PX, SOLID } }; - widget->def_border_radius = (Padding){ { 0, PW_PX, SOLID }, { 0, PW_PX, SOLID }, { 0, PW_PX, SOLID }, { 0, PW_PX, SOLID } }; - widget->def_margin = (Padding){ { 0, PW_PX, SOLID }, { 0, PW_PX, SOLID }, { 0, PW_PX, SOLID }, { 0, PW_PX, SOLID } }; + 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->padding = rofi_theme_get_padding ( widget, "padding", widget->def_padding ); widget->border = rofi_theme_get_padding ( widget, "border", widget->def_border ); -- cgit v1.2.3