mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +00:00
Bookmarks, CoverBrowser: scale dogear icon (#4081)
The Dogear icon is 20x20 pixels and was never scaled where used. Now: - The bookmark icon (top right of screen) is scaled to 1/32th of the screen width (previously, it was 1/30th on a 600px wide emulator, 1/53th on a GloHD). On CreDocument, furthermore decrease its size if needed depending on the selected margins so it never overwrite the text. - CoverBrowser list view: scale it to the available room under the "N % of P page" text, so it does not cover "page". - CoverBrowser mosaic view: scale it to 1/16th of the cover rectangle, which should prevent if from overwritting the text thanks to a max text width of 7/8 of the cover rectangle. Also for CoverBrowser: don't index metadata for unsupported document (which could happen when browsing files with PathChooser) and show full filename for such documents. Also: ImageWidget: small fix in case we use both scale_factor and scale_for_dpi.
This commit is contained in:
@@ -10,17 +10,64 @@ local Screen = require("device").screen
|
||||
local ReaderDogear = InputContainer:new{}
|
||||
|
||||
function ReaderDogear:init()
|
||||
local widget = ImageWidget:new{
|
||||
file = "resources/icons/dogear.png",
|
||||
alpha = true,
|
||||
}
|
||||
self[1] = RightContainer:new{
|
||||
dimen = Geom:new{w = Screen:getWidth(), h = widget:getSize().h},
|
||||
widget,
|
||||
}
|
||||
-- This image could be scaled for DPI (with scale_for_dpi=true, scale_factor=0.7),
|
||||
-- but it's as good to scale it to a fraction (1/32) of the screen size.
|
||||
-- For CreDocument, we should additionally take care of not exceeding margins
|
||||
-- to not overwrite the book text.
|
||||
-- For other documents, there is no easy way to know if valuable content
|
||||
-- may be hidden by the icon (kopt's page_margin is quite obscure).
|
||||
self.dogear_max_size = math.ceil( math.min(Screen:getWidth(), Screen:getHeight()) / 32)
|
||||
self.dogear_size = nil
|
||||
self:setupDogear()
|
||||
self:resetLayout()
|
||||
end
|
||||
|
||||
function ReaderDogear:setupDogear(new_dogear_size)
|
||||
if not new_dogear_size then
|
||||
new_dogear_size = self.dogear_max_size
|
||||
end
|
||||
if new_dogear_size ~= self.dogear_size then
|
||||
self.dogear_size = new_dogear_size
|
||||
if self[1] then
|
||||
self[1]:free()
|
||||
end
|
||||
self[1] = RightContainer:new{
|
||||
dimen = Geom:new{w = Screen:getWidth(), h = self.dogear_size},
|
||||
ImageWidget:new{
|
||||
file = "resources/icons/dogear.png",
|
||||
alpha = true,
|
||||
width = self.dogear_size,
|
||||
height = self.dogear_size,
|
||||
}
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
function ReaderDogear:onReadSettings(config)
|
||||
if not self.ui.document.info.has_pages then
|
||||
-- Adjust to CreDocument margins (as done in ReaderTypeset)
|
||||
self:onSetPageMargins(
|
||||
config:readSetting("copt_page_margins") or
|
||||
G_reader_settings:readSetting("copt_page_margins") or
|
||||
DCREREADER_CONFIG_MARGIN_SIZES_MEDIUM)
|
||||
end
|
||||
end
|
||||
|
||||
function ReaderDogear:onSetPageMargins(margins)
|
||||
if self.ui.document.info.has_pages then
|
||||
-- we may get called by readerfooter (when hiding the footer)
|
||||
-- on pdf documents and get margins=nil
|
||||
return
|
||||
end
|
||||
local margin_top, margin_right = margins[2], margins[3]
|
||||
-- As the icon is squared, we can take the max() instead of the min() of
|
||||
-- top & right margins and be sure no text is hidden by the icon
|
||||
-- (the provided margins are not scaled, so do as ReaderTypeset)
|
||||
local margin = Screen:scaleBySize(math.max(margin_top, margin_right))
|
||||
local new_dogear_size = math.min(self.dogear_max_size, margin)
|
||||
self:setupDogear(new_dogear_size)
|
||||
end
|
||||
|
||||
function ReaderDogear:resetLayout()
|
||||
local new_screen_width = Screen:getWidth()
|
||||
if new_screen_width == self._last_screen_width then return end
|
||||
|
||||
Reference in New Issue
Block a user