Ignore sibling elements that aren't visible from fill mode space considerations

lib/cyberarm_engine/common.rb

@@ -1,4 +1,6 @@
 module CyberarmEngine
+  GUI_DEBUG = false
+
   module Common
     ImageBlob = Data.define(:to_blob, :columns, :rows)
 

lib/cyberarm_engine/ui/element.rb

@@ -18,7 +18,7 @@ module CyberarmEngine
       @visible = !@options.key?(:visible) ? true  : @options[:visible]
       @tip     = @options[:tip] || ""
 
-      @debug = @options[:debug] || CyberarmEngine.const_defined?("GUI_DEBUG") && CyberarmEngine::GUI_DEBUG || false
+      @debug = @options[:debug].nil? ? nil : @options[:debug]
       @debug_color = @options[:debug_color].nil? ? Gosu::Color::RED : @options[:debug_color]
 
       @style = Style.new(options)
@@ -36,7 +36,7 @@ module CyberarmEngine
       @width  = 0
       @height = 0
 
-      @style.width  = default(:width)  || nil
+      @style.width  = default(:width) || nil
       @style.height = default(:height) || nil
 
       @background_canvas = nil # Background.new
@@ -215,6 +215,7 @@ module CyberarmEngine
       event(:blur)
 
       event(:changed)
+      event(:size_changed)
     end
 
     def enter(_sender)
@@ -339,7 +340,7 @@ module CyberarmEngine
     end
 
     def debug_draw
-      return unless @debug # allow elements to opt out of debug drawing, makes debugging some things easier.
+      return if @debug == false || !CyberarmEngine::GUI_DEBUG # allow elements to opt out of debug drawing, makes debugging some things easier.
       return if CyberarmEngine.const_defined?("GUI_DEBUG_ONLY_ELEMENT") && self.class == GUI_DEBUG_ONLY_ELEMENT
 
       Gosu.draw_line(
@@ -393,7 +394,7 @@ module CyberarmEngine
 
     def width
       if visible?
-        inner_width + @width
+        inner_width + content_width
       else
         0
       end
@@ -417,7 +418,7 @@ module CyberarmEngine
 
     def height
       if visible?
-        inner_height + @height
+        inner_height + content_height
       else
         0
       end
@@ -487,6 +488,8 @@ module CyberarmEngine
 
       new_size = if size.is_a?(Float) && size.between?(0.0, 1.0)
                    (@parent.send(:"content_#{dimension}") * size).floor - send(:"noncontent_#{dimension}").floor
+                elsif size.is_a?(Numeric)
+                   (size - send(:"noncontent_#{dimension}")).floor
                  else
                    size
                  end
@@ -515,7 +518,7 @@ module CyberarmEngine
 
     def space_available_height
       # TODO: This may get expensive if there are a lot of children, probably should cache it somehow
-      fill_siblings = @parent.children.select { |c| c.styled(:fill) }.count.to_f # include self since we're dividing
+      fill_siblings = @parent.children.select { |c| c.styled(:fill) && c.visible? }.count.to_f # include self since we're dividing
 
       available_space = ((@parent.content_height - (@parent.children.reject { |c| c.styled(:fill) }).map(&:outer_height).sum) / fill_siblings)
       (available_space.nan? || available_space.infinite?) ? 0 : available_space.floor # The parent element might not have its dimensions, yet.
@@ -576,6 +579,8 @@ module CyberarmEngine
 
         @old_width = width
         @old_height = height
+
+        publish(:size_changed)
       end
     end
 

lib/cyberarm_engine/ui/elements/container.rb

@@ -88,17 +88,20 @@ module CyberarmEngine
 
           Gosu.translate(@scroll_position.x, @scroll_position.y) do
             @children.each(&:draw)
+
+            @children.each do |child|
+              next unless child.visible?
+
+              child.debug_draw
+            end
           end
         end
 
-        @children.each(&:debug_draw)
         debug_draw
       end
 
       def debug_draw
         super
-
-        @children.each(&:debug_draw)
       end
 
       def update
@@ -203,9 +206,9 @@ module CyberarmEngine
 
           case styled(:v_align)
           when :center
-            @y = parent.y + parent.styled(:margin_top) + parent.height / 2 - height / 2
+            @y = parent.y + parent.outer_height / 2 - outer_height / 2
           when :bottom
-            @y = parent.y + parent.styled(:margin_top) + parent.height - height
+            @y = parent.y + parent.outer_height - outer_height
           end
         end
 
@@ -214,9 +217,9 @@ module CyberarmEngine
 
           case styled(:h_align)
           when :center
-            @x = parent.x + parent.styled(:margin_left) + parent.width / 2 - width / 2
+            @x = parent.x + parent.outer_width / 2 - outer_width / 2
           when :right
-            @x = parent.x + parent.styled(:margin_left) + parent.width - width
+            @x = parent.x + parent.outer_width - outer_width
           end
         end
 
@@ -285,7 +288,7 @@ module CyberarmEngine
       end
 
       def position_on_next_line(element) # Flow
-        @current_position.x = 0
+        @current_position.x = styled(:margin_left) + styled(:padding_left)
         @current_position.y += tallest_neighbor(element, @current_position.y).outer_height
 
         element.x = @current_position.x

lib/cyberarm_engine/ui/gui_state.rb

@@ -98,7 +98,15 @@ module CyberarmEngine
       Stats.frame.start_timing(:gui_element_recalculate_requests)
 
       # puts "PENDING REQUESTS: #{@pending_element_recalculate_requests.size}" if @pending_element_recalculate_requests.size.positive?
-      @pending_element_recalculate_requests.shift(&:recalculate)
+      while (e = @pending_element_recalculate_requests.shift)
+        # its pointless to recalculate individual elements when we've been asked to recalculate the whole gui
+        if @pending_recalculate_request
+          @pending_element_recalculate_requests.clear
+          break
+        end
+
+        e.recalculate
+      end
 
       Stats.frame.end_timing(:gui_element_recalculate_requests)
 
@@ -231,6 +239,9 @@ module CyberarmEngine
         redirect_mouse_button(:right)
       when Gosu::KB_F5
         request_recalculate
+      when Gosu::KB_F12
+        CyberarmEngine.const_set(:GUI_DEBUG, !CyberarmEngine::GUI_DEBUG)
+        request_repaint
       end
 
       @focus.button_down(id) if @focus.respond_to?(:button_down)