cyberarm_engine 0.22.0 → 0.24.0

data/lib/cyberarm_engine/ui/element.rb

@@ -30,6 +30,8 @@ module CyberarmEngine
       @y = @style.y
       @z = @style.z
 
+      @old_width  = 0
+      @old_height = 0
       @width  = 0
       @height = 0
 
@@ -65,6 +67,8 @@ module CyberarmEngine
 
       set_border_thickness
       set_border_color
+
+      root.gui_state.request_repaint
     end
 
     def safe_style_fetch(*args)
@@ -166,10 +170,10 @@ module CyberarmEngine
       return if self.is_a?(ToolTip)
 
       if old_width != width || old_height != height
-        (root&.gui_state || @gui_state).request_recalculate
-      else
-        stylize
+        root.gui_state.request_recalculate
       end
+
+      stylize
     end
 
     def default_events
@@ -194,7 +198,7 @@ module CyberarmEngine
     end
 
     def enter(_sender)
-      @focus = false unless window.button_down?(Gosu::MsLeft)
+      @focus = false unless Gosu.button_down?(Gosu::MS_LEFT)
 
       if !@enabled
         update_styles(:disabled)
@@ -256,6 +260,8 @@ module CyberarmEngine
     end
 
     def enabled=(boolean)
+      root.gui_state.request_repaint if @enabled != boolean
+
       @enabled = boolean
 
       recalculate
@@ -267,6 +273,10 @@ module CyberarmEngine
       @enabled
     end
 
+    def focused?
+      @focus
+    end
+
     def visible?
       @visible
     end
@@ -278,18 +288,21 @@ module CyberarmEngine
     def toggle
       @visible = !@visible
       root.gui_state.request_recalculate
+      root.gui_state.request_repaint
     end
 
     def show
       bool = visible?
       @visible = true
       root.gui_state.request_recalculate unless bool
+      root.gui_state.request_repaint unless bool
     end
 
     def hide
       bool = visible?
       @visible = false
       root.gui_state.request_recalculate if bool
+      root.gui_state.request_repaint if bool
     end
 
     def draw
@@ -305,7 +318,8 @@ module CyberarmEngine
     end
 
     def debug_draw
