PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-02-10 15:44:41 -05:00
Code Releases Activity

Change Padding to RofiPadding

Browse source
This commit is contained in:
Dave Davenport 2017-06-02 16:44:16 +02:00
parent ea7d20d150
commit 3e46228074
7 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/theme.h
View file

@ -110,7 +110,7 @@ typedef enum
P_BOOLEAN, P_BOOLEAN,
/** Color */ /** Color */
P_COLOR, P_COLOR,
/** Padding */ /** RofiPadding */
P_PADDING, P_PADDING,
/** Link to global setting */ /** Link to global setting */
P_LINK, P_LINK,
@ -140,7 +140,7 @@ typedef struct
} ThemeColor; } ThemeColor;
/** /**
* Padding * RofiPadding
*/ */
typedef struct typedef struct
{ {
@ -148,7 +148,7 @@ typedef struct
RofiDistance right; RofiDistance right;
RofiDistance bottom; RofiDistance bottom;
RofiDistance left; RofiDistance left;
} Padding; } RofiPadding;
/** /**
* Theme highlight. * Theme highlight.
@ -172,8 +172,8 @@ typedef union {
gboolean b; gboolean b;
/** Color */ /** Color */
ThemeColor color; ThemeColor color;
/** Padding */ /** RofiPadding */
Padding padding; RofiPadding padding;
/** Reference */ /** Reference */
struct struct
{ {
@ -407,7 +407,7 @@ void rofi_theme_get_color ( const widget *widget, const char *property, cairo_t
* *
* @returns The padding of this property for this widget. * @returns The padding of this property for this widget.
*/ */
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 );
/** /**
* @param widget The widget to query * @param widget The widget to query

18
include/widgets/widget-internal.h
View file

@ -44,15 +44,15 @@ struct _widget
short w; short w;
/** Height of the widget */ /** Height of the widget */
short h; short h;
/** Padding */ /** RofiPadding */
Padding def_margin; RofiPadding def_margin;
Padding def_padding; RofiPadding def_padding;
Padding def_border; RofiPadding def_border;
Padding def_border_radius; RofiPadding def_border_radius;
Padding margin; RofiPadding margin;
Padding padding; RofiPadding padding;
Padding border; RofiPadding border;
Padding border_radius; RofiPadding border_radius;
/** enabled or not */ /** enabled or not */
gboolean enabled; gboolean enabled;

8
lexer/theme-parser.y
View file

@ -333,22 +333,22 @@ t_property
| t_property_name T_PSEP t_property_distance T_PCLOSE { | t_property_name T_PSEP t_property_distance T_PCLOSE {
$$ = rofi_theme_property_create ( P_PADDING ); $$ = rofi_theme_property_create ( P_PADDING );
$$->name = $1; $$->name = $1;
$$->value.padding = (Padding){ $3, $3, $3, $3 }; $$->value.padding = (RofiPadding){ $3, $3, $3, $3 };
} }
| t_property_name T_PSEP t_property_distance t_property_distance T_PCLOSE { | t_property_name T_PSEP t_property_distance t_property_distance T_PCLOSE {
$$ = rofi_theme_property_create ( P_PADDING ); $$ = rofi_theme_property_create ( P_PADDING );
$$->name = $1; $$->name = $1;
$$->value.padding = (Padding){ $3, $4, $3, $4 }; $$->value.padding = (RofiPadding){ $3, $4, $3, $4 };
} }
| t_property_name T_PSEP t_property_distance t_property_distance t_property_distance T_PCLOSE { | t_property_name T_PSEP t_property_distance t_property_distance t_property_distance T_PCLOSE {
$$ = rofi_theme_property_create ( P_PADDING ); $$ = rofi_theme_property_create ( P_PADDING );
$$->name = $1; $$->name = $1;
$$->value.padding = (Padding){ $3, $4, $5, $4 }; $$->value.padding = (RofiPadding){ $3, $4, $5, $4 };
} }
| t_property_name T_PSEP t_property_distance t_property_distance t_property_distance t_property_distance T_PCLOSE { | t_property_name T_PSEP t_property_distance t_property_distance t_property_distance t_property_distance T_PCLOSE {
$$ = rofi_theme_property_create ( P_PADDING ); $$ = rofi_theme_property_create ( P_PADDING );
$$->name = $1; $$->name = $1;
$$->value.padding = (Padding){ $3, $4, $5, $6 }; $$->value.padding = (RofiPadding){ $3, $4, $5, $6 };
} }
| t_property_name T_PSEP t_property_position T_PCLOSE{ | t_property_name T_PSEP t_property_position T_PCLOSE{
$$ = rofi_theme_property_create ( P_POSITION ); $$ = rofi_theme_property_create ( P_POSITION );

10
source/theme.c
View file

@ -54,8 +54,8 @@ const char *PropertyTypeName[] = {
"Boolean", "Boolean",
/** Color */ /** Color */
"Color", "Color",
/** Padding */ /** RofiPadding */
"Padding", "RofiPadding",
/** Link to global setting */ /** Link to global setting */
"Reference", "Reference",
/** Position */ /** Position */
@ -447,7 +447,7 @@ Property *rofi_theme_find_property ( ThemeWidget *widget, PropertyType type, con
if ( p->type == type ) { if ( p->type == type ) {
return p; return p;
} }
// Padding and integer can be converted. // RofiPadding and integer can be converted.
if ( p->type == P_INTEGER && type == P_PADDING ) { if ( p->type == P_INTEGER && type == P_PADDING ) {
return p; 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 ); 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 ); 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_PADDING, property, FALSE );
@ -598,7 +598,7 @@ Padding rofi_theme_get_padding ( const widget *widget, const char *property, Pad
} }
else { else {
RofiDistance d = (RofiDistance){ p->value.i, ROFI_PU_PX, ROFI_HL_SOLID }; 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 ); g_debug ( "Theme entry: #%s %s property %s unset.", widget->name, widget->state ? widget->state : "", property );

2
source/widgets/box.c
View file

@ -42,7 +42,7 @@ struct _box
widget widget; widget widget;
RofiOrientation type; RofiOrientation type;
int max_size; int max_size;
// Padding between elements // RofiPadding between elements
RofiDistance spacing; RofiDistance spacing;
GList *children; GList *children;

8
source/widgets/widget.c
View file

@ -38,10 +38,10 @@ void widget_init ( widget *widget, WidgetType type, const char *name )
{ {
widget->type = type; widget->type = type;
widget->name = g_strdup ( name ); 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_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 = (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 = (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 = (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 = (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 = (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 = (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->padding = rofi_theme_get_padding ( widget, "padding", widget->def_padding );
widget->border = rofi_theme_get_padding ( widget, "border", widget->def_border ); widget->border = rofi_theme_get_padding ( widget, "border", widget->def_border );

36
test/theme-parser-test.c
View file

@ -223,8 +223,8 @@ START_TEST ( test_properties_distance_em)
rofi_theme_parse_string ( "* { test: 10em;}"); rofi_theme_parse_string ( "* { test: 10em;}");
ck_assert_ptr_nonnull ( rofi_theme ); ck_assert_ptr_nonnull ( rofi_theme );
RofiDistance d = (RofiDistance){ 1, ROFI_PU_PX, ROFI_HL_SOLID}; RofiDistance d = (RofiDistance){ 1, ROFI_PU_PX, ROFI_HL_SOLID};
Padding pi = (Padding){d,d,d,d}; RofiPadding pi = (RofiPadding){d,d,d,d};
Padding p = rofi_theme_get_padding ( &wid, "test", pi); RofiPadding p = rofi_theme_get_padding ( &wid, "test", pi);
ck_assert_int_eq ( p.left.distance , 10 ); ck_assert_int_eq ( p.left.distance , 10 );
ck_assert_int_eq( p.left.type , ROFI_PU_EM ); ck_assert_int_eq( p.left.type , ROFI_PU_EM );
ck_assert_int_eq( p.left.style, ROFI_HL_SOLID); ck_assert_int_eq( p.left.style, ROFI_HL_SOLID);
@ -239,8 +239,8 @@ START_TEST ( test_properties_distance_em_linestyle)
rofi_theme_parse_string ( "* { sol: 1.3em solid; dash: 1.5em dash;}"); rofi_theme_parse_string ( "* { sol: 1.3em solid; dash: 1.5em dash;}");
ck_assert_ptr_nonnull ( rofi_theme ); ck_assert_ptr_nonnull ( rofi_theme );
RofiDistance d = (RofiDistance){ 1, ROFI_PU_PX, ROFI_HL_SOLID}; RofiDistance d = (RofiDistance){ 1, ROFI_PU_PX, ROFI_HL_SOLID};
Padding pi = (Padding){d,d,d,d}; RofiPadding pi = (RofiPadding){d,d,d,d};
Padding p = rofi_theme_get_padding ( &wid, "sol", pi); RofiPadding p = rofi_theme_get_padding ( &wid, "sol", pi);
ck_assert_double_eq ( p.left.distance , 1.3 ); ck_assert_double_eq ( p.left.distance , 1.3 );
ck_assert_int_eq( p.left.type , ROFI_PU_EM ); ck_assert_int_eq( p.left.type , ROFI_PU_EM );
ck_assert_int_eq( p.left.style, ROFI_HL_SOLID); ck_assert_int_eq( p.left.style, ROFI_HL_SOLID);
@ -259,8 +259,8 @@ START_TEST ( test_properties_distance_px)
rofi_theme_parse_string ( "* { test: 10px;}"); rofi_theme_parse_string ( "* { test: 10px;}");
ck_assert_ptr_nonnull ( rofi_theme ); ck_assert_ptr_nonnull ( rofi_theme );
RofiDistance d = (RofiDistance){ 1, ROFI_PU_EM, ROFI_HL_DASH}; RofiDistance d = (RofiDistance){ 1, ROFI_PU_EM, ROFI_HL_DASH};
Padding pi = (Padding){d,d,d,d}; RofiPadding pi = (RofiPadding){d,d,d,d};
Padding p = rofi_theme_get_padding ( &wid, "test", pi); RofiPadding p = rofi_theme_get_padding ( &wid, "test", pi);
ck_assert_double_eq ( p.left.distance , 10.0 ); ck_assert_double_eq ( p.left.distance , 10.0 );
ck_assert_int_eq( p.left.type , ROFI_PU_PX ); ck_assert_int_eq( p.left.type , ROFI_PU_PX );
ck_assert_int_eq( p.left.style, ROFI_HL_SOLID); ck_assert_int_eq( p.left.style, ROFI_HL_SOLID);
@ -274,8 +274,8 @@ START_TEST ( test_properties_distance_px_linestyle)
rofi_theme_parse_string ( "* { sol: 10px solid; dash: 14px dash;}"); rofi_theme_parse_string ( "* { sol: 10px solid; dash: 14px dash;}");
ck_assert_ptr_nonnull ( rofi_theme ); ck_assert_ptr_nonnull ( rofi_theme );
RofiDistance d = (RofiDistance){ 1, ROFI_PU_EM, ROFI_HL_DASH}; RofiDistance d = (RofiDistance){ 1, ROFI_PU_EM, ROFI_HL_DASH};
Padding pi = (Padding){d,d,d,d}; RofiPadding pi = (RofiPadding){d,d,d,d};
Padding p = rofi_theme_get_padding ( &wid, "sol", pi); RofiPadding p = rofi_theme_get_padding ( &wid, "sol", pi);
ck_assert_double_eq ( p.left.distance , 10.0 ); ck_assert_double_eq ( p.left.distance , 10.0 );
ck_assert_int_eq( p.left.type , ROFI_PU_PX ); ck_assert_int_eq( p.left.type , ROFI_PU_PX );
ck_assert_int_eq( p.left.style, ROFI_HL_SOLID); ck_assert_int_eq( p.left.style, ROFI_HL_SOLID);
@ -293,8 +293,8 @@ START_TEST ( test_properties_distance_percent)
rofi_theme_parse_string ( "* { test: 10%;}"); rofi_theme_parse_string ( "* { test: 10%;}");
ck_assert_ptr_nonnull ( rofi_theme ); ck_assert_ptr_nonnull ( rofi_theme );
RofiDistance d = (RofiDistance){ 1, ROFI_PU_EM, ROFI_HL_DASH}; RofiDistance d = (RofiDistance){ 1, ROFI_PU_EM, ROFI_HL_DASH};
Padding pi = (Padding){d,d,d,d}; RofiPadding pi = (RofiPadding){d,d,d,d};
Padding p = rofi_theme_get_padding ( &wid, "test", pi); RofiPadding p = rofi_theme_get_padding ( &wid, "test", pi);
ck_assert_double_eq ( p.left.distance , 10.0 ); ck_assert_double_eq ( p.left.distance , 10.0 );
ck_assert_int_eq( p.left.type , ROFI_PU_PERCENT); ck_assert_int_eq( p.left.type , ROFI_PU_PERCENT);
ck_assert_int_eq( p.left.style, ROFI_HL_SOLID); ck_assert_int_eq( p.left.style, ROFI_HL_SOLID);
@ -308,8 +308,8 @@ START_TEST ( test_properties_distance_percent_linestyle)
rofi_theme_parse_string ( "* { sol: 10% solid; dash: 10% dash;}"); rofi_theme_parse_string ( "* { sol: 10% solid; dash: 10% dash;}");
ck_assert_ptr_nonnull ( rofi_theme ); ck_assert_ptr_nonnull ( rofi_theme );
RofiDistance d = (RofiDistance){ 1, ROFI_PU_EM, ROFI_HL_DASH}; RofiDistance d = (RofiDistance){ 1, ROFI_PU_EM, ROFI_HL_DASH};
Padding pi = (Padding){d,d,d,d}; RofiPadding pi = (RofiPadding){d,d,d,d};
Padding p = rofi_theme_get_padding ( &wid, "sol", pi); RofiPadding p = rofi_theme_get_padding ( &wid, "sol", pi);
ck_assert_double_eq ( p.left.distance , 10.0 ); ck_assert_double_eq ( p.left.distance , 10.0 );
ck_assert_int_eq( p.left.type , ROFI_PU_PERCENT); ck_assert_int_eq( p.left.type , ROFI_PU_PERCENT);
ck_assert_int_eq( p.left.style, ROFI_HL_SOLID); ck_assert_int_eq( p.left.style, ROFI_HL_SOLID);
@ -962,8 +962,8 @@ START_TEST ( test_properties_padding_2 )
wid.state = NULL; wid.state = NULL;
rofi_theme_parse_string ( "* { test: 10px 20px;}"); rofi_theme_parse_string ( "* { test: 10px 20px;}");
RofiDistance d = (RofiDistance){ 1, ROFI_PU_PX, ROFI_HL_SOLID}; RofiDistance d = (RofiDistance){ 1, ROFI_PU_PX, ROFI_HL_SOLID};
Padding pi = (Padding){d,d,d,d}; RofiPadding pi = (RofiPadding){d,d,d,d};
Padding p = rofi_theme_get_padding ( &wid, "test", pi); RofiPadding p = rofi_theme_get_padding ( &wid, "test", pi);
ck_assert_double_eq ( p.left.distance , 20 ); ck_assert_double_eq ( p.left.distance , 20 );
ck_assert_int_eq ( p.left.type , ROFI_PU_PX ); ck_assert_int_eq ( p.left.type , ROFI_PU_PX );
ck_assert_double_eq ( p.right.distance , 20 ); ck_assert_double_eq ( p.right.distance , 20 );
@ -982,8 +982,8 @@ START_TEST ( test_properties_padding_3 )
wid.state = NULL; wid.state = NULL;
rofi_theme_parse_string ( "* { test: 10px 30px 20px;}"); rofi_theme_parse_string ( "* { test: 10px 30px 20px;}");
RofiDistance d = (RofiDistance){ 1, ROFI_PU_PX, ROFI_HL_SOLID}; RofiDistance d = (RofiDistance){ 1, ROFI_PU_PX, ROFI_HL_SOLID};
Padding pi = (Padding){d,d,d,d}; RofiPadding pi = (RofiPadding){d,d,d,d};
Padding p = rofi_theme_get_padding ( &wid, "test", pi); RofiPadding p = rofi_theme_get_padding ( &wid, "test", pi);
ck_assert_double_eq ( p.left.distance , 30 ); ck_assert_double_eq ( p.left.distance , 30 );
ck_assert_int_eq ( p.left.type , ROFI_PU_PX ); ck_assert_int_eq ( p.left.type , ROFI_PU_PX );
ck_assert_double_eq ( p.right.distance , 30 ); ck_assert_double_eq ( p.right.distance , 30 );
@ -1002,8 +1002,8 @@ START_TEST ( test_properties_padding_4 )
wid.state = NULL; wid.state = NULL;
rofi_theme_parse_string ( "* { test: 10px 30px 20px 40px;}"); rofi_theme_parse_string ( "* { test: 10px 30px 20px 40px;}");
RofiDistance d = (RofiDistance){ 1, ROFI_PU_PX, ROFI_HL_SOLID}; RofiDistance d = (RofiDistance){ 1, ROFI_PU_PX, ROFI_HL_SOLID};
Padding pi = (Padding){d,d,d,d}; RofiPadding pi = (RofiPadding){d,d,d,d};
Padding p = rofi_theme_get_padding ( &wid, "test", pi); RofiPadding p = rofi_theme_get_padding ( &wid, "test", pi);
ck_assert_double_eq ( p.left.distance , 40 ); ck_assert_double_eq ( p.left.distance , 40 );
ck_assert_int_eq ( p.left.type , ROFI_PU_PX ); ck_assert_int_eq ( p.left.type , ROFI_PU_PX );
ck_assert_double_eq ( p.right.distance , 30 ); ck_assert_double_eq ( p.right.distance , 30 );