From 88f1866fc48f1d9afe68b468e63ca686d006b316 Mon Sep 17 00:00:00 2001 From: Moritz Lipp Date: Thu, 31 Jan 2013 08:01:14 +0100 Subject: [PATCH 1/2] Update README --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index ce65be2..3c447b9 100644 --- a/README +++ b/README @@ -6,6 +6,7 @@ girara user interface library and several document libraries. Requirements ------------ gtk2 (>= 2.28) +glib (>= 2.32) girara sqlite3 (>= 3.5.9) check (for tests) From ce6e7351ca350ac76a9533e3c33309d4112f2a6e Mon Sep 17 00:00:00 2001 From: Moritz Lipp Date: Thu, 7 Feb 2013 09:26:35 +0100 Subject: [PATCH 2/2] Respect padding in sc_adjust_window Thanks to Marwan Tanager --- shortcuts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shortcuts.c b/shortcuts.c index 9a33d22..44b790f 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -144,7 +144,7 @@ sc_adjust_window(girara_session_t* session, girara_argument_t* argument, if (argument->n == ZATHURA_ADJUST_WIDTH || (argument->n == ZATHURA_ADJUST_BESTFIT && page_ratio < window_ratio)) { 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); 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) { width -= requisition.width; 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); } }