|
|
@ -96,7 +96,7 @@ function FrameContainer:paintTo(bb, x, y)
|
|
|
|
if not self.dimen then
|
|
|
|
if not self.dimen then
|
|
|
|
self.dimen = Geom:new{
|
|
|
|
self.dimen = Geom:new{
|
|
|
|
x = x, y = y,
|
|
|
|
x = x, y = y,
|
|
|
|
w = my_size.w, h = my_size.h
|
|
|
|
w = my_size.w, h = my_size.h,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
self.dimen.x = x
|
|
|
|
self.dimen.x = x
|
|
|
@ -110,11 +110,16 @@ function FrameContainer:paintTo(bb, x, y)
|
|
|
|
shift_x = container_width - my_size.w
|
|
|
|
shift_x = container_width - my_size.w
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
--- @todo get rid of margin here? 13.03 2013 (houqp)
|
|
|
|
|
|
|
|
if self.background then
|
|
|
|
if self.background then
|
|
|
|
|
|
|
|
if not self.radius or not self.bordersize then
|
|
|
|
bb:paintRoundedRect(x, y,
|
|
|
|
bb:paintRoundedRect(x, y,
|
|
|
|
container_width, container_height,
|
|
|
|
container_width, container_height,
|
|
|
|
self.background, self.radius)
|
|
|
|
self.background, self.radius)
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
bb:paintRoundedRect(x, y,
|
|
|
|
|
|
|
|
container_width, container_height,
|
|
|
|
|
|
|
|
self.background, self.radius + self.bordersize)
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if self.stripe_width and self.stripe_color and not self.stripe_over then
|
|
|
|
if self.stripe_width and self.stripe_color and not self.stripe_over then
|
|
|
|
-- (No support for radius when hatched/stripe)
|
|
|
|
-- (No support for radius when hatched/stripe)
|
|
|
@ -130,10 +135,11 @@ function FrameContainer:paintTo(bb, x, y)
|
|
|
|
self.inner_bordersize, self.color, self.radius)
|
|
|
|
self.inner_bordersize, self.color, self.radius)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if self.bordersize > 0 then
|
|
|
|
if self.bordersize > 0 then
|
|
|
|
|
|
|
|
local anti_alias = G_reader_settings:nilOrTrue("anti_alias_ui")
|
|
|
|
bb:paintBorder(x + self.margin, y + self.margin,
|
|
|
|
bb:paintBorder(x + self.margin, y + self.margin,
|
|
|
|
container_width - self.margin * 2,
|
|
|
|
container_width - self.margin * 2,
|
|
|
|
container_height - self.margin * 2,
|
|
|
|
container_height - self.margin * 2,
|
|
|
|
self.bordersize, self.color, self.radius)
|
|
|
|
self.bordersize, self.color, self.radius, anti_alias)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if self[1] then
|
|
|
|
if self[1] then
|
|
|
|
self[1]:paintTo(bb,
|
|
|
|
self[1]:paintTo(bb,
|
|
|
|