[fix] Gesture manager: check multiswipe defaults (#4623)

Pointed out by @poire-z

Also add default previous location action for left, right.
pull/4626/head
Frans de Jonge 5 years ago committed by GitHub
parent 5495c5d108
commit 13d4ead330
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -13,7 +13,7 @@ local default_gesture = {
tap_right_bottom_corner = "nothing",
tap_left_bottom_corner = Device:hasFrontlight() and "toggle_frontlight" or "nothing",
short_diagonal_swipe = "full_refresh",
multiswipe = "nothing",
multiswipe_west_east = "previous_location",
}
local ReaderGesture = InputContainer:new{
@ -108,6 +108,11 @@ function ReaderGesture:buildMenu(ges, default)
if entry[2] == default then
local menu_entry_default = T(_("%1 (default)"), entry[1])
table.insert(return_menu, self:createSubMenu(menu_entry_default, entry[2], ges, true))
if not gesture_manager[ges] then
gesture_manager[ges] = default
G_reader_settings:saveSetting(self.ges_mode, gesture_manager)
end
break
end
end
@ -147,10 +152,11 @@ function ReaderGesture:buildMultiswipeMenu()
for i=1, #multiswipes do
local multiswipe = multiswipes[i]
local friendly_multiswipe_name = self:friendlyMultiswipeName(multiswipe)
local safe_multiswipe_name = self:safeMultiswipeName(multiswipe)
local safe_multiswipe_name = "multiswipe_"..self:safeMultiswipeName(multiswipe)
local default_action = default_gesture[safe_multiswipe_name] and default_gesture[safe_multiswipe_name] or "nothing"
table.insert(menu, {
text = friendly_multiswipe_name,
sub_item_table = self:buildMenu("multiswipe_"..safe_multiswipe_name, default_gesture["nothing"]),
sub_item_table = self:buildMenu(safe_multiswipe_name, default_action),
})
end

Loading…
Cancel
Save