ReaderZooming tweaks (#7968)

* ReaderZooming tweaks

Re #7964 & #7962

* Fix oversight in setNumberOf

Co-authored-by: yparitcher <y@paritcher.com>

frontend/apps/reader/modules/readerzooming.lua

@@ -371,11 +371,12 @@ function ReaderZooming:onDefineZoom(btn, when_applied_callback)
     if zoom_mode == "columns" or zoom_mode == "rows" then
         if btn ~= "columns" and btn ~= "rows" then
             self.ui:handleEvent(Event:new("SetZoomPan", settings, true))
-            settings.kopt_zoom_factor = self:setNumberOf(
+            config.zoom_factor = self:setNumberOf(
                 zoom_mode,
                 zoom_range_number,
                 zoom_mode == "columns" and settings.zoom_overlap_h or settings.zoom_overlap_v
             )
+            settings.kopt_zoom_factor = config.zoom_factor
         end
     elseif zoom_mode == "manual" then
         if btn == "manual" then
@@ -658,7 +659,7 @@ function ReaderZooming:setNumberOf(what, num, overlap)
         zoom_factor = zoom_factor * zoom_h / zoom_w
     end
     self.ui:handleEvent(Event:new("SetZoomPan", {kopt_zoom_factor = zoom_factor}))
-    self.ui:handleEvent(Event:new("RedrawCurrentPage"))
+    return zoom_factor
 end
 
 function ReaderZooming:_zoomFactorChange(title_text, direction, precision)
@@ -704,6 +705,11 @@ function ReaderZooming:onSetZoomPan(settings, no_redraw)
     for k, v in pairs(settings) do
         self[k] = v
         self.ui.doc_settings:saveSetting(k, v)
+        -- Configurable keys aren't prefixed...
+        local configurable_key = k:gsub("^kopt_", "")
+        if self.ui.document.configurable[configurable_key] then
+            self.ui.document.configurable[configurable_key] = v
+        end
     end
     if not no_redraw then
         self.ui:handleEvent(Event:new("RedrawCurrentPage"))

resources/icons/mdlight/direction.LRBT.svg

@@ -17,7 +17,7 @@
    stroke-linejoin="round"
    xml:space="preserve"
    id="svg84"
-   sodipodi:docname="direction.LRBT.svg"
+   sodipodi:docname="direction.RLBT.svg"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"><defs
@@ -80,7 +80,7 @@
    inkscape:transform-center-y="17.638865"
    style="stroke-width:158.75"><g
      id="g30314"
-     transform="rotate(-90,2087.9383,1812.396)"><path
+     transform="matrix(0,-1,-1,0,3900.3344,3900.3343)"><path
        style="fill:none;stroke:#000000;stroke-width:158.75;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1"
        d="m 976.68856,939.271 2e-4,2063.7498"
        id="path899"

resources/icons/mdlight/direction.RLBT.svg

@@ -17,7 +17,7 @@
    stroke-linejoin="round"
    xml:space="preserve"
    id="svg84"
-   sodipodi:docname="direction.RLBT.svg"
+   sodipodi:docname="direction.LRBT.svg"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"><defs
@@ -80,7 +80,7 @@
    inkscape:transform-center-y="17.638865"
    style="stroke-width:158.75"><g
      id="g30314"
-     transform="matrix(0,-1,-1,0,3900.3344,3900.3343)"><path
+     transform="rotate(-90,2087.9383,1812.396)"><path
        style="fill:none;stroke:#000000;stroke-width:158.75;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1"
        d="m 976.68856,939.271 2e-4,2063.7498"
        id="path899"