cyberarm/cyberarm_engine
1
0
Fork 0
mirror of https://github.com/cyberarm/cyberarm_engine.git synced 2025-12-15 20:52:35 +00:00
Code Issues Projects Releases Wiki Activity

Use shorthand (&:method) for Element scroll_width/height max_scroll_width, possibly fix dimentional_size returning the wrong size when element has nonzero padding/margin/border_thickness

Browse Source
This commit is contained in:
Cyberarm
2021-05-31 01:03:50 +00:00
parent 8057bca818
commit 1b080f9fb9
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/cyberarm_engine/ui/element.rb
View File

@@ -352,11 +352,11 @@ module CyberarmEngine
end end
def scroll_width def scroll_width
@children.sum { |c| c.width } + noncontent_width @children.sum(&:width) + noncontent_width
end end
def scroll_height def scroll_height
@children.sum { |c| c.height } + noncontent_height @children.sum(&:height) + noncontent_height
end end
def max_scroll_width def max_scroll_width
@@ -370,12 +370,10 @@ module CyberarmEngine
def dimensional_size(size, dimension) def dimensional_size(size, dimension)
raise "dimension must be either :width or :height" unless %i[width height].include?(dimension) raise "dimension must be either :width or :height" unless %i[width height].include?(dimension)
if size && size.is_a?(Numeric) if size.is_a?(Numeric) && size.between?(0.0, 1.0)
if size.between?(0.0, 1.0) (@parent.send(:"content_#{dimension}") * size).round - send(:"noncontent_#{dimension}").round
((@parent.send(:"content_#{dimension}") - send(:"noncontent_#{dimension}")) * size).round else
else size
size
end
end end
end end