1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-18 13:54:36 -05:00

Fix scrolling for vertical layout with horizontal packing

Current scrolling effect looks interesting, but impractical, when with
multiple columns.

Signed-off-by: Dave Davenport <qball@gmpclient.org>
This commit is contained in:
Nikita Zlobin 2024-06-06 21:31:28 +05:00 committed by Dave Davenport
parent 753cd1e9e1
commit bd0ba45db8

View file

@ -293,7 +293,8 @@ static unsigned int scroll_per_page(listview *lv) {
return offset; return offset;
} }
static unsigned int scroll_continious(listview *lv) { // For vertical packing flow
static unsigned int scroll_continious_elements(listview *lv) {
unsigned int vmid = (lv->max_rows - 1) / 2; unsigned int vmid = (lv->max_rows - 1) / 2;
unsigned int hmid = (lv->menu_columns - 1) / 2; unsigned int hmid = (lv->menu_columns - 1) / 2;
unsigned int middle = (lv->max_rows * hmid) + vmid; unsigned int middle = (lv->max_rows * hmid) + vmid;
@ -315,6 +316,31 @@ static unsigned int scroll_continious(listview *lv) {
return offset; return offset;
} }
// For horizontal packing flow
static unsigned int scroll_continious_rows(listview *lv) {
unsigned int middle, selected, req_rows, offset;
middle = (lv->max_rows - 1) / 2;
selected = lv->selected / lv->menu_columns;
req_rows = (lv->req_elements + lv->menu_columns - 1) / lv->menu_columns;
offset = 0;
if (selected > middle) {
if (selected < (req_rows - (lv->max_rows - middle))) {
offset = selected - middle;
}
// Don't go below zero.
else if (req_rows > lv->max_rows) {
offset = req_rows - lv->max_rows;
}
}
offset *= lv->menu_columns;
if (offset != lv->cur_page) {
// scrollbar_set_handle ( lv->scrollbar, offset );
lv->cur_page = offset;
lv->rchanged = TRUE;
}
return offset;
}
static void update_element(listview *lv, unsigned int tb, unsigned int index, static void update_element(listview *lv, unsigned int tb, unsigned int index,
gboolean full) { gboolean full) {
// Select drawing mode // Select drawing mode
@ -419,10 +445,12 @@ static void barview_draw(widget *wid, cairo_t *draw) {
static void listview_draw(widget *wid, cairo_t *draw) { static void listview_draw(widget *wid, cairo_t *draw) {
unsigned int offset = 0; unsigned int offset = 0;
listview *lv = (listview *)wid; listview *lv = (listview *)wid;
if (lv->scroll_type == LISTVIEW_SCROLL_CONTINIOUS) { if (lv->scroll_type == LISTVIEW_SCROLL_PER_PAGE) {
offset = scroll_continious(lv);
} else {
offset = scroll_per_page(lv); offset = scroll_per_page(lv);
} else if (lv->pack_direction == ROFI_ORIENTATION_VERTICAL) {
offset = scroll_continious_elements(lv);
} else {
offset = scroll_continious_rows(lv);
} }
// Set these all together to make sure they update consistently. // Set these all together to make sure they update consistently.
scrollbar_set_max_value(lv->scrollbar, lv->req_elements); scrollbar_set_max_value(lv->scrollbar, lv->req_elements);