-      return if defined?(GUI_DEBUG_ONLY_ELEMENT) && self.class == GUI_DEBUG_ONLY_ELEMENT
+      # FIXME
+      return# if const_defined?(GUI_DEBUG_ONLY_ELEMENT) && self.class == GUI_DEBUG_ONLY_ELEMENT
 
       Gosu.draw_line(
         x, y, @debug_color,
@@ -330,6 +344,7 @@ module CyberarmEngine
     end
 
     def update
+      recalculate_if_size_changed
     end
 
     def button_down(id)
@@ -399,10 +414,14 @@ module CyberarmEngine
     end
 
     def scroll_width
-      @children.sum(&:outer_width)
+      return @cached_scroll_width if @cached_scroll_width && is_a?(Container)
+
+      @cached_scroll_width = @children.sum(&:outer_width)
     end
 
     def scroll_height
+      return @cached_scroll_height if @cached_scroll_height && is_a?(Container)
+
       if is_a?(CyberarmEngine::Element::Flow)
         return 0 if @children.size.zero?
 
@@ -423,41 +442,39 @@ module CyberarmEngine
 
         pairs_ << a_ unless pairs_.last == a_
 
-        pairs_.sum { |pair| pair.map(&:outer_height).max } + @style.padding_bottom + @style.border_thickness_bottom
+        @cached_scroll_height = pairs_.sum { |pair|  + @style.padding_top + @style.border_thickness_top + pair.map(&:outer_height).max } + @style.padding_bottom + @style.border_thickness_bottom
       else
-        @children.sum(&:outer_height) + @style.padding_bottom + @style.border_thickness_bottom
+        @cached_scroll_height = @style.padding_top + @style.border_thickness_top + @children.sum(&:outer_height) + @style.padding_bottom + @style.border_thickness_bottom
       end
     end
 
     def max_scroll_width
-      scroll_width - outer_width
+      (scroll_width - outer_width).positive? ? scroll_width - outer_width : scroll_width
     end
 
     def max_scroll_height
-      scroll_height - outer_height
+      (scroll_height - outer_height).positive? ? scroll_height - outer_height : scroll_height
     end
 
     def dimensional_size(size, dimension)
       raise "dimension must be either :width or :height" unless %i[width height].include?(dimension)
 
-      new_size = if size.is_a?(Numeric) && size.between?(0.0, 1.0)
-        (@parent.send(:"content_#{dimension}") * size).floor - send(:"noncontent_#{dimension}").floor
-      else
-        size
+      new_size = if size.is_a?(Float) && size.between?(0.0, 1.0)
+                   (@parent.send(:"content_#{dimension}") * size).floor - send(:"noncontent_#{dimension}").floor
+                 else
+                   size
+                 end
+
+      # Handle fill behavior
+      if @parent && @style.fill &&
+         (dimension == :width && @parent.is_a?(Flow) ||
+          dimension == :height && @parent.is_a?(Stack))
+        new_size = space_available_width - noncontent_width if dimension == :width && @parent.is_a?(Flow)
+        new_size = space_available_height - noncontent_height if dimension == :height && @parent.is_a?(Stack)
       end
 
-      if @parent && @style.fill # Handle fill behavior
-        if dimension == :width && @parent.is_a?(Flow)
-          return space_available_width - noncontent_width
-
-        elsif dimension == :height && @parent.is_a?(Stack)
-          return space_available_height - noncontent_height
-        end
-
-      else # Handle min_width/height and max_width/height
-        return @style.send(:"min_#{dimension}") if @style.send(:"min_#{dimension}") && new_size.to_f < @style.send(:"min_#{dimension}")
-        return @style.send(:"max_#{dimension}") if @style.send(:"max_#{dimension}") && new_size.to_f > @style.send(:"max_#{dimension}")
-      end
+      return @style.send(:"min_#{dimension}") if @style.send(:"min_#{dimension}") && new_size.to_f < @style.send(:"min_#{dimension}")
+      return @style.send(:"max_#{dimension}") if @style.send(:"max_#{dimension}") && new_size.to_f > @style.send(:"max_#{dimension}")
 
       new_size
     end
@@ -479,6 +496,8 @@ module CyberarmEngine
     end
 
     def background=(_background)
+      root.gui_state.request_repaint
+
       @style.background_canvas.background = _background
       update_background
     end
@@ -497,6 +516,8 @@ module CyberarmEngine
     end
 
     def background_nine_slice=(_image_path)
+      root.gui_state.request_repaint
+
       @style.background_nine_slice_canvas.image = _image_path
       update_background_nine_slice
     end
@@ -521,6 +542,8 @@ module CyberarmEngine
     end
 
     def background_image=(image_path)
+      root.gui_state.request_repaint
+
       @style.background_image = image_path.is_a?(Gosu::Image) ? image_path : get_image(image_path)
       update_background_image
     end
@@ -538,6 +561,15 @@ module CyberarmEngine
       @style.background_image_canvas.image = @style.background_image
     end
 
+    def recalculate_if_size_changed
+      if !is_a?(ToolTip) && (@old_width != width || @old_height != height)
+        root.gui_state.request_recalculate
+
+        @old_width = width
+        @old_height = height
+      end
+    end
+
     def root
       return self if is_root?
 
@@ -558,6 +590,22 @@ module CyberarmEngine
       @gui_state != nil
     end
 
+    def child_of?(element)
+      return element == self if is_root?
+      return false unless element.is_a?(Container)
+      return true if element.children.find { |child| child == self }
+
+      element.children.find { |child| child.child_of?(element) if child.is_a?(Container) }
+    end
+
+    def parent_of?(element)
+      return false if element == self
+      return false unless is_a?(Container)
+      return true if @children.find { |child| child == element }
+
+      @children.find { |child| child.parent_of?(element) if child.is_a?(Container) }
+    end
+
     def focus(_)
       warn "#{self.class}#focus was not overridden!"
 

data/lib/cyberarm_engine/ui/elements/container.rb

@@ -20,7 +20,10 @@ module CyberarmEngine
         @gui_state = options.delete(:gui_state)
         super
 
+        @last_scroll_position = Vector.new(0, 0)
         @scroll_position = Vector.new(0, 0)
+        @scroll_target_position = Vector.new(0, 0)
+        @scroll_chunk = 120
         @scroll_speed = 40
 
         @text_color = options[:color]
@@ -33,13 +36,17 @@ module CyberarmEngine
       def build
         @block.call(self) if @block
 
-        root.gui_state.request_recalculate
+        root.gui_state.request_recalculate_for(self)
       end
 
       def add(element)
         @children << element
 
-        root.gui_state.request_recalculate
+        root.gui_state.request_recalculate_for(self)
+      end
+
+      def remove(element)
+        root.gui_state.request_recalculate_for(self) if @children.delete(element)
       end
 
       def clear(&block)
@@ -52,7 +59,7 @@ module CyberarmEngine
 
         CyberarmEngine::Element::Container.current_container = old_container
 
-        root.gui_state.request_recalculate
+        root.gui_state.request_recalculate_for(self)
       end
 
       def append(&block)
@@ -63,7 +70,7 @@ module CyberarmEngine
 
         CyberarmEngine::Element::Container.current_container = old_container
 
-        root.gui_state.request_recalculate
+        root.gui_state.request_recalculate_for(self)
       end
 
       def render
@@ -73,7 +80,9 @@ module CyberarmEngine
           content_width + 1,
           content_height + 1
         ) do
