cyberarm/cyberarm_engine
1
0
Fork 0
mirror of https://github.com/cyberarm/cyberarm_engine.git synced 2025-12-16 21:22:33 +00:00
Code Issues Projects Releases Wiki Activity

Fixed not handling padding properly, fixed edit_line stuck appearing like mouse is hovering over it after mouse has left it

Browse Source
This commit is contained in:
Cyberarm
2019-06-17 08:56:17 -05:00
parent da69f057a0
commit 74d1ddd16b
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cyberarm_engine/ui/container.rb
View File

@@ -64,7 +64,7 @@ module CyberarmEngine
end end
def recalculate def recalculate
@current_position = Vector.new(@margin_left, @margin_top) @current_position = Vector.new(@margin_left + @padding_left, @margin_top + @padding_top)
unless @visible unless @visible
@width = 0 @width = 0
@height= 0 @height= 0
@@ -73,8 +73,8 @@ module CyberarmEngine
layout layout
@width = @max_width ? @max_width : (@children.map {|c| c.x + c.width + c.margin_right }.max || 0).round @width = @max_width ? @max_width : (@children.map {|c| c.x + c.outer_width }.max || 0).round
@height = @max_height ? @max_height : (@children.map {|c| c.y + c.height + c.margin_bottom}.max || 0).round @height = @max_height ? @max_height : (@children.map {|c| c.y + c.outer_height}.max || 0).round
# Move child to parent after positioning # Move child to parent after positioning
@children.each do |child| @children.each do |child|

3
lib/cyberarm_engine/ui/edit_line.rb
View File

@@ -56,6 +56,9 @@ module CyberarmEngine
end end
def leave(sender) def leave(sender)
unless @focus
super
end
end end
def blur(sender) def blur(sender)