From 82b458102a24ecfd8f243f82d06501f0d0a0e4ed Mon Sep 17 00:00:00 2001
From: chrox <chrox.huang@gmail.com>
Date: Thu, 24 Jul 2014 22:10:28 +0800
Subject: [PATCH] swipe east/west to switch dictionary in dict quick lookup
 window

---
 frontend/ui/widget/dictquicklookup.lua  | 10 ++++++++++
 frontend/ui/widget/scrolltextwidget.lua |  7 +++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/frontend/ui/widget/dictquicklookup.lua b/frontend/ui/widget/dictquicklookup.lua
index bf03a7111..d184ea4ed 100644
--- a/frontend/ui/widget/dictquicklookup.lua
+++ b/frontend/ui/widget/dictquicklookup.lua
@@ -239,6 +239,7 @@ function DictQuickLookup:changeToNextDict()
 end
 
 function DictQuickLookup:changeDictionary(index)
+    if not self.results[index] then return end
     self.dict_index = index
     self.dictionary = self.results[index].dict
     self.lookupword = self.results[index].word
@@ -306,4 +307,13 @@ function DictQuickLookup:onClose()
     return true
 end
 
+function DictQuickLookup:onSwipe(arg, ges)
+    if ges.direction == "west" then
+        self:changeToNextDict()
+    elseif ges.direction == "east" then
+        self:changeToPrevDict()
+    end
+    return true
+end
+
 return DictQuickLookup
diff --git a/frontend/ui/widget/scrolltextwidget.lua b/frontend/ui/widget/scrolltextwidget.lua
index bdb45fbb4..43effb72e 100644
--- a/frontend/ui/widget/scrolltextwidget.lua
+++ b/frontend/ui/widget/scrolltextwidget.lua
@@ -50,10 +50,10 @@ function ScrollTextWidget:init()
     self.dimen = Geom:new(self[1]:getSize())
     if Device:isTouchDevice() then
         self.ges_events = {
-            Swipe = {
+            ScrollText = {
                 GestureRange:new{
                     ges = "swipe",
-                    range = self.dimen,
+                    range = function() return self.dimen end,
                 },
             },
         }
@@ -70,7 +70,7 @@ function ScrollTextWidget:updateScrollBar(text)
     )
 end
 
-function ScrollTextWidget:onSwipe(arg, ges)
+function ScrollTextWidget:onScrollText(arg, ges)
     if ges.direction == "north" then
         self.text_widget:scrollDown()
         self:updateScrollBar(self.text_widget)
@@ -79,7 +79,6 @@ function ScrollTextWidget:onSwipe(arg, ges)
         self:updateScrollBar(self.text_widget)
     end
     UIManager:setDirty(self.dialog, "partial")
-    return true
 end
 
 return ScrollTextWidget