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

[Barview] Small cleanups.

Browse source
This commit is contained in:
Dave Davenport 2017-05-23 10:48:02 +02:00
parent d592a59252
commit a0df3b37c7
2 changed files with 51 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/view.c
View file

@ -1667,7 +1667,15 @@ RofiViewState *rofi_view_create ( Mode *sw,
listview_set_num_lines ( state->list_view, lines ); listview_set_num_lines ( state->list_view, lines );
listview_set_max_lines ( state->list_view, state->num_lines ); listview_set_max_lines ( state->list_view, state->num_lines );
box_add ( state->main_box, WIDGET ( state->list_view ), TRUE, 3 ); if ( rofi_theme_get_boolean ( state->main_window, "listview-in-inputbar", FALSE)){
box_add ( state->input_bar, WIDGET ( state->list_view ), TRUE, 3 );
Distance d = rofi_theme_get_distance ( WIDGET ( state->text ) , "width", 150);
state->text->widget.expand = FALSE;
widget_resize ( WIDGET( state->text ), distance_get_pixel ( d, ORIENTATION_HORIZONTAL ), -1);
} else {
box_add ( state->main_box, WIDGET ( state->list_view ), TRUE, 3 );
}
// filtered list // filtered list
state->line_map = g_malloc0_n ( state->num_lines, sizeof ( unsigned int ) ); state->line_map = g_malloc0_n ( state->num_lines, sizeof ( unsigned int ) );

84
source/widgets/listview.c
View file

@ -100,8 +100,10 @@ struct _listview
char *listview_name; char *listview_name;
/** Barview */ /** Barview */
MoveDirection direction; struct {
unsigned int cur_visible; MoveDirection direction;
unsigned int cur_visible;
} barview;
}; };
static int listview_get_desired_height ( widget *wid ); static int listview_get_desired_height ( widget *wid );
@ -118,23 +120,25 @@ static void listview_free ( widget *wid )
widget_free ( WIDGET ( lv->scrollbar ) ); widget_free ( WIDGET ( lv->scrollbar ) );
g_free ( lv ); g_free ( lv );
} }
static unsigned int scroll_per_page_barview ( listview *lv )
{
unsigned int offset = lv->last_offset;
// selected row is always visible.
// If selected is visible do not scroll.
if ( lv->selected < lv->last_offset ) {
offset = lv->selected;
lv->rchanged = TRUE;
} else if ( lv->selected >= (lv->last_offset + lv->barview.cur_visible ) ) {
offset = lv->selected;
lv->rchanged = TRUE;
}
return offset;
}
static unsigned int scroll_per_page ( listview * lv ) static unsigned int scroll_per_page ( listview * lv )
{ {
int offset = 0; int offset = 0;
if ( lv->type == BARVIEW ){
offset = lv->last_offset;
// selected row is always visible.
// If selected is visible do not scroll.
if ( lv->selected < lv->last_offset ) {
offset = lv->selected;
lv->rchanged = TRUE;
} else if ( lv->selected >= (lv->last_offset + lv->cur_visible ) ) {
offset = lv->selected;
lv->rchanged = TRUE;
}
return offset;
}
// selected row is always visible. // selected row is always visible.
// If selected is visible do not scroll. // If selected is visible do not scroll.
@ -191,10 +195,8 @@ static void barview_draw ( widget *wid, cairo_t *draw )
{ {
unsigned int offset = 0; unsigned int offset = 0;
listview *lv = (listview *) wid; listview *lv = (listview *) wid;
offset = scroll_per_page ( lv ); offset = scroll_per_page_barview ( lv );
lv->last_offset = offset; lv->last_offset = offset;
printf("offset %d %d lines: %d\n", lv->last_offset, lv->direction, lv->cur_elements);
int spacing_vert = distance_get_pixel ( lv->spacing, ORIENTATION_VERTICAL );
int spacing_hori = distance_get_pixel ( lv->spacing, ORIENTATION_HORIZONTAL ); int spacing_hori = distance_get_pixel ( lv->spacing, ORIENTATION_HORIZONTAL );
int left_offset = widget_padding_get_left ( wid ); int left_offset = widget_padding_get_left ( wid );
@ -204,17 +206,16 @@ static void barview_draw ( widget *wid, cairo_t *draw )
// Set new x/y possition. // Set new x/y possition.
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 ) {
lv->cur_visible = 0; int first = TRUE;
int width = lv->widget.w; int width = lv->widget.w;
lv->barview.cur_visible = 0;
width -= widget_padding_get_padding_width ( wid ); width -= widget_padding_get_padding_width ( wid );
if ( lv->direction == LEFT_TO_RIGHT ) { if ( lv->barview.direction == LEFT_TO_RIGHT ) {
int first = TRUE;
for ( unsigned int i = 0; i < max&& width > 0; i++ ) { for ( unsigned int i = 0; i < max&& width > 0; i++ ) {
update_element ( lv, i, i + offset, TRUE ); update_element ( lv, i, i + offset, TRUE );
int twidth = textbox_get_desired_width ( WIDGET(lv->boxes[i])); int twidth = textbox_get_desired_width ( WIDGET(lv->boxes[i]));
if ( twidth >= width ) { if ( twidth >= width ) {
if ( ! first ) { if ( ! first ) {
printf("break: %d\n", twidth);
break; break;
} }
twidth = width; twidth = width;
@ -222,41 +223,36 @@ static void barview_draw ( widget *wid, cairo_t *draw )
textbox_moveresize ( lv->boxes[i], left_offset, top_offset, twidth, lv->element_height ); textbox_moveresize ( lv->boxes[i], left_offset, top_offset, twidth, lv->element_height );
widget_draw ( WIDGET ( lv->boxes[i] ), draw ); widget_draw ( WIDGET ( lv->boxes[i] ), draw );
width -= twidth + spacing_vert; width -= twidth + spacing_hori;
left_offset += twidth + spacing_vert; left_offset += twidth + spacing_hori;
first = FALSE; first = FALSE;
lv->cur_visible++ ; lv->barview.cur_visible++ ;
} }
} else { } else {
int first = TRUE;
for ( unsigned int i = 0; i < lv->cur_elements && width > 0 && i <= offset; i++ ) { for ( unsigned int i = 0; i < lv->cur_elements && width > 0 && i <= offset; i++ ) {
update_element ( lv, i, offset-i, TRUE ); update_element ( lv, i, offset-i, TRUE );
int twidth = textbox_get_desired_width ( WIDGET ( lv->boxes[i] )); int twidth = textbox_get_desired_width ( WIDGET ( lv->boxes[i] ));
if ( twidth >= width ) { if ( twidth >= width ) {
if ( ! first ) { if ( ! first ) {
printf("break: %d\n", twidth);
break; break;
} }
twidth = width; twidth = width;
} }
right_offset -= twidth; right_offset -= twidth;
printf("ro: %d\n", right_offset);
textbox_moveresize ( lv->boxes[i], right_offset, top_offset, twidth, lv->element_height ); textbox_moveresize ( lv->boxes[i], right_offset, top_offset, twidth, lv->element_height );
widget_draw ( WIDGET ( lv->boxes[i] ), draw ); widget_draw ( WIDGET ( lv->boxes[i] ), draw );
width -= twidth + spacing_vert; width -= twidth + spacing_hori;
right_offset -= spacing_vert; right_offset -= spacing_hori;
first = FALSE; first = FALSE;
lv->cur_visible++ ; lv->barview.cur_visible++ ;
printf("i < offset: %d < %d widht: %d max: %d\n" , i , offset, width,max);
} }
offset -= lv->cur_visible-1; offset -= lv->barview.cur_visible-1;
lv->last_offset = offset; lv->last_offset = offset;
for ( unsigned int i = 0; i < (lv->cur_visible/2); i++) for ( unsigned int i = 0; i < (lv->barview.cur_visible/2); i++)
{ {
void * temp = lv->boxes[i]; void * temp = lv->boxes[i];
int sw = lv->cur_visible-i-1; int sw = lv->barview.cur_visible-i-1;
printf("%d <-->%d\n", i, sw);
lv->boxes[i] = lv->boxes[sw]; lv->boxes[i] = lv->boxes[sw];
lv->boxes[sw] = temp; lv->boxes[sw] = temp;
} }
@ -265,7 +261,7 @@ static void barview_draw ( widget *wid, cairo_t *draw )
lv->rchanged = FALSE; lv->rchanged = FALSE;
} }
else { else {
for ( unsigned int i = 0; i < lv->cur_visible; i++ ) { for ( unsigned int i = 0; i < lv->barview.cur_visible; i++ ) {
update_element ( lv, i, i + offset, FALSE ); update_element ( lv, i, i + offset, FALSE );
widget_draw ( WIDGET ( lv->boxes[i] ), draw ); widget_draw ( WIDGET ( lv->boxes[i] ), draw );
} }
@ -397,7 +393,7 @@ void listview_set_selected ( listview *lv, unsigned int selected )
{ {
if ( lv && lv->req_elements > 0 ) { if ( lv && lv->req_elements > 0 ) {
lv->selected = MIN ( selected, lv->req_elements - 1 ); lv->selected = MIN ( selected, lv->req_elements - 1 );
lv->direction = LEFT_TO_RIGHT; lv->barview.direction = LEFT_TO_RIGHT;
widget_queue_redraw ( WIDGET ( lv ) ); widget_queue_redraw ( WIDGET ( lv ) );
} }
} }
@ -528,10 +524,14 @@ listview *listview_create ( const char *name, listview_update_callback cb, void
lv->fixed_num_lines = rofi_theme_get_boolean ( WIDGET ( lv ), "fixed-height", config.fixed_num_lines ); lv->fixed_num_lines = rofi_theme_get_boolean ( WIDGET ( lv ), "fixed-height", config.fixed_num_lines );
lv->dynamic = rofi_theme_get_boolean ( WIDGET ( lv ), "dynamic", TRUE ); lv->dynamic = rofi_theme_get_boolean ( WIDGET ( lv ), "dynamic", TRUE );
lv->reverse = rofi_theme_get_boolean ( WIDGET ( lv ), "reverse", reverse ); lv->reverse = rofi_theme_get_boolean ( WIDGET ( lv ), "reverse", reverse );
listview_set_show_scrollbar ( lv, rofi_theme_get_boolean ( WIDGET ( lv ), "scrollbar", FALSE ) );
lv->cycle = rofi_theme_get_boolean ( WIDGET ( lv ), "cycle", config.cycle ); lv->cycle = rofi_theme_get_boolean ( WIDGET ( lv ), "cycle", config.cycle );
lv->type = rofi_theme_get_boolean ( WIDGET (lv) , "barview", FALSE ); lv->type = rofi_theme_get_boolean ( WIDGET (lv) , "barview", FALSE );
if ( lv->type == LISTVIEW ) {
listview_set_show_scrollbar ( lv, rofi_theme_get_boolean ( WIDGET ( lv ), "scrollbar", FALSE ) );
} else {
listview_set_show_scrollbar ( lv, FALSE );
}
return lv; return lv;
} }
@ -551,7 +551,7 @@ static void listview_nav_up_int ( listview *lv )
lv->selected = lv->req_elements; lv->selected = lv->req_elements;
} }
lv->selected--; lv->selected--;
lv->direction = RIGHT_TO_LEFT; lv->barview.direction = RIGHT_TO_LEFT;
widget_queue_redraw ( WIDGET ( lv ) ); widget_queue_redraw ( WIDGET ( lv ) );
} }
static void listview_nav_down_int ( listview *lv ) static void listview_nav_down_int ( listview *lv )
@ -563,7 +563,7 @@ static void listview_nav_down_int ( listview *lv )
return; return;
} }
lv->selected = lv->selected < lv->req_elements - 1 ? MIN ( lv->req_elements - 1, lv->selected + 1 ) : 0; lv->selected = lv->selected < lv->req_elements - 1 ? MIN ( lv->req_elements - 1, lv->selected + 1 ) : 0;
lv->direction = LEFT_TO_RIGHT; lv->barview.direction = LEFT_TO_RIGHT;
widget_queue_redraw ( WIDGET ( lv ) ); widget_queue_redraw ( WIDGET ( lv ) );
} }