From 50dbf6b58135d0a00da44b976c6483fd3e3d0372 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Sun, 26 Apr 2015 20:07:17 +0200 Subject: [PATCH] Switch a few widgets to ui refresh modes More closely matches native behavior on REAGL devices. Closing those widgets should still trigger a partial refresh though, because we usually get back to the reader, and text, so we want REAGL ;). --- frontend/apps/opdscatalog/opdscatalog.lua | 2 +- frontend/apps/reader/modules/readerbookmark.lua | 2 +- frontend/apps/reader/modules/readercropping.lua | 2 +- frontend/apps/reader/modules/readerfooter.lua | 2 +- frontend/ui/widget/button.lua | 4 ++-- frontend/ui/widget/buttondialog.lua | 2 +- frontend/ui/widget/configdialog.lua | 6 +++--- frontend/ui/widget/confirmbox.lua | 2 +- frontend/ui/widget/dictquicklookup.lua | 2 +- frontend/ui/widget/iconbutton.lua | 4 ++-- frontend/ui/widget/infomessage.lua | 2 +- frontend/ui/widget/inputdialog.lua | 2 +- frontend/ui/widget/inputtext.lua | 2 +- frontend/ui/widget/linkbox.lua | 2 +- frontend/ui/widget/menu.lua | 4 ++-- frontend/ui/widget/notification.lua | 2 +- frontend/ui/widget/toggleswitch.lua | 2 +- frontend/ui/widget/touchmenu.lua | 8 ++++---- frontend/ui/widget/virtualkeyboard.lua | 1 + 19 files changed, 27 insertions(+), 26 deletions(-) diff --git a/frontend/apps/opdscatalog/opdscatalog.lua b/frontend/apps/opdscatalog/opdscatalog.lua index 6b7166b95..dec59d72b 100644 --- a/frontend/apps/opdscatalog/opdscatalog.lua +++ b/frontend/apps/opdscatalog/opdscatalog.lua @@ -66,7 +66,7 @@ end function OPDSCatalog:onShow() UIManager:setDirty(self, function() - return "partial", self[1].dimen + return "ui", self[1].dimen end) end diff --git a/frontend/apps/reader/modules/readerbookmark.lua b/frontend/apps/reader/modules/readerbookmark.lua index da9a8f20d..6ef0b3de8 100644 --- a/frontend/apps/reader/modules/readerbookmark.lua +++ b/frontend/apps/reader/modules/readerbookmark.lua @@ -133,7 +133,7 @@ function ReaderBookmark:onToggleBookmark() end self:toggleBookmark(pn_or_xp) self.view.dogear_visible = not self.view.dogear_visible - UIManager:setDirty(self.view.dialog, "partial") + UIManager:setDirty(self.view.dialog, "ui") return true end diff --git a/frontend/apps/reader/modules/readercropping.lua b/frontend/apps/reader/modules/readercropping.lua index 36c5e964e..5c87932cb 100644 --- a/frontend/apps/reader/modules/readercropping.lua +++ b/frontend/apps/reader/modules/readercropping.lua @@ -73,7 +73,7 @@ end function PageCropDialog:onShow() UIManager:setDirty(self, function() - return "partial", self[1].dimen:combine(self[2].dimen) + return "ui", self[1].dimen:combine(self[2].dimen) end) return true end diff --git a/frontend/apps/reader/modules/readerfooter.lua b/frontend/apps/reader/modules/readerfooter.lua index f1d39e231..a49399474 100644 --- a/frontend/apps/reader/modules/readerfooter.lua +++ b/frontend/apps/reader/modules/readerfooter.lua @@ -346,7 +346,7 @@ function ReaderFooter:onTapFooter(arg, ges) else self:updateFooterPos() end - UIManager:setDirty(self.view.dialog, "partial", self[1][1][1].dimen) + UIManager:setDirty(self.view.dialog, "ui", self[1][1][1].dimen) return true end diff --git a/frontend/ui/widget/button.lua b/frontend/ui/widget/button.lua index 08da966ff..0a6881980 100644 --- a/frontend/ui/widget/button.lua +++ b/frontend/ui/widget/button.lua @@ -168,14 +168,14 @@ function Button:onTapSelectButton() UIManager:scheduleIn(0.0, function() self[1].invert = true UIManager:setDirty(self.show_parent, function() - return "partial", self[1].dimen + return "ui", self[1].dimen end) end) UIManager:scheduleIn(0.1, function() self.callback() self[1].invert = false UIManager:setDirty(self.show_parent, function() - return "partial", self[1].dimen + return "ui", self[1].dimen end) end) elseif self.tap_input then diff --git a/frontend/ui/widget/buttondialog.lua b/frontend/ui/widget/buttondialog.lua index 02df4d6c1..0b08f8349 100644 --- a/frontend/ui/widget/buttondialog.lua +++ b/frontend/ui/widget/buttondialog.lua @@ -52,7 +52,7 @@ end function ButtonDialog:onShow() UIManager:setDirty(self, function() - return "partial", self[1][1].dimen + return "ui", self[1][1].dimen end) end diff --git a/frontend/ui/widget/configdialog.lua b/frontend/ui/widget/configdialog.lua index 3e25ab680..43ff4ad97 100644 --- a/frontend/ui/widget/configdialog.lua +++ b/frontend/ui/widget/configdialog.lua @@ -72,7 +72,7 @@ function OptionTextItem:onTapSelect() self.event, self.args, self.events, self.current_item) UIManager:setDirty(self.config, function() - return "partial", self[1].dimen + return "ui", self[1].dimen end) return true end @@ -127,7 +127,7 @@ function OptionIconItem:onTapSelect() self.event, self.args, self.events, self.current_item) UIManager:setDirty(self.config, function() - return "partial", self[1].dimen + return "ui", self[1].dimen end) return true end @@ -532,7 +532,7 @@ function ConfigDialog:onShowConfigPanel(index) local refresh_dimen = old_dimen and old_dimen:combine(self.dialog_frame.dimen) or self.dialog_frame.dimen - return "partial", refresh_dimen + return "ui", refresh_dimen end) return true end diff --git a/frontend/ui/widget/confirmbox.lua b/frontend/ui/widget/confirmbox.lua index df1589a2a..2ff70e6b0 100644 --- a/frontend/ui/widget/confirmbox.lua +++ b/frontend/ui/widget/confirmbox.lua @@ -91,7 +91,7 @@ end function ConfirmBox:onShow() UIManager:setDirty(self, function() - return "partial", self[1][1].dimen + return "ui", self[1][1].dimen end) end diff --git a/frontend/ui/widget/dictquicklookup.lua b/frontend/ui/widget/dictquicklookup.lua index 2ec2883ac..10471552f 100644 --- a/frontend/ui/widget/dictquicklookup.lua +++ b/frontend/ui/widget/dictquicklookup.lua @@ -276,7 +276,7 @@ end function DictQuickLookup:onShow() UIManager:setDirty(self, function() - return "partial", self.dict_frame.dimen + return "ui", self.dict_frame.dimen end) return true end diff --git a/frontend/ui/widget/iconbutton.lua b/frontend/ui/widget/iconbutton.lua index f67afb267..41ef0ed03 100644 --- a/frontend/ui/widget/iconbutton.lua +++ b/frontend/ui/widget/iconbutton.lua @@ -44,7 +44,7 @@ function IconButton:onTapClickButton() UIManager:scheduleIn(0.0, function() self.image.invert = true UIManager:setDirty(self.show_parent, function() - return "partial", self[1].dimen + return "ui", self[1].dimen end) end) -- make sure button reacts before doing callback @@ -52,7 +52,7 @@ function IconButton:onTapClickButton() self.callback() self.image.invert = false UIManager:setDirty(self.show_parent, function() - return "partial", self[1].dimen + return "ui", self[1].dimen end) end) return true diff --git a/frontend/ui/widget/infomessage.lua b/frontend/ui/widget/infomessage.lua index 21e722a30..6cfa628fc 100644 --- a/frontend/ui/widget/infomessage.lua +++ b/frontend/ui/widget/infomessage.lua @@ -88,7 +88,7 @@ end function InfoMessage:onShow() -- triggered by the UIManager after we got successfully shown (not yet painted) UIManager:setDirty(self, function() - return "partial", self[1][1].dimen + return "ui", self[1][1].dimen end) if self.timeout then UIManager:scheduleIn(self.timeout, function() UIManager:close(self) end) diff --git a/frontend/ui/widget/inputdialog.lua b/frontend/ui/widget/inputdialog.lua index a100773de..af2a03763 100644 --- a/frontend/ui/widget/inputdialog.lua +++ b/frontend/ui/widget/inputdialog.lua @@ -120,7 +120,7 @@ end function InputDialog:onShow() UIManager:setDirty(self, function() - return "partial", self.dialog_frame.dimen + return "ui", self.dialog_frame.dimen end) end diff --git a/frontend/ui/widget/inputtext.lua b/frontend/ui/widget/inputtext.lua index 1659a0453..6c8981abf 100644 --- a/frontend/ui/widget/inputtext.lua +++ b/frontend/ui/widget/inputtext.lua @@ -89,7 +89,7 @@ function InputText:initTextBox(text) self.dimen = self[1]:getSize() UIManager:setDirty(self.parent, function() - return "partial", self[1].dimen + return "ui", self[1].dimen end) end diff --git a/frontend/ui/widget/linkbox.lua b/frontend/ui/widget/linkbox.lua index 2c7fa0364..1b4c6829e 100644 --- a/frontend/ui/widget/linkbox.lua +++ b/frontend/ui/widget/linkbox.lua @@ -42,7 +42,7 @@ end function LinkBox:onShow() UIManager:setDirty(self, function() - return "partial", self.box + return "ui", self.box end) if self.timeout then UIManager:scheduleIn(self.timeout, function() diff --git a/frontend/ui/widget/menu.lua b/frontend/ui/widget/menu.lua index 5782e1d21..bad95012e 100644 --- a/frontend/ui/widget/menu.lua +++ b/frontend/ui/widget/menu.lua @@ -284,7 +284,7 @@ function MenuItem:onTapSelect(arg, ges) local pos = self:getGesPosition(ges) self[1].invert = true local refreshfunc = function() - return "partial", self[1].dimen + return "ui", self[1].dimen end UIManager:setDirty(self.show_parent, refreshfunc) UIManager:scheduleIn(0.1, function() @@ -299,7 +299,7 @@ function MenuItem:onHoldSelect(arg, ges) local pos = self:getGesPosition(ges) self[1].invert = true local refreshfunc = function() - return "partial", self[1].dimen + return "ui", self[1].dimen end UIManager:setDirty(self.show_parent, refreshfunc) UIManager:scheduleIn(0.1, function() diff --git a/frontend/ui/widget/notification.lua b/frontend/ui/widget/notification.lua index 4d5051268..d8db5dbed 100644 --- a/frontend/ui/widget/notification.lua +++ b/frontend/ui/widget/notification.lua @@ -65,7 +65,7 @@ end function Notification:onShow() -- triggered by the UIManager after we got successfully shown (not yet painted) UIManager:setDirty(self, function() - return "partial", self[1][1].dimen + return "ui", self[1][1].dimen end) if self.timeout then UIManager:scheduleIn(self.timeout, function() UIManager:close(self) end) diff --git a/frontend/ui/widget/toggleswitch.lua b/frontend/ui/widget/toggleswitch.lua index 675ebf49c..a573e4748 100644 --- a/frontend/ui/widget/toggleswitch.lua +++ b/frontend/ui/widget/toggleswitch.lua @@ -148,7 +148,7 @@ function ToggleSwitch:onTapSelect(arg, gev) self.config:onConfigChoose(self.values, self.name, self.event, self.args, self.events, self.position) UIManager:setDirty(self.config, function() - return "partial", self.dimen + return "ui", self.dimen end) return true end diff --git a/frontend/ui/widget/touchmenu.lua b/frontend/ui/widget/touchmenu.lua index 23db7850a..c9c3e24b3 100644 --- a/frontend/ui/widget/touchmenu.lua +++ b/frontend/ui/widget/touchmenu.lua @@ -98,7 +98,7 @@ function TouchMenuItem:onTapSelect(arg, ges) UIManager:scheduleIn(0.0, function() self.item_frame.invert = true UIManager:setDirty(self.show_parent, function() - return "partial", self.dimen + return "ui", self.dimen end) end) UIManager:scheduleIn(0.1, function() @@ -107,7 +107,7 @@ function TouchMenuItem:onTapSelect(arg, ges) UIManager:scheduleIn(0.5, function() self.item_frame.invert = false UIManager:setDirty(self.show_parent, function() - return "partial", self.dimen + return "ui", self.dimen end) end) return true @@ -123,7 +123,7 @@ function TouchMenuItem:onHoldSelect(arg, ges) UIManager:scheduleIn(0.0, function() self.item_frame.invert = true UIManager:setDirty(self.show_parent, function() - return "partial", self.dimen + return "ui", self.dimen end) end) UIManager:scheduleIn(0.1, function() @@ -132,7 +132,7 @@ function TouchMenuItem:onHoldSelect(arg, ges) UIManager:scheduleIn(0.5, function() self.item_frame.invert = false UIManager:setDirty(self.show_parent, function() - return "partial", self.dimen + return "ui", self.dimen end) end) return true diff --git a/frontend/ui/widget/virtualkeyboard.lua b/frontend/ui/widget/virtualkeyboard.lua index 55798e4fb..1384e07db 100644 --- a/frontend/ui/widget/virtualkeyboard.lua +++ b/frontend/ui/widget/virtualkeyboard.lua @@ -216,6 +216,7 @@ function VirtualKeyboard:init() end function VirtualKeyboard:_refresh() + -- TODO: Ideally, ui onShow & partial onClose UIManager:setDirty(self, function() return "partial", self[1][1].dimen end)