renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

InputText: fix hold handling, add clipboard empty hint (#8091)

Browse Source 
Before: when holding the input box in input dialogs
for calling the Clipboard, hold release was passed to
MovableContainer and input dialog moved a little bit.
This commit is contained in:
hius07
2021-08-17 16:24:44 +03:00
committed by GitHub
parent a8b39c17ed
commit b875ccc6f9
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
frontend/ui/widget/inputtext.lua
View File

@@ -83,6 +83,12 @@ if Device:isTouchDevice() or Device:hasDPad() then
range = function() return self.dimen end
}
},
HoldReleaseTextBox = {
GestureRange:new{
ges = "hold_release",
range = function() return self.dimen end
}
},
SwipeTextBox = {
GestureRange:new{
ges = "swipe",
@@ -95,9 +101,6 @@ if Device:isTouchDevice() or Device:hasDPad() then
-- HoldPanTextBox = {
-- GestureRange:new{ ges = "hold_pan", range = self.dimen }
-- },
-- HoldReleaseTextBox = {
-- GestureRange:new{ ges = "hold_release", range = self.dimen }
-- },
-- PanTextBox = {
-- GestureRange:new{ ges = "pan", range = self.dimen }
-- },
@@ -144,6 +147,7 @@ if Device:isTouchDevice() or Device:hasDPad() then
self.parent:onSwitchFocus(self)
end
-- clipboard dialog
self._hold_handled = nil
if Device:hasClipboard() then
if self.do_select then -- select mode on
if self.selection_start_pos then -- select end
@@ -168,10 +172,12 @@ if Device:isTouchDevice() or Device:hasDPad() then
end
end
local clipboard_value = Device.input.getClipboardText()
local is_clipboard_empty = clipboard_value == nil or clipboard_value == ""
local clipboard_dialog
clipboard_dialog = require("ui/widget/textviewer"):new{
title = (clipboard_value == nil or clipboard_value == "") and _("Clipboard (empty)") or _("Clipboard"),
text = clipboard_value,
title = _("Clipboard"),
text = is_clipboard_empty and _("(empty)") or clipboard_value,
fgcolor = is_clipboard_empty and Blitbuffer.COLOR_DARK_GRAY or Blitbuffer.COLOR_BLACK,
width = math.floor(Screen:getWidth() * 0.8),
height = math.floor(Screen:getHeight() * 0.4),
justified = false,
@@ -231,7 +237,7 @@ if Device:isTouchDevice() or Device:hasDPad() then
{
text = _("Paste"),
callback = function()
if clipboard_value ~= nil and clipboard_value ~= "" then
if not is_clipboard_empty then
UIManager:close(clipboard_dialog)
self:addChars(clipboard_value)
end
@@ -242,9 +248,18 @@ if Device:isTouchDevice() or Device:hasDPad() then
}
UIManager:show(clipboard_dialog)
end
self._hold_handled = true
return true
end
function InputText:onHoldReleaseTextBox(arg, ges)
if self._hold_handled then
self._hold_handled = nil
return true
end
return false
end
function InputText:onSwipeTextBox(arg, ges)
-- Allow refreshing the widget (actually, the screen) with the classic
-- Diagonal Swipe, as we're only using the quick "ui" mode while editing

2
frontend/ui/widget/textviewer.lua
View File

@@ -54,6 +54,7 @@ local TextViewer = InputContainer:new{
title_face = Font:getFace("x_smalltfont"),
text_face = Font:getFace("x_smallinfofont"),
fgcolor = Blitbuffer.COLOR_BLACK,
title_padding = Size.padding.default,
title_margin = Size.margin.title,
text_padding = Size.padding.large,
@@ -167,6 +168,7 @@ function TextViewer:init()
self.scroll_text_w = ScrollTextWidget:new{
text = self.text,
face = self.text_face,
fgcolor = self.fgcolor,
width = self.width - 2*self.text_padding - 2*self.text_margin,
height = textw_height - 2*self.text_padding -2*self.text_margin,
dialog = self,