-          @children.each(&:draw)
+          Gosu.translate(@scroll_position.x, @scroll_position.y) do
+            @children.each(&:draw)
+          end
         end
       end
 
@@ -86,35 +95,74 @@ module CyberarmEngine
       end
 
       def update
+        update_scroll
         @children.each(&:update)
       end
 
       def hit_element?(x, y)
         return unless hit?(x, y)
 
+        # Offset child hit point by scroll position/offset
+        child_x = x - @scroll_position.x
+        child_y = y - @scroll_position.y
+
         @children.reverse_each do |child|
           next unless child.visible?
 
           case child
           when Container
-            if element = child.hit_element?(x, y)
+            if element = child.hit_element?(child_x, child_y)
               return element
             end
           else
-            return child if child.hit?(x, y)
+            return child if child.hit?(child_x, child_y)
           end
         end
 
         self if hit?(x, y)
       end
 
+      def update_child_element_visibity(child)
+        child.element_visible = child.x >= (@x - @scroll_position.x) - child.width && child.x <= (@x - @scroll_position.x) + width &&
+                                child.y >= (@y - @scroll_position.y) - child.height && child.y <= (@y - @scroll_position.y) + height
+      end
+
+      def update_scroll
+        dt = window.dt > 1 ? 1.0 : window.dt
+
+        scroll_x_diff = (@scroll_target_position.x - @scroll_position.x)
+        scroll_y_diff = (@scroll_target_position.y - @scroll_position.y)
+
+        @scroll_position.x += (scroll_x_diff * @scroll_speed * 0.25 * dt).round
+        @scroll_position.y += (scroll_y_diff * @scroll_speed * 0.25 * dt).round
+
+        @scroll_position.x = @scroll_target_position.x if scroll_x_diff.abs < 1.0
+        @scroll_position.y = @scroll_target_position.y if scroll_y_diff.abs < 1.0
+
+        # Scrolled PAST top
+        if @scroll_position.y > 0
+          @scroll_target_position.y = 0
+
+        # Scrolled PAST bottom
+        elsif @scroll_position.y.abs > max_scroll_height
+          @scroll_target_position.y = -max_scroll_height
+        end
+
+        if @last_scroll_position != @scroll_position
+          @children.each { |child| update_child_element_visibity(child) }
+          root.gui_state.request_repaint
+        end
+
+        @last_scroll_position.x = @scroll_position.x
+        @last_scroll_position.y = @scroll_position.y
+      end
+
       def recalculate
         @current_position = Vector.new(@style.margin_left + @style.padding_left, @style.margin_top + @style.padding_top)
