diff options
| author | Dave Davenport <qball@gmpclient.org> | 2017-05-31 11:25:14 +0200 |
|---|---|---|
| committer | Dave Davenport <qball@gmpclient.org> | 2017-05-31 11:25:14 +0200 |
| commit | f53e58ad95d4457170e02b6e2a0822dba1afb480 (patch) | |
| tree | fad8d5e7d104e45556c4b46dc9624fa2b94dece1 /source | |
| parent | d8b0e24b09e6e0aa9aaaf17e6ee9c92e0ebdc05e (diff) | |
| parent | 59e012e85bb73467943a01666da584eb9a734136 (diff) | |
Merge remote-tracking branch 'origin/master' into barview
Diffstat (limited to 'source')
| -rw-r--r-- | source/widgets/listview.c | 2 | ||||
| -rw-r--r-- | source/widgets/textbox.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/widgets/listview.c b/source/widgets/listview.c index 547df049..1206a701 100644 --- a/source/widgets/listview.c +++ b/source/widgets/listview.c @@ -367,7 +367,7 @@ static void listview_recompute_elements ( listview *lv ) char *name = g_strjoin ( ".", lv->listview_name, "element", NULL ); for ( unsigned int i = lv->cur_elements; i < newne; i++ ) { TextboxFlags flags = ( lv->multi_select ) ? TB_INDICATOR : 0; - flags |= (config.show_icons)? TB_ICON:0; + flags |= ((config.show_icons)? TB_ICON:0); lv->boxes[i] = textbox_create_full ( WIDGET_TYPE_LISTVIEW_ELEMENT, name, flags, NORMAL, "" ); widget_set_trigger_action_handler ( WIDGET ( lv->boxes[i] ), listview_element_trigger_action, lv ); } diff --git a/source/widgets/textbox.c b/source/widgets/textbox.c index 8b9b0c47..b328afb7 100644 --- a/source/widgets/textbox.c +++ b/source/widgets/textbox.c @@ -401,7 +401,7 @@ static void textbox_draw ( widget *wid, cairo_t *draw ) int y = top + ( pango_font_metrics_get_ascent ( tb->metrics ) - pango_layout_get_baseline ( tb->layout ) ) / PANGO_SCALE; // draw Icon - if ( (tb->flags|TB_ICON) == TB_ICON && tb->icon != NULL ) { + if ( (tb->flags&TB_ICON) == TB_ICON && tb->icon != NULL ) { int iconheight = textbox_get_font_height ( tb ); int translatex = 0; cairo_save(draw); |