From be7d6008d1866488acb7c53f7fafb9e85bf00ebc Mon Sep 17 00:00:00 2001 From: hius07 <62179190+hius07@users.noreply.github.com> Date: Thu, 13 Apr 2023 21:43:04 +0300 Subject: [PATCH] Reader: do not apply line spacing out of range (#10307) * readercoptlistener: fix line spacing out of range * readerkoptlistener: fix line spacing out of range * creoptions: fix line spacing limit --- frontend/apps/reader/modules/readercoptlistener.lua | 4 ++-- frontend/apps/reader/modules/readerkoptlistener.lua | 4 ++-- frontend/ui/data/creoptions.lua | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/apps/reader/modules/readercoptlistener.lua b/frontend/apps/reader/modules/readercoptlistener.lua index 04f80a549..a0ac59a1f 100644 --- a/frontend/apps/reader/modules/readercoptlistener.lua +++ b/frontend/apps/reader/modules/readercoptlistener.lua @@ -69,9 +69,9 @@ function ReaderCoptListener:onReadSettings(config) end function ReaderCoptListener:onConfigChange(option_name, option_value) - -- font_size is historically and sadly shared by both mupdf and cre reader modules, + -- font_size and line_spacing are historically and sadly shared by both mupdf and cre reader modules, -- but fortunately they can be distinguished by their different ranges - if option_name == "font_size" and option_value < 5 then return end + if (option_name == "font_size" or option_name == "line_spacing") and option_value < 5 then return end self.document.configurable[option_name] = option_value self.ui:handleEvent(Event:new("StartActivityIndicator")) return true diff --git a/frontend/apps/reader/modules/readerkoptlistener.lua b/frontend/apps/reader/modules/readerkoptlistener.lua index 7c4c6ed27..935ea4623 100644 --- a/frontend/apps/reader/modules/readerkoptlistener.lua +++ b/frontend/apps/reader/modules/readerkoptlistener.lua @@ -72,9 +72,9 @@ function ReaderKoptListener:onDocLangUpdate(lang) end function ReaderKoptListener:onConfigChange(option_name, option_value) - -- font_size is historically and sadly shared by both mupdf and cre reader modules, + -- font_size and line_spacing are historically and sadly shared by both mupdf and cre reader modules, -- but fortunately they can be distinguished by their different ranges - if option_name == "font_size" and option_value > 5 then return end + if (option_name == "font_size" or option_name == "line_spacing") and option_value > 5 then return end self.document.configurable[option_name] = option_value self.ui:handleEvent(Event:new("StartActivityIndicator")) UIManager:setDirty("all", "partial") diff --git a/frontend/ui/data/creoptions.lua b/frontend/ui/data/creoptions.lua index 6edbf1873..57db4b937 100644 --- a/frontend/ui/data/creoptions.lua +++ b/frontend/ui/data/creoptions.lua @@ -387,7 +387,7 @@ Note that your selected font size is not affected by this setting.]]), more_options = true, more_options_param = { value_min = 50, - value_max = 300, + value_max = 200, value_step = 1, value_hold_step = 5, unit = "%",