-        @current_position += @scroll_position
 
         return unless visible?
 
-        Stats.increment(:gui_recalculations_last_frame, 1)
+        Stats.frame.increment(:gui_recalculations)
 
         stylize
 
@@ -122,6 +170,12 @@ module CyberarmEngine
 
         layout
 
+        old_width  = @width
+        old_height = @height
+
+        @cached_scroll_width = nil
+        @cached_scroll_height = nil
+
         if is_root?
           @width  = @style.width  = window.width
           @height = @style.height = window.height
@@ -169,15 +223,30 @@ module CyberarmEngine
           child.recalculate
           child.reposition # TODO: Implement top,bottom,left,center, and right positioning
 
-          Stats.increment(:gui_recalculations_last_frame, 1)
+          Stats.frame.increment(:gui_recalculations)
 
-          child.element_visible = child.x >= @x - child.width && child.x <= @x + width &&
-                                  child.y >= @y - child.height && child.y <= @y + height
+          update_child_element_visibity(child)
         end
 
         # puts "TOOK: #{Gosu.milliseconds - s}ms to recalculate #{self.class}:0x#{self.object_id.to_s(16)}"
 
         update_background
+
+        # Fixes resized container scrolled past bottom
+        self.scroll_top = -@scroll_position.y
+        @scroll_target_position.y = @scroll_position.y
+
+        # NOTE: Experiment for removing need to explicitly call gui_state#recalculate at least 3 times for layout to layout...
+        if old_width != @width || old_height != @height
+          if @parent
+            root.gui_state.request_recalculate_for(@parent)
+          else
+            root.gui_state.request_recalculate
+          end
+        end
+
+        root.gui_state.request_repaint if @width != old_width || @height != old_height
+        recalculate_if_size_changed
       end
 
       def layout
@@ -237,11 +306,13 @@ module CyberarmEngine
       def mouse_wheel_up(sender, x, y)
         return unless @style.scroll
 
-        if @scroll_position.y < 0
-          @scroll_position.y += @scroll_speed
-          @scroll_position.y = 0 if @scroll_position.y > 0
-
-          root.gui_state.request_recalculate_for(self)
+        # Allow overscrolling UP, only if one can scroll DOWN
+        if height < scroll_height
+          if @scroll_target_position.y > 0
+            @scroll_target_position.y = @scroll_chunk
+          else
+            @scroll_target_position.y += @scroll_chunk
+          end
 
           return :handled
         end
@@ -252,14 +323,13 @@ module CyberarmEngine
 
         return unless height < scroll_height
 
-        if @scroll_position.y.abs < max_scroll_height
-          @scroll_position.y -= @scroll_speed
-          @scroll_position.y = -max_scroll_height if @scroll_position.y.abs > max_scroll_height
-
-          root.gui_state.request_recalculate_for(self)
-
-          return :handled
+        if @scroll_target_position.y > 0
+          @scroll_target_position.y = -@scroll_chunk
+        else
+          @scroll_target_position.y -= @scroll_chunk
         end
+
+        return :handled
       end
 
       def scroll_top
@@ -278,7 +348,7 @@ module CyberarmEngine
       end
 
       def value
-        @children.map { |c| c.class }.join(", ")
+        @children.map(&:class).join(", ")
       end
 
       def to_s

data/lib/cyberarm_engine/ui/elements/edit_line.rb

@@ -80,16 +80,22 @@ module CyberarmEngine
           @show_caret = true
           @caret_last_interval = Gosu.milliseconds
 
+          root.gui_state.request_repaint
+
           publish(:changed, value)
         end
 
         if @last_caret_position != @text_input.caret_pos
           @last_caret_position = @text_input.caret_pos
+          root.gui_state.request_repaint
+
           @show_caret = true
           @caret_last_interval = Gosu.milliseconds
         end
 
         if Gosu.milliseconds >= @caret_last_interval + @caret_interval
