PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-25 13:55:34 -05:00
Code Releases Activity

listview use padding accessors

Browse source
This commit is contained in:
Dave Davenport 2016-12-29 17:04:16 +01:00
parent a2001d1b9c
commit eec772d01d
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/widgets/listview.c
View file

@ -163,15 +163,15 @@ static void listview_draw ( widget *wid, cairo_t *draw )
unsigned int max = MIN ( lv->cur_elements, lv->req_elements - offset ); unsigned int max = MIN ( lv->cur_elements, lv->req_elements - offset );
if ( lv->rchanged ) { if ( lv->rchanged ) {
unsigned int width = lv->widget.w - lv->spacing * ( lv->cur_columns - 1 ); unsigned int width = lv->widget.w - lv->spacing * ( lv->cur_columns - 1 );
width -= wid->pad.left+wid->pad.right; width -= widget_padding_get_padding_width ( wid );
if ( widget_enabled ( WIDGET ( lv->scrollbar ) ) ) { if ( widget_enabled ( WIDGET ( lv->scrollbar ) ) ) {
width -= lv->spacing; width -= lv->spacing;
width -= widget_get_width ( WIDGET ( lv->scrollbar ) ); width -= widget_get_width ( WIDGET ( lv->scrollbar ) );
} }
unsigned int element_width = ( width ) / lv->cur_columns; unsigned int element_width = ( width ) / lv->cur_columns;
for ( unsigned int i = 0; i < max; i++ ) { for ( unsigned int i = 0; i < max; i++ ) {
unsigned int ex = wid->pad.left + ( ( i ) / lv->max_rows ) * ( element_width + lv->spacing ); unsigned int ex = widget_padding_get_left ( wid ) + ( ( i ) / lv->max_rows ) * ( element_width + lv->spacing );
unsigned int ey = wid->pad.top + ( ( i ) % lv->max_rows ) * ( lv->element_height + lv->spacing ); unsigned int ey = widget_padding_get_top ( wid ) + ( ( i ) % lv->max_rows ) * ( lv->element_height + lv->spacing );
textbox_moveresize ( lv->boxes[i], ex, ey, element_width, lv->element_height ); textbox_moveresize ( lv->boxes[i], ex, ey, element_width, lv->element_height );
update_element ( lv, i, i + offset, TRUE ); update_element ( lv, i, i + offset, TRUE );
@ -248,11 +248,13 @@ static void listview_resize ( widget *wid, short w, short h )
listview *lv = (listview *) wid; listview *lv = (listview *) wid;
lv->widget.w = MAX ( 0, w ); lv->widget.w = MAX ( 0, w );
lv->widget.h = MAX ( 0, h ); lv->widget.h = MAX ( 0, h );
int height = lv->widget.h - lv->widget.pad.top-lv->widget.pad.bottom; int height = lv->widget.h - widget_padding_get_padding_height ( WIDGET (lv) );
lv->max_rows = ( lv->spacing + height ) / ( lv->element_height + lv->spacing ); lv->max_rows = ( lv->spacing + height ) / ( lv->element_height + lv->spacing );
lv->max_elements = lv->max_rows * lv->menu_columns; lv->max_elements = lv->max_rows * lv->menu_columns;
widget_move ( WIDGET ( lv->scrollbar ), lv->widget.w - lv->widget.pad.right-widget_get_width ( WIDGET ( lv->scrollbar ) ), lv->widget.pad.top ); widget_move ( WIDGET ( lv->scrollbar ),
lv->widget.w - widget_padding_get_right ( WIDGET ( lv ) ) - widget_get_width ( WIDGET ( lv->scrollbar ) ),
widget_padding_get_top ( WIDGET (lv ) ));
widget_resize ( WIDGET ( lv->scrollbar ), widget_get_width ( WIDGET ( lv->scrollbar ) ), height ); widget_resize ( WIDGET ( lv->scrollbar ), widget_get_width ( WIDGET ( lv->scrollbar ) ), height );
listview_recompute_elements ( lv ); listview_recompute_elements ( lv );
@ -459,9 +461,9 @@ unsigned int listview_get_desired_height ( listview *lv )
h = MIN ( lv->menu_lines, lv->req_elements ); h = MIN ( lv->menu_lines, lv->req_elements );
} }
if ( h == 0 ) { if ( h == 0 ) {
return lv->widget.pad.top+lv->widget.pad.bottom; return widget_padding_get_padding_height ( WIDGET (lv) );
} }
return h * lv->element_height + ( h - 1 ) * lv->spacing+lv->widget.pad.top+lv->widget.pad.bottom; return h * lv->element_height + ( h - 1 ) * lv->spacing+widget_padding_get_padding_height ( WIDGET (lv) );
} }
void listview_set_show_scrollbar ( listview *lv, gboolean enabled ) void listview_set_show_scrollbar ( listview *lv, gboolean enabled )