Merge branch 'master' into develop

This commit is contained in:
Sebastian Ramacher 2013-02-08 10:45:41 +01:00
commit 74330c6459
2 changed files with 3 additions and 2 deletions

1
README
View file

@ -6,6 +6,7 @@ girara user interface library and several document libraries.
Requirements Requirements
------------ ------------
gtk2 (>= 2.28) gtk2 (>= 2.28)
glib (>= 2.32)
girara girara
sqlite3 (>= 3.5.9) sqlite3 (>= 3.5.9)
check (for tests) check (for tests)

View file

@ -144,7 +144,7 @@ sc_adjust_window(girara_session_t* session, girara_argument_t* argument,
if (argument->n == ZATHURA_ADJUST_WIDTH || if (argument->n == ZATHURA_ADJUST_WIDTH ||
(argument->n == ZATHURA_ADJUST_BESTFIT && page_ratio < window_ratio)) { (argument->n == ZATHURA_ADJUST_BESTFIT && page_ratio < window_ratio)) {
scale = (double)(width - (pages_per_row - 1) * padding) / scale = (double)(width - (pages_per_row - 1) * padding) /
(double)(pages_per_row * cell_width); (double)(pages_per_row * cell_width + (pages_per_row - 1) * padding);
zathura_document_set_scale(zathura->document, scale); zathura_document_set_scale(zathura->document, scale);
bool show_scrollbars = false; bool show_scrollbars = false;
@ -165,7 +165,7 @@ sc_adjust_window(girara_session_t* session, girara_argument_t* argument,
if (0 < requisition.width && (unsigned)requisition.width < width) { if (0 < requisition.width && (unsigned)requisition.width < width) {
width -= requisition.width; width -= requisition.width;
scale = (double)(width - (pages_per_row - 1) * padding) / scale = (double)(width - (pages_per_row - 1) * padding) /
(double)(pages_per_row * cell_width); (double)(pages_per_row * cell_width + (pages_per_row - 1) * padding);
zathura_document_set_scale(zathura->document, scale); zathura_document_set_scale(zathura->document, scale);
} }
} }