mirror of
https://github.com/koreader/koreader
synced 2024-11-10 01:10:34 +00:00
f05e62c1fb
Lots of code was doing some renderText calls to get the size of some text string, and truncate it to some width if needed, with or without an added ellipsis, before instantiating a TextWidget with that tweaked text string. This PR fixes/adds some properties and methods to TextWidget so all that can be done by it. It makes the calling code simpler, as they don't need to use RenderText directly. (Additionally, when we go at using Harfbuzz for text rendering, we'll just have to update or replace textwidget.lua without the need to update any higher level code.) Also: - RenderText: removed the space added by truncateTextByWidth after the ellipsis, as it doesn't feel needed, and break right alignment of the ellipsis with other texts. - KeyValuePage: fix some subtle size and alignment issues. - NumberPickerWidget: fix font size (provided font size was not used)
26 lines
575 B
Lua
26 lines
575 B
Lua
local TextWidget = require("ui/widget/textwidget")
|
|
local Geom = require("ui/geometry")
|
|
|
|
--[[
|
|
FixedTextWidget
|
|
--]]
|
|
local FixedTextWidget = TextWidget:new{}
|
|
|
|
function FixedTextWidget:updateSize()
|
|
TextWidget.updateSize(self)
|
|
-- Only difference from TextWidget:
|
|
-- no vertical padding, baseline is height
|
|
self._height = self.face.size
|
|
self._baseline_h = self.face.size
|
|
end
|
|
|
|
function FixedTextWidget:getSize()
|
|
self:updateSize()
|
|
if self._length == 0 then
|
|
return Geom:new{}
|
|
end
|
|
return TextWidget.getSize(self)
|
|
end
|
|
|
|
return FixedTextWidget
|