cyberarm/cyberarm_engine
1
0
Fork 0
mirror of https://github.com/cyberarm/cyberarm_engine.git synced 2026-05-06 07:58:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix up container's over estimating their width/height some more

Browse Source
This commit is contained in:
Cyberarm
2026-04-15 10:51:10 -05:00
parent a5636c82b3
commit 4286ca06b0
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/cyberarm_engine/ui/elements/container.rb
View File

@@ -79,16 +79,17 @@ module CyberarmEngine
end end
def render def render
# Gosu.clip_to( Gosu.clip_to(
# @x - 1 + styled(:margin_left) + styled(:border_thickness_left) + styled(:padding_left), @x - 1 + styled(:margin_left) + styled(:border_thickness_left) + styled(:padding_left),
# @y - 1 + styled(:margin_top) + styled(:border_thickness_top) + styled(:padding_top), @y - 1 + styled(:margin_top) + styled(:border_thickness_top) + styled(:padding_top),
# content_width + 1, content_width + 1,
# content_height + 1 content_height + 1
# ) do ) do
Gosu.translate(@scroll_position.x, @scroll_position.y) do Gosu.translate(@scroll_position.x, @scroll_position.y) do
@children.each(&:draw) @children.each(&:draw)
end end
# end end
end end
def debug_draw def debug_draw
@@ -182,20 +183,8 @@ module CyberarmEngine
_width = dimensional_size(@style.width, :width) _width = dimensional_size(@style.width, :width)
_height = dimensional_size(@style.height, :height) _height = dimensional_size(@style.height, :height)
width_correction = 0 @width = _width || (@children.map { |c| c.x + c.outer_width }.max.to_f - (styled(:margin_left) + styled(:padding_left))).floor
height_correction = 0 @height = _height || (@children.map { |c| c.y + c.outer_height }.max.to_f - (styled(:margin_top) + styled(:padding_top))).floor
o = self
while (par = o&.parent)
if o.is_a?(Container)
width_correction += o.styled(:margin_left) + o.styled(:padding_left)
height_correction += o.styled(:margin_top) + o.styled(:padding_top)
end
o = par.parent
end
@width = _width || (@children.map { |c| c.x + c.outer_width }.max.to_f - width_correction).floor
@height = _height || (@children.map { |c| c.y + c.outer_height }.max.to_f - height_correction).floor
end end
# FIXME: Correctly handle alignment when element has siblings # FIXME: Correctly handle alignment when element has siblings