From 6220d05a349f50065a5aade9738825e2b3732d40 Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 8 Jul 2018 00:45:27 +0200 Subject: [PATCH] Fix focus/unfocus in MultiInputDialog (#4060) Also fix size of window DCREREADER_CONFIG_FONT_SIZE in Advanced settings --- frontend/apps/filemanager/filemanagersetdefaults.lua | 2 ++ frontend/ui/widget/multiinputdialog.lua | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/frontend/apps/filemanager/filemanagersetdefaults.lua b/frontend/apps/filemanager/filemanagersetdefaults.lua index c5d881702..1f14c4182 100644 --- a/frontend/apps/filemanager/filemanagersetdefaults.lua +++ b/frontend/apps/filemanager/filemanagersetdefaults.lua @@ -173,6 +173,8 @@ function SetDefaults:init() table.insert(fields, { text = tostring(k) .. " = " .. tostring(v), hint = "", + padding = Screen:scaleBySize(2), + margin = Screen:scaleBySize(2), }) end self.set_dialog = MultiInputDialog:new{ diff --git a/frontend/ui/widget/multiinputdialog.lua b/frontend/ui/widget/multiinputdialog.lua index 5433d2df7..8bd0e310c 100644 --- a/frontend/ui/widget/multiinputdialog.lua +++ b/frontend/ui/widget/multiinputdialog.lua @@ -47,6 +47,8 @@ function MultiInputDialog:init() focused = k == 1 and true or false, scroll = false, parent = self, + padding = field.padding or nil, + margin = field.margin or nil, } if Device:hasKeys() then --little hack to piggyback on the layout of the button_table to handle the new InputText @@ -134,6 +136,9 @@ function MultiInputDialog:onSwitchFocus(inputbox) -- unfocus current inputbox self._input_widget:unfocus() self._input_widget:onCloseKeyboard() + UIManager:setDirty(nil, function() + return "ui", self.dialog_frame.dimen + end) -- focus new inputbox self._input_widget = inputbox