Archives/koreader
2
0
Fork 0
mirror of https://github.com/koreader/koreader synced 2024-11-11 19:11:14 +00:00
Code Issues Projects Releases Wiki Activity

[UX] Gesture manager: add action - toggle reflow (#4688)

Browse Source 
Cf. https://github.com/koreader/koreader/issues/4687
This commit is contained in:
Frans de Jonge 2019-03-01 10:38:29 +01:00 committed by GitHub
parent 97c6c1244f
commit 332fa642e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/apps/reader/modules/readergesture.lua
View File

@ -45,6 +45,7 @@ local action_strings = {
toggle_frontlight = _("Toggle frontlight"), toggle_frontlight = _("Toggle frontlight"),
toggle_gsensor = _("Toggle accelerometer"), toggle_gsensor = _("Toggle accelerometer"),
toggle_rotation = _("Toggle rotation"), toggle_rotation = _("Toggle rotation"),
toggle_reflow = _("Toggle reflow"),
zoom_contentwidth = _("Zoom to fit content width"), zoom_contentwidth = _("Zoom to fit content width"),
zoom_contentheight = _("Zoom to fit content height"), zoom_contentheight = _("Zoom to fit content height"),
@ -101,6 +102,7 @@ function ReaderGesture:init()
multiswipe_north_west = self.ges_mode == "gesture_fm" and "folder_up" or "bookmarks", multiswipe_north_west = self.ges_mode == "gesture_fm" and "folder_up" or "bookmarks",
multiswipe_east_north = "history", multiswipe_east_north = "history",
multiswipe_south_north = "skim", multiswipe_south_north = "skim",
multiswipe_south_east = "toggle_reflow",
multiswipe_south_west = "show_frontlight_dialog", multiswipe_south_west = "show_frontlight_dialog",
multiswipe_west_south = "back", multiswipe_west_south = "back",
multiswipe_west_east_west = "open_previous_document", multiswipe_west_east_west = "open_previous_document",
@ -267,6 +269,7 @@ function ReaderGesture:buildMenu(ges, default)
{"toggle_frontlight", Device:hasFrontlight()}, {"toggle_frontlight", Device:hasFrontlight()},
{"toggle_gsensor", Device:canToggleGSensor()}, {"toggle_gsensor", Device:canToggleGSensor()},
{"toggle_rotation", not self.is_docless, true}, {"toggle_rotation", not self.is_docless, true},
{"toggle_reflow", not self.is_docless, true},
{"zoom_contentwidth", not self.is_docless}, {"zoom_contentwidth", not self.is_docless},
{"zoom_contentheight", not self.is_docless}, {"zoom_contentheight", not self.is_docless},
@ -550,6 +553,16 @@ function ReaderGesture:gestureAction(action)
G_reader_settings:flipNilOrFalse("input_ignore_gsensor") G_reader_settings:flipNilOrFalse("input_ignore_gsensor")
Device:toggleGSensor() Device:toggleGSensor()
self:onGSensorToggle() self:onGSensorToggle()
elseif action == "toggle_reflow" then
if not self.document.info.has_pages then return end
if self.document.configurable.text_wrap == 1 then
self.document.configurable.text_wrap = 0
else
self.document.configurable.text_wrap = 1
end
self.ui:handleEvent(Event:new("RedrawCurrentPage"))
self.ui:handleEvent(Event:new("RestoreZoomMode"))
self.ui:handleEvent(Event:new("InitScrollPageStates"))
elseif action == "toggle_rotation" then elseif action == "toggle_rotation" then
if Screen:getScreenMode() == "portrait" then if Screen:getScreenMode() == "portrait" then
self.ui:handleEvent(Event:new("SetScreenMode", "landscape")) self.ui:handleEvent(Event:new("SetScreenMode", "landscape"))