mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2025-02-28 00:24:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bail out early if we get TOP or BOTTOM

Browse source
This commit is contained in:
Sebastian Ramacher 2013-11-29 17:08:01 +01:00
parent 6ee0f265a3
commit 6788776bae
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
shortcuts.c
View file

@ -491,6 +491,15 @@ sc_scroll(girara_session_t* session, girara_argument_t* argument,
return false; return false;
} }
/* if TOP or BOTTOM, go there and we are done */
if (argument->n == TOP) {
position_set(zathura, -1, 0);
return false;
} else if (argument->n == BOTTOM) {
position_set(zathura, -1, 1.0);
return false;
}
if (t == 0) { if (t == 0) {
t = 1; t = 1;
} }
@ -527,31 +536,21 @@ sc_scroll(girara_session_t* session, girara_argument_t* argument,
double pos_x = zathura_document_get_position_x(zathura->document); double pos_x = zathura_document_get_position_x(zathura->document);
double pos_y = zathura_document_get_position_y(zathura->document); double pos_y = zathura_document_get_position_y(zathura->document);
double page_id = zathura_document_get_current_page_number(zathura->document);
double direction = 1.0;
/* if TOP or BOTTOM, go there and we are done */ const unsigned int page_id = zathura_document_get_current_page_number(zathura->document);
if (argument->n == TOP) {
position_set(zathura, -1, 0);
return false;
} else if (argument->n == BOTTOM) {
position_set(zathura, -1, 1.0);
return false;
}
/* compute the direction of scrolling */ /* compute the direction of scrolling */
if ( (argument->n == LEFT) || (argument->n == FULL_LEFT) || (argument->n == HALF_LEFT) || double direction = 1.0;
if ((argument->n == LEFT) || (argument->n == FULL_LEFT) || (argument->n == HALF_LEFT) ||
(argument->n == UP) || (argument->n == FULL_UP) || (argument->n == HALF_UP)) { (argument->n == UP) || (argument->n == FULL_UP) || (argument->n == HALF_UP)) {
direction = -1.0; direction = -1.0;
} else {
direction = 1.0;
} }
const double vstep = (double)(cell_height + padding) / (double)doc_height; const double vstep = (double)(cell_height + padding) / (double)doc_height;
const double hstep = (double)(cell_width + padding) / (double)doc_width; const double hstep = (double)(cell_width + padding) / (double)doc_width;
/* compute new position */ /* compute new position */
switch(argument->n) { switch (argument->n) {
case FULL_UP: case FULL_UP:
case FULL_DOWN: case FULL_DOWN:
pos_y += direction * (1.0 - scroll_full_overlap) * vstep; pos_y += direction * (1.0 - scroll_full_overlap) * vstep;
@ -603,9 +602,9 @@ sc_scroll(girara_session_t* session, girara_argument_t* argument,
} }
/* snap to the border if we change page */ /* snap to the border if we change page */
double dummy; const unsigned int new_page_id = position_to_page_number(zathura->document, pos_x, pos_y);
unsigned int new_page_id = position_to_page_number(zathura->document, pos_x, pos_y);
if (scroll_page_aware == true && page_id != new_page_id) { if (scroll_page_aware == true && page_id != new_page_id) {
double dummy = 0.0;
switch(argument->n) { switch(argument->n) {
case FULL_LEFT: case FULL_LEFT:
case HALF_LEFT: case HALF_LEFT: