From 529cb801c1ce7c428a219a6a91ea589df9576c74 Mon Sep 17 00:00:00 2001 From: chrox Date: Sun, 21 Feb 2016 23:30:06 +0800 Subject: [PATCH] fix broken extended InputDialog components eg. LoginDialog and MultiInputDialog since the style refactoring in #1783. --- frontend/ui/widget/logindialog.lua | 14 +++++++------- frontend/ui/widget/multiinputdialog.lua | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/frontend/ui/widget/logindialog.lua b/frontend/ui/widget/logindialog.lua index 371cba5cc..d49a9825a 100644 --- a/frontend/ui/widget/logindialog.lua +++ b/frontend/ui/widget/logindialog.lua @@ -77,12 +77,12 @@ function LoginDialog:init() } } - self.input = self.input_username + self._input_widget = self.input_username self[1] = CenterContainer:new{ dimen = Geom:new{ w = Screen:getWidth(), - h = Screen:getHeight() - self.input:getKeyboardDimen().h, + h = Screen:getHeight() - self._input_widget:getKeyboardDimen().h, }, self.dialog_frame, } @@ -96,13 +96,13 @@ end function LoginDialog:onSwitchFocus(inputbox) -- unfocus current inputbox - self.input:unfocus() - self.input:onCloseKeyboard() + self._input_widget:unfocus() + self._input_widget:onCloseKeyboard() -- focus new inputbox - self.input = inputbox - self.input:focus() - self.input:onShowKeyboard() + self._input_widget = inputbox + self._input_widget:focus() + self._input_widget:onShowKeyboard() UIManager:show(self) end diff --git a/frontend/ui/widget/multiinputdialog.lua b/frontend/ui/widget/multiinputdialog.lua index b8c1069d3..eb479d0c0 100644 --- a/frontend/ui/widget/multiinputdialog.lua +++ b/frontend/ui/widget/multiinputdialog.lua @@ -67,12 +67,12 @@ function MultiInputDialog:init() VerticalGroupData, } - self.input = input_field[1] + self._input_widget = input_field[1] self[1] = CenterContainer:new{ dimen = Geom:new{ w = Screen:getWidth(), - h = Screen:getHeight() - self.input:getKeyboardDimen().h, + h = Screen:getHeight() - self._input_widget:getKeyboardDimen().h, }, self.dialog_frame, } @@ -89,13 +89,13 @@ end function MultiInputDialog:onSwitchFocus(inputbox) -- unfocus current inputbox - self.input:unfocus() - self.input:onCloseKeyboard() + self._input_widget:unfocus() + self._input_widget:onCloseKeyboard() -- focus new inputbox - self.input = inputbox - self.input:focus() - self.input:onShowKeyboard() + self._input_widget = inputbox + self._input_widget:focus() + self._input_widget:onShowKeyboard() UIManager:show(self) end