diff --git a/defaults.lua b/defaults.lua index 4172ac7cf..26ec2f5c0 100644 --- a/defaults.lua +++ b/defaults.lua @@ -98,6 +98,11 @@ DCREREADER_CONFIG_MARGIN_SIZES_SMALL = {5, 10, 5, 10} DCREREADER_CONFIG_MARGIN_SIZES_MEDIUM = {10, 15, 10, 15} DCREREADER_CONFIG_MARGIN_SIZES_LARGE = {20, 20, 20, 20} +-- crereader progress bar +-- 0 for top "full" progress bar +-- 1 for bottom "mini" progress bar +DCREREADER_PROGRESS_BAR = 1 + -- gesture detector defaults DGESDETECT_DISABLE_DOUBLE_TAP = true diff --git a/frontend/ui/data/creoptions.lua b/frontend/ui/data/creoptions.lua index ab2f592fe..adbfbf1fd 100644 --- a/frontend/ui/data/creoptions.lua +++ b/frontend/ui/data/creoptions.lua @@ -126,9 +126,9 @@ local CreOptions = { name_text = S.PROGRESS_BAR, toggle = {S.FULL, S.MINI}, values = {0, 1}, - default_value = 0, + default_value = DCREREADER_PROGRESS_BAR, args = {0, 1}, - default_arg = 0, + default_arg = DCREREADER_PROGRESS_BAR, event = "SetStatusLine", }, { diff --git a/frontend/ui/reader/readercoptlistener.lua b/frontend/ui/reader/readercoptlistener.lua index 802914c2f..8e8bf894d 100644 --- a/frontend/ui/reader/readercoptlistener.lua +++ b/frontend/ui/reader/readercoptlistener.lua @@ -21,7 +21,7 @@ function ReaderCoptListener:onReadSettings(config) end) end - local status_line = config:readSetting("copt_status_line") or 0 + local status_line = config:readSetting("copt_status_line") or DCREREADER_PROGRESS_BAR self.document:setStatusLineProp(status_line) end diff --git a/frontend/ui/reader/readerfooter.lua b/frontend/ui/reader/readerfooter.lua index a03608ac7..a808f8097 100644 --- a/frontend/ui/reader/readerfooter.lua +++ b/frontend/ui/reader/readerfooter.lua @@ -126,7 +126,7 @@ function ReaderFooter:onTapFooter(arg, ges) end UIManager:setDirty(self.view.dialog, "partial") -- consume this tap when footer is visible - if self.visible then + if self.view.footer_visible then return true end end