diff --git a/lib/cyberarm_engine/ui/check_box.rb b/lib/cyberarm_engine/ui/check_box.rb index 47c93f7..a4a8695 100644 --- a/lib/cyberarm_engine/ui/check_box.rb +++ b/lib/cyberarm_engine/ui/check_box.rb @@ -11,9 +11,6 @@ module CyberarmEngine add(@toggle_button) add(@label) - - @style.width = @toggle_button.width + @label.width - @style.height = @toggle_button.height + @label.height end def text=(text) diff --git a/lib/cyberarm_engine/ui/toggle_button.rb b/lib/cyberarm_engine/ui/toggle_button.rb index fa173a8..fc2db6a 100644 --- a/lib/cyberarm_engine/ui/toggle_button.rb +++ b/lib/cyberarm_engine/ui/toggle_button.rb @@ -38,7 +38,10 @@ module CyberarmEngine def recalculate super - @style.width = @text.textobject.text_width(@options[:checkmark]) + _width = dimensional_size(@style.width, :width) + _height= dimensional_size(@style.height,:height) + @width = _width ? _width : @text.textobject.text_width(@options[:checkmark]) + @height = _height ? _height : @text.height update_background end