mirror of
https://github.com/koreader/koreader.git
synced 2025-08-10 00:52:38 +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.
101 lines
3.7 KiB
Lua
101 lines
3.7 KiB
Lua
--[[--
|
|
AlphaContainer will paint its content (1 widget) onto lower levels using
|
|
a transparency (0..1)
|
|
|
|
Example:
|
|
|
|
local alpha
|
|
alpha = AlphaContainer:new{
|
|
alpha = 0.7,
|
|
|
|
FrameContainer:new{
|
|
background = Blitbuffer.COLOR_WHITE,
|
|
bordersize = Size.border.default,
|
|
margin = 0,
|
|
padding = Size.padding.default
|
|
}
|
|
}
|
|
--]]
|
|
|
|
local Blitbuffer = require("ffi/blitbuffer")
|
|
local WidgetContainer = require("ui/widget/container/widgetcontainer")
|
|
|
|
local AlphaContainer = WidgetContainer:new{
|
|
alpha = 1,
|
|
-- we cache a blitbuffer object for re-use here:
|
|
private_bb = nil,
|
|
-- we save the underlying area here:
|
|
background_bb = nil,
|
|
background_bb_x = nil,
|
|
background_bb_y = nil
|
|
}
|
|
|
|
function AlphaContainer:paintTo(bb, x, y)
|
|
local contentSize = self[1]:getSize()
|
|
local private_bb = self.private_bb
|
|
|
|
if self.background_bb then
|
|
-- NOTE: Best as I can tell, this was an attempt at avoiding alpha layering issues when an AlphaContainer is repainted *at the same coordinates* AND *over the same background*.
|
|
-- Unfortunately, those are hard constraints to respect, and, while we can take care of the first by invalidating the cache if coordinates have changed,
|
|
-- we can't do anything about the second (and that's exactly what happens in ReaderUI when paging around, for example: that'll obviously have changed what's below AlphaContainer ;)).
|
|
-- FWIW, MovableContainer's alpha handling rely on callers using setDirty("all") to force a repaint of the whole stack to avoid layering issues.
|
|
-- A better approach would probably involve letting UIManager handle it: if it finds a dirty translucent widget, mark all the widgets below it dirty, too...
|
|
if self.background_bb_x == x and self.background_bb_y == y then
|
|
bb:blitFrom(self.background_bb, self.background_bb_x, self.background_bb_y)
|
|
else
|
|
-- We moved, invalidate the bg cache.
|
|
self.background_bb:free()
|
|
self.background_bb = nil
|
|
self.background_bb_x = nil
|
|
self.background_bb_y = nil
|
|
end
|
|
end
|
|
|
|
if not private_bb
|
|
or private_bb:getWidth() ~= contentSize.w
|
|
or private_bb:getHeight() ~= contentSize.h
|
|
then
|
|
if private_bb then
|
|
private_bb:free() -- free the one we're going to replace
|
|
end
|
|
-- create private blitbuffer for our child widget to paint to
|
|
private_bb = Blitbuffer.new(contentSize.w, contentSize.h, bb:getType())
|
|
self.private_bb = private_bb
|
|
|
|
-- save what is below our painting area
|
|
if not self.background_bb
|
|
or self.background_bb:getWidth() ~= contentSize.w
|
|
or self.background_bb:getHeight() ~= contentSize.h
|
|
then
|
|
if self.background_bb then
|
|
self.background_bb:free() -- free the one we're going to replace
|
|
end
|
|
self.background_bb = Blitbuffer.new(contentSize.w, contentSize.h, bb:getType())
|
|
end
|
|
self.background_bb:blitFrom(bb, 0, 0, x, y)
|
|
self.background_bb_x = x
|
|
self.background_bb_y = y
|
|
end
|
|
|
|
-- now have our child widget paint to the private blitbuffer
|
|
private_bb:fill(Blitbuffer.COLOR_WHITE)
|
|
self[1]:paintTo(private_bb, 0, 0)
|
|
|
|
-- blit the private blitbuffer to our parent blitbuffer
|
|
bb:addblitFrom(private_bb, x, y, nil, nil, nil, nil, self.alpha)
|
|
end
|
|
|
|
function AlphaContainer:onCloseWidget()
|
|
if self.private_bb then
|
|
self.private_bb:free()
|
|
self.private_bb = nil
|
|
end
|
|
if self.background_bb then
|
|
self.background_bb:free()
|
|
self.background_bb = nil
|
|
end
|
|
end
|
|
|
|
|
|
return AlphaContainer
|