PolytreeDE
/
rofi
mirror of https://github.com/davatorium/rofi.git
1
0
Fork 0
Code Releases Activity

[Widget] Fix inconsistency in argument checking.

This commit is contained in:
Dave Davenport 2020-07-09 17:47:32 +02:00
parent 5d3cd8a83f
commit 641cd4ef46
1 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/widgets/widget.c
View File

@ -98,7 +98,6 @@ void widget_set_state ( widget *widget, const char *state )
widget->set_state ( widget, state ); widget->set_state ( widget, state );
} }
widget_queue_redraw ( widget ); widget_queue_redraw ( widget );
} }
} }
@ -330,15 +329,15 @@ void widget_draw ( widget *widget, cairo_t *d )
void widget_free ( widget *wid ) void widget_free ( widget *wid )
{ {
if ( wid ) { if ( wid == NULL ) {
return;
}
if ( wid->name ) { if ( wid->name ) {
g_free ( wid->name ); g_free ( wid->name );
} }
if ( wid->free ) { if ( wid->free ) {
wid->free ( wid ); wid->free ( wid );
} }
return;
}
} }
int widget_get_height ( widget *widget ) int widget_get_height ( widget *widget )
@ -397,7 +396,9 @@ void widget_update ( widget *widget )
void widget_queue_redraw ( widget *wid ) void widget_queue_redraw ( widget *wid )
{ {
if ( wid ) { if ( wid == NULL ) {
return ;
}
widget *iter = wid; widget *iter = wid;
// Find toplevel widget. // Find toplevel widget.
while ( iter->parent != NULL ) { while ( iter->parent != NULL ) {
@ -406,11 +407,13 @@ void widget_queue_redraw ( widget *wid )
} }
iter->need_redraw = TRUE; iter->need_redraw = TRUE;
} }
}
gboolean widget_need_redraw ( widget *wid ) gboolean widget_need_redraw ( widget *wid )
{ {
if ( wid && wid->enabled ) { if ( wid == NULL ) {
return FALSE;
}
if ( wid->enabled ) {
return wid->need_redraw; return wid->need_redraw;
} }
return FALSE; return FALSE;
@ -418,7 +421,7 @@ gboolean widget_need_redraw ( widget *wid )
widget *widget_find_mouse_target ( widget *wid, WidgetType type, gint x, gint y ) widget *widget_find_mouse_target ( widget *wid, WidgetType type, gint x, gint y )
{ {
if ( !wid ) { if ( wid == NULL ) {
return NULL; return NULL;
} }
@ -436,7 +439,10 @@ widget *widget_find_mouse_target ( widget *wid, WidgetType type, gint x, gint y
WidgetTriggerActionResult widget_trigger_action ( widget *wid, guint action, gint x, gint y ) WidgetTriggerActionResult widget_trigger_action ( widget *wid, guint action, gint x, gint y )
{ {
if ( wid && wid->trigger_action ) { if ( wid == NULL ) {
return FALSE;
}
if ( wid->trigger_action ) {
return wid->trigger_action ( wid, action, x, y, wid->trigger_action_cb_data ); return wid->trigger_action ( wid, action, x, y, wid->trigger_action_cb_data );
} }
return FALSE; return FALSE;
@ -453,7 +459,10 @@ void widget_set_trigger_action_handler ( widget *wid, widget_trigger_action_cb c
gboolean widget_motion_notify ( widget *wid, gint x, gint y ) gboolean widget_motion_notify ( widget *wid, gint x, gint y )
{ {
if ( wid && wid->motion_notify ) { if ( wid == NULL ) {
return FALSE;
}
if ( wid->motion_notify ) {
wid->motion_notify ( wid, x, y ); wid->motion_notify ( wid, x, y );
} }
@ -553,23 +562,23 @@ int widget_get_desired_width ( widget *wid )
int widget_get_absolute_xpos ( widget *wid ) int widget_get_absolute_xpos ( widget *wid )
{ {
int retv = 0; if ( wid == NULL ) {
if ( wid ) { return 0;
retv += wid->x; }
int retv = wid->x;
if ( wid->parent ) { if ( wid->parent ) {
retv += widget_get_absolute_xpos ( wid->parent ); retv += widget_get_absolute_xpos ( wid->parent );
} }
}
return retv; return retv;
} }
int widget_get_absolute_ypos ( widget *wid ) int widget_get_absolute_ypos ( widget *wid )
{ {
int retv = 0; if ( wid == NULL ) {
if ( wid ) { return 0;
retv += wid->y; }
int retv = wid->y;
if ( wid->parent ) { if ( wid->parent ) {
retv += widget_get_absolute_ypos ( wid->parent ); retv += widget_get_absolute_ypos ( wid->parent );
} }
}
return retv; return retv;
} }