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

TouchMenu: properly truncate item text when too long (#4052)

Browse Source
This commit is contained in:
poire-z
2018-07-05 07:20:15 +02:00
committed by GitHub
parent 4ffd959df4
commit 9e4db559ab
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/ui/widget/touchmenu.lua
View File

@@ -19,6 +19,7 @@ local InfoMessage = require("ui/widget/infomessage")
local InputContainer = require("ui/widget/container/inputcontainer")
local LeftContainer = require("ui/widget/container/leftcontainer")
local LineWidget = require("ui/widget/linewidget")
local RenderText = require("ui/rendertext")
local RightContainer = require("ui/widget/container/rightcontainer")
local Size = require("ui/size")
local TextWidget = require("ui/widget/textwidget")
@@ -81,6 +82,14 @@ function TouchMenuItem:init()
local empty_widget = CheckMark:new{
checkable = false,
}
-- text_max_width should be the TouchMenuItem width minus the below
-- FrameContainer default paddings minus the checked widget width
local text_max_width = self.dimen.w - 2*Size.padding.default - checked_widget:getSize().w
local text = getMenuText(self.item)
if RenderText:sizeUtf8Text(0, Screen:getWidth(), self.face, text, true).x > text_max_width then
text = RenderText:truncateTextByWidth(text, self.face, text_max_width, true)
end
self.item_frame = FrameContainer:new{
width = self.dimen.w,
bordersize = 0,
@@ -96,7 +105,7 @@ function TouchMenuItem:init()
or empty_widget
},
TextWidget:new{
text = getMenuText(self.item),
text = text,
fgcolor = item_enabled ~= false and Blitbuffer.COLOR_BLACK or Blitbuffer.COLOR_GREY,
face = self.face,
},