Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

file-browser, package-manager: pg up/pg dn scrolling

Browse Source
This commit is contained in:
K. Lange 2018-12-08 12:35:15 +09:00
parent e370421bef
commit 517060eebc
2 changed files with 73 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
apps/file-browser.c
View File

@ -1081,6 +1081,24 @@ static void _handle_button_press(int index) {
}
}
static void _scroll_up(void) {
scroll_offset -= SCROLL_AMOUNT;
if (scroll_offset < 0) {
scroll_offset = 0;
}
}
static void _scroll_down(void) {
if (available_height > contents->height) {
scroll_offset = 0;
} else {
scroll_offset += SCROLL_AMOUNT;
if (scroll_offset > contents->height - available_height) {
scroll_offset = contents->height - available_height;
}
}
}
/**
* Desktop mode responsds to sig_usr2 by returning to
* the bottom of the Z-order stack.
@ -1231,9 +1249,23 @@ int main(int argc, char * argv[]) {
case YUTANI_MSG_KEY_EVENT:
{
struct yutani_msg_key_event * ke = (void*)m->data;
if (!is_desktop_background) {
if (ke->event.action == KEY_ACTION_DOWN && ke->event.keycode == 'q') {
_menu_action_exit(NULL);
if (ke->event.action == KEY_ACTION_DOWN) {
switch (ke->event.keycode) {
case KEY_PAGE_UP:
_scroll_up();
redraw = 1;
break;
case KEY_PAGE_DOWN:
_scroll_down();
redraw = 1;
break;
case 'q':
if (!is_desktop_background) {
_menu_action_exit(NULL);
}
break;
default:
break;
}
}
}
@ -1351,20 +1383,10 @@ int main(int argc, char * argv[]) {
me->command != YUTANI_MOUSE_EVENT_LEAVE) {
if (me->buttons & YUTANI_MOUSE_SCROLL_UP) {
/* Scroll up */
scroll_offset -= SCROLL_AMOUNT;
if (scroll_offset < 0) {
scroll_offset = 0;
}
_scroll_up();
redraw = 1;
} else if (me->buttons & YUTANI_MOUSE_SCROLL_DOWN) {
if (available_height > contents->height) {
scroll_offset = 0;
} else {
scroll_offset += SCROLL_AMOUNT;
if (scroll_offset > contents->height - available_height) {
scroll_offset = contents->height - available_height;
}
}
_scroll_down();
redraw = 1;
}

51
apps/package-manager.c
View File

@ -381,6 +381,24 @@ static void toggle_selected(int hilighted_offset, int modifiers) {
redraw_window();
}
static void _scroll_up(void) {
scroll_offset -= SCROLL_AMOUNT;
if (scroll_offset < 0) {
scroll_offset = 0;
}
}
static void _scroll_down(void) {
if (available_height > contents->height) {
scroll_offset = 0;
} else {
scroll_offset += SCROLL_AMOUNT;
if (scroll_offset > contents->height - available_height) {
scroll_offset = contents->height - available_height;
}
}
}
int main(int argc, char * argv[]) {
if (geteuid() != 0) {
@ -445,8 +463,22 @@ int main(int argc, char * argv[]) {
case YUTANI_MSG_KEY_EVENT:
{
struct yutani_msg_key_event * ke = (void*)m->data;
if (ke->event.action == KEY_ACTION_DOWN && ke->event.keycode == 'q') {
_menu_action_exit(NULL);
if (ke->event.action == KEY_ACTION_DOWN) {
switch (ke->event.keycode) {
case KEY_PAGE_UP:
_scroll_up();
redraw_window();
break;
case KEY_PAGE_DOWN:
_scroll_down();
redraw_window();
break;
case 'q':
_menu_action_exit(NULL);
break;
default:
break;
}
}
}
break;
@ -497,21 +529,10 @@ int main(int argc, char * argv[]) {
me->new_x > (int)(bounds.left_width) &&
me->new_x < (int)(main_window->width - bounds.right_width)) {
if (me->buttons & YUTANI_MOUSE_SCROLL_UP) {
/* Scroll up */
scroll_offset -= SCROLL_AMOUNT;
if (scroll_offset < 0) {
scroll_offset = 0;
}
_scroll_up();
redraw_window();
} else if (me->buttons & YUTANI_MOUSE_SCROLL_DOWN) {
if (available_height > contents->height) {
scroll_offset = 0;
} else {
scroll_offset += SCROLL_AMOUNT;
if (scroll_offset > contents->height - available_height) {
scroll_offset = contents->height - available_height;
}
}
_scroll_down();
redraw_window();
}