From c1b4085b93144e20c08830a2f29ca040edd3d218 Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Sun, 3 Mar 2019 08:57:20 +0100
Subject: [PATCH] [UX] Add cropping: none mapped to page width zoom (#4696)

Fixes #1923.
---
 frontend/apps/reader/modules/readercropping.lua | 5 +++++
 frontend/ui/data/koptoptions.lua                | 6 +++---
 frontend/ui/data/strings.lua                    | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/apps/reader/modules/readercropping.lua b/frontend/apps/reader/modules/readercropping.lua
index 64aa3e334..d6c8ccb79 100644
--- a/frontend/apps/reader/modules/readercropping.lua
+++ b/frontend/apps/reader/modules/readercropping.lua
@@ -85,6 +85,11 @@ function ReaderCropping:onPageCrop(mode)
             self:setCropZoomMode(true)
         end
         return
+    elseif mode == "none" then
+        if self.document.configurable.text_wrap ~= 1 then
+            self.ui:handleEvent(Event:new("SetZoomMode", "pagewidth", "cropping"))
+        end
+        return
     end
     -- backup original view dimen
     self.orig_view_dimen = Geom:new{w = self.view.dimen.w, h = self.view.dimen.h}
diff --git a/frontend/ui/data/koptoptions.lua b/frontend/ui/data/koptoptions.lua
index 7b88ac202..019d071e6 100644
--- a/frontend/ui/data/koptoptions.lua
+++ b/frontend/ui/data/koptoptions.lua
@@ -28,13 +28,13 @@ local KoptOptions = {
             {
                 name = "trim_page",
                 name_text = S.PAGE_CROP,
-                toggle = {S.MANUAL, S.AUTO, S.SEMIAUTO},
+                toggle = {S.MANUAL, S.AUTO, S.SEMIAUTO, S.NONE},
                 alternate = false,
-                values = {0, 1, 2},
+                values = {0, 1, 2, 3},
                 default_value = DKOPTREADER_CONFIG_TRIM_PAGE,
                 enabled_func = Device.isTouchDevice,
                 event = "PageCrop",
-                args = {"manual", "auto", "semi-auto"},
+                args = {"manual", "auto", "semi-auto", "none"},
                 name_text_hold_callback = optionsutil.showValues,
             }
         }
diff --git a/frontend/ui/data/strings.lua b/frontend/ui/data/strings.lua
index 65021d801..a733b13d7 100644
--- a/frontend/ui/data/strings.lua
+++ b/frontend/ui/data/strings.lua
@@ -40,6 +40,7 @@ S.OFF = _("off")
 S.AUTO = _("auto")
 S.MANUAL = _("manual")
 S.SEMIAUTO = _("semi-auto")
+S.NONE = _("none")
 S.SMALL = _("small")
 S.MEDIUM = _("medium")
 S.LARGE = _("large")