fix(readerfontlight): crash in toggle

pull/1828/head
Qingping Hou 8 years ago
parent 37a0765897
commit 4598284bbb

@ -93,7 +93,7 @@ function ReaderFrontLight:onShowFlDialog()
text = _("Toggle"), text = _("Toggle"),
enabled = true, enabled = true,
callback = function() callback = function()
self.fl_dialog.input:setText("") self.fl_dialog:setInputText("")
powerd:toggleFrontlight() powerd:toggleFrontlight()
end, end,
}, },

@ -57,7 +57,7 @@ function InputDialog:init()
width = self.width, width = self.width,
} }
} }
self.input_widget = InputText:new{ self._input_widget = InputText:new{
text = self.input, text = self.input,
hint = self.input_hint, hint = self.input_hint,
face = self.input_face, face = self.input_face,
@ -99,9 +99,9 @@ function InputDialog:init()
CenterContainer:new{ CenterContainer:new{
dimen = Geom:new{ dimen = Geom:new{
w = self.title_bar:getSize().w, w = self.title_bar:getSize().w,
h = self.input_widget:getSize().h, h = self._input_widget:getSize().h,
}, },
self.input_widget, self._input_widget,
}, },
-- buttons -- buttons
CenterContainer:new{ CenterContainer:new{
@ -117,12 +117,20 @@ function InputDialog:init()
self[1] = CenterContainer:new{ self[1] = CenterContainer:new{
dimen = Geom:new{ dimen = Geom:new{
w = Screen:getWidth(), w = Screen:getWidth(),
h = Screen:getHeight() - self.input_widget:getKeyboardDimen().h, h = Screen:getHeight() - self._input_widget:getKeyboardDimen().h,
}, },
self.dialog_frame, self.dialog_frame,
} }
end end
function InputDialog:getInputText()
return self._input_widget:getText()
end
function InputDialog:setInputText(text)
self._input_widget:setText(text)
end
function InputDialog:onShow() function InputDialog:onShow()
UIManager:setDirty(self, function() UIManager:setDirty(self, function()
return "ui", self.dialog_frame.dimen return "ui", self.dialog_frame.dimen
@ -136,15 +144,11 @@ function InputDialog:onCloseWidget()
end end
function InputDialog:onShowKeyboard() function InputDialog:onShowKeyboard()
self.input_widget:onShowKeyboard() self._input_widget:onShowKeyboard()
end
function InputDialog:getInputText()
return self.input_widget:getText()
end end
function InputDialog:onClose() function InputDialog:onClose()
self.input_widget:onCloseKeyboard() self._input_widget:onCloseKeyboard()
end end
return InputDialog return InputDialog

@ -31,7 +31,6 @@ local FrameContainer = require("ui/widget/container/framecontainer")
local AlphaContainer = require("ui/widget/container/alphacontainer") local AlphaContainer = require("ui/widget/container/alphacontainer")
local ConfirmBox = require("ui/widget/confirmbox") local ConfirmBox = require("ui/widget/confirmbox")
local TouchMenu = require("ui/widget/touchmenu") local TouchMenu = require("ui/widget/touchmenu")
local InputText = require("ui/widget/inputtext")
local DocumentRegistry = require("document/documentregistry") local DocumentRegistry = require("document/documentregistry")
local ReaderUI = require("apps/reader/readerui") local ReaderUI = require("apps/reader/readerui")
local DEBUG = require("dbg") local DEBUG = require("dbg")

Loading…
Cancel
Save