From b8ce85d3de8cd3eab4ee2d85a6b6651f33621b8b Mon Sep 17 00:00:00 2001 From: chrox Date: Tue, 10 Jun 2014 21:13:21 +0800 Subject: [PATCH] use two finger swipe west/east to close TOC and bookmark respectively --- frontend/apps/reader/modules/readerbookmark.lua | 14 +++++++++++++- frontend/apps/reader/modules/readertoc.lua | 12 ++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/frontend/apps/reader/modules/readerbookmark.lua b/frontend/apps/reader/modules/readerbookmark.lua index a05439caa..8d471516d 100644 --- a/frontend/apps/reader/modules/readerbookmark.lua +++ b/frontend/apps/reader/modules/readerbookmark.lua @@ -101,8 +101,18 @@ function ReaderBookmark:onShowBookmark() item_table = self.bookmarks, width = Screen:getWidth(), height = Screen:getHeight(), - show_parent = menu_container, is_borderless = true, + on_close_ges = { + GestureRange:new{ + ges = "two_finger_swipe", + range = Geom:new{ + x = 0, y = 0, + w = Screen:getWidth(), + h = Screen:getHeight(), + }, + direction = "east" + } + } } local menu_container = CenterContainer:new{ @@ -130,6 +140,8 @@ function ReaderBookmark:onShowBookmark() UIManager:close(menu_container) end + bm_menu.show_parent = menu_container + UIManager:show(menu_container) return true end diff --git a/frontend/apps/reader/modules/readertoc.lua b/frontend/apps/reader/modules/readertoc.lua index fe12c08fe..a30f0f868 100644 --- a/frontend/apps/reader/modules/readertoc.lua +++ b/frontend/apps/reader/modules/readertoc.lua @@ -7,6 +7,7 @@ local Screen = require("ui/screen") local Device = require("ui/device") local UIManager = require("ui/uimanager") local Event = require("ui/event") +local DEBUG = require("dbg") local _ = require("gettext") local ReaderToc = InputContainer:new{ @@ -125,6 +126,17 @@ function ReaderToc:onShowToc() width = Screen:getWidth(), height = Screen:getHeight(), is_borderless = true, + on_close_ges = { + GestureRange:new{ + ges = "two_finger_swipe", + range = Geom:new{ + x = 0, y = 0, + w = Screen:getWidth(), + h = Screen:getHeight(), + }, + direction = "west" + } + } } local menu_container = CenterContainer:new{