This wasn't correct. Padding is already accounted for:

  scale = (width - (pages_per_row - 1) * padding) /
          (pages_per_row * cell_width)

If you add padding on the denominator, you end up with black margins on
the sides of the window, which isn't what padding is for (i.e. insert a
gap between rendered pages), and defeats the purpose of a "best-fit".
---
 shortcuts.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shortcuts.c b/shortcuts.c
index 394239d..75e1ac6 100644
--- a/shortcuts.c
+++ b/shortcuts.c
@@ -143,7 +143,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 + (pages_per_row - 1) * 
padding);
+            (double)(pages_per_row * cell_width);
     zathura_document_set_scale(zathura->document, scale);
 
     bool show_scrollbars = false;
@@ -164,7 +164,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 + (pages_per_row - 1) 
* padding);
+                    (double)(pages_per_row * cell_width);
             zathura_document_set_scale(zathura->document, scale);
           }
         }
-- 
1.7.10.4

_______________________________________________
zathura mailing list
zathura@lists.pwmt.org
http://lists.pwmt.org/mailman/listinfo/zathura

Reply via email to