mirror of
https://github.com/koreader/koreader
synced 2024-11-10 01:10:34 +00:00
d8fc28df97
* In ReaderPaging, the panning step pre-PanningUpdate can be wildly overshot near page edges, so, use the corrected value instead by recomputing it after the panning has been effectively computed by ReaderView. This fixes slight inaccuracies, as well as glaring mistakes when going backwards, or when near page edges. This is in line with how ReaderRolling computes the value, which I only realized later because I'm an idiot. * Minor cleanups around the handling of the dim_area Geom object in general. * Fix the "Arrow" page overlap mode to be painted in the right coordinates when going backward. Issue might not have been terribly clear because of the previous issue ;). * Center the arrow's point, while we're here. * Don't use AlphaContainer to make it translucent, because AlphaContainer is horribly broken, and has weird quirks and behavior that make no sense to me unless some very specific and unlikely constraints are met, and they definitely aren't here. This fixes the arrow copying an arrow-sized square of the original page the book was opened on on the top-left corner of *every* page with an arrow. (lol). * Do real proper alpha-blending via Icon/ImageWidget from the original icon, instead of faking it via addBlitFrom, in order to avoid the dimming *around* the triangle's shape.
73 lines
2.5 KiB
Lua
73 lines
2.5 KiB
Lua
--[[
|
|
Subclass of ImageWidget to show icons
|
|
]]
|
|
|
|
local DataStorage = require("datastorage")
|
|
local ImageWidget = require("ui/widget/imagewidget")
|
|
local Screen = require("device").screen
|
|
|
|
-- Directories to look for icons by name, with any of the accepted suffixes
|
|
local ICONS_DIRS = {}
|
|
local user_icons_dir = DataStorage:getDataDir() .. "/icons"
|
|
if lfs.attributes(user_icons_dir, "mode") == "directory" then
|
|
table.insert(ICONS_DIRS, user_icons_dir)
|
|
end
|
|
-- Default icons (material design light)
|
|
table.insert(ICONS_DIRS, "resources/icons/mdlight")
|
|
-- Fallback directories
|
|
table.insert(ICONS_DIRS, "resources/icons")
|
|
table.insert(ICONS_DIRS, "resources")
|
|
|
|
-- Supported icon suffixes
|
|
local ICONS_EXTS = { ".svg", ".png" }
|
|
|
|
-- Show this icon instead of crashing if we can't find any icon
|
|
local ICON_NOT_FOUND = "resources/icons/icon-not-found.svg"
|
|
|
|
-- Icon filepath location cache
|
|
local ICONS_PATH = {}
|
|
|
|
local IconWidget = ImageWidget:extend{
|
|
-- The icon filename should be provided without any path
|
|
icon = ICON_NOT_FOUND, -- show this if not provided
|
|
-- See ImageWidget for other available options,
|
|
-- we only start with a few different defaults, that can
|
|
-- be overriden by callers.
|
|
width = Screen:scaleBySize(DGENERIC_ICON_SIZE), -- our icons are square
|
|
height = Screen:scaleBySize(DGENERIC_ICON_SIZE),
|
|
alpha = false, --- @note: Our icons have a transparent background, but, by default, we flatten them at caching time.
|
|
--- Our caller may choose to override that by setting this to true, in which case,
|
|
--- the alpha layer will be kept intact, and we'll do alpha-blending at blitting time.
|
|
is_icon = true, -- avoid dithering in ImageWidget:paintTo()
|
|
}
|
|
|
|
function IconWidget:init()
|
|
if self.image or self.file then
|
|
-- In case we're created with one of these: just be an ImageWidget.
|
|
return
|
|
end
|
|
-- See if already seen and full path cached
|
|
self.file = ICONS_PATH[self.icon]
|
|
if not self.file then
|
|
-- Not yet seen, look for it
|
|
for _, dir in ipairs(ICONS_DIRS) do
|
|
for __, ext in ipairs(ICONS_EXTS) do
|
|
local path = dir .. "/" .. self.icon .. ext
|
|
if lfs.attributes(path, "mode") == "file" then
|
|
self.file = path
|
|
break
|
|
end
|
|
end
|
|
if self.file then
|
|
break
|
|
end
|
|
end
|
|
if not self.file then
|
|
self.file = ICON_NOT_FOUND
|
|
end
|
|
ICONS_PATH[self.icon] = self.file
|
|
end
|
|
end
|
|
|
|
return IconWidget
|