mirror of
https://gitlab.com/luk3yx/minetest-flow.git
synced 2025-06-21 17:48:02 +02:00
Make bgimg/bgcolor work with padding and add bgimg_middle
This commit is contained in:
parent
74ff45d081
commit
95689f6c89
14
init.lua
14
init.lua
@ -479,15 +479,20 @@ local function parse_callbacks(tree, ctx_form)
|
|||||||
for node in formspec_ast.walk(tree) do
|
for node in formspec_ast.walk(tree) do
|
||||||
if node.type == "container" then
|
if node.type == "container" then
|
||||||
if node.bgcolor then
|
if node.bgcolor then
|
||||||
|
local padding = node.padding or 0
|
||||||
table.insert(node, 1, {
|
table.insert(node, 1, {
|
||||||
type = "box", color = node.bgcolor,
|
type = "box", color = node.bgcolor,
|
||||||
x = 0, y = 0, w = node.w, h = node.h,
|
x = -padding, y = -padding,
|
||||||
|
w = node.w + padding * 2, h = node.h + padding * 2,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
if node.bgimg then
|
if node.bgimg then
|
||||||
|
local padding = node.padding or 0
|
||||||
table.insert(node, 1, {
|
table.insert(node, 1, {
|
||||||
type = "background", texture_name = node.bgimg,
|
type = node.bgimg_middle and "background9" or "background",
|
||||||
x = 0, y = 0, w = node.w, h = node.h,
|
texture_name = node.bgimg, middle_x = node.bgimg_middle,
|
||||||
|
x = -padding, y = -padding,
|
||||||
|
w = node.w + padding * 2, h = node.h + padding * 2,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
if node.on_quit then
|
if node.on_quit then
|
||||||
@ -501,7 +506,8 @@ local function parse_callbacks(tree, ctx_form)
|
|||||||
elseif seen_scroll_container then
|
elseif seen_scroll_container then
|
||||||
-- Work around a Minetest bug with scroll containers not scrolling
|
-- Work around a Minetest bug with scroll containers not scrolling
|
||||||
-- backgrounds.
|
-- backgrounds.
|
||||||
if node.type == "background" and not node.auto_clip then
|
if (node.type == "background" or node.type == "background9") and
|
||||||
|
not node.auto_clip then
|
||||||
node.type = "image"
|
node.type = "image"
|
||||||
end
|
end
|
||||||
elseif node.type == "scroll_container" then
|
elseif node.type == "scroll_container" then
|
||||||
|
Loading…
Reference in New Issue
Block a user