+          root.gui_state.request_repaint
+
           @caret_last_interval = Gosu.milliseconds
 
           @show_caret = !@show_caret

data/lib/cyberarm_engine/ui/elements/image.rb

@@ -45,8 +45,8 @@ module CyberarmEngine
           @scale_y = 1
         end
 
-        @width = _width || @image.width.floor * @scale_x
-        @height = _height || @image.height.floor * @scale_y
+        @width = _width || (@image.width * @scale_x).floor
+        @height = _height || (@image.height * @scale_y).floor
 
         update_background
       end

data/lib/cyberarm_engine/ui/elements/progress.rb

@@ -52,6 +52,7 @@ module CyberarmEngine
         @marquee_animation_time = Gosu.milliseconds if @marquee_offset > range
 
         update_background
+        root.gui_state.request_repaint
       end
 
       def type=(type)
@@ -77,9 +78,13 @@ module CyberarmEngine
       def value=(decimal)
         raise "value must be number" unless decimal.is_a?(Numeric)
 
+        old_value = @fraction
+
         @fraction = decimal.clamp(0.0, 1.0)
         update_background
 
+        root.gui_state.request_repaint if @fraction != old_value
+
         publish(:changed, @fraction)
         @fraction
       end

data/lib/cyberarm_engine/ui/elements/slider.rb

@@ -33,7 +33,8 @@ module CyberarmEngine
         end
       end
 
-      attr_reader :range, :step_size, :value
+      attr_reader :step_size, :value
+      attr_accessor :range, :step_size
 
       def initialize(options = {}, block = nil)
         super(options, block)
@@ -76,7 +77,7 @@ module CyberarmEngine
       def update
         super
 
-        @tip = value.to_s
+        @tip = format("%.2f", value.to_f)
         @handle.tip = @tip
       end
 
@@ -87,7 +88,7 @@ module CyberarmEngine
       end
 
       def handle_dragged_to(x, _y)
-        @ratio = ((x - @handle.width / 2) - @x) / (content_width - @handle.outer_width)
+        @ratio = ((x - @handle.width / 2.0) - @x) / (content_width - @handle.outer_width.to_f)
 
         self.value = @ratio.clamp(0.0, 1.0) * (@range.max - @range.min) + @range.min
       end
@@ -97,6 +98,8 @@ module CyberarmEngine
         position_handle
         @handle.recalculate
 
+        root.gui_state.request_repaint
+
         publish(:changed, @value)
       end
     end

data/lib/cyberarm_engine/ui/elements/text_block.rb

@@ -18,6 +18,15 @@ module CyberarmEngine
         @raw_text = text
       end
 
+      def update
+        super
+
+        if @text.textobject.name != safe_style_fetch(:font)
+          set_font
+          root.gui_state.request_recalculate
+        end
+      end
+
       def render
         # Gosu.clip_to is too expensive to always use so check if we actually need it.
         if @text.width > width || @text.height > height
@@ -36,6 +45,9 @@ module CyberarmEngine
           @text.color = @style.color
         end
 
+        old_width  = @width
+        old_height = @height
+
         @width  = 0
         @height = 0
 
@@ -79,6 +91,9 @@ module CyberarmEngine
         end
 
         update_background
+
+        root.gui_state.request_repaint if @width != old_width || @height != old_height
+        recalculate_if_size_changed
       end
 
       def handle_text_wrapping(max_width)
@@ -151,7 +166,7 @@ module CyberarmEngine
       end
 
       def line_width(text)
-        (@text.textobject.markup_width(text) + noncontent_width)
+        (@text.textobject.markup_width(text.to_s) + noncontent_width)
       end
 
       def value
@@ -159,6 +174,7 @@ module CyberarmEngine
       end
 
       def value=(value)
+        old_value = @raw_text
         @raw_text = value.to_s.chomp
 
         old_width = width
@@ -170,6 +186,8 @@ module CyberarmEngine
           recalculate
         end
 
+        root.gui_state.request_repaint if old_value != @raw_text
+
         publish(:changed, self.value)
       end
     end