cyberarm_engine 0.14.0 → 0.18.0

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

@@ -5,7 +5,7 @@ module CyberarmEngine
         super(options, block)
 
         @fraction_background = Background.new(background: @style.fraction_background)
-        self.value = options[:fraction] ? options[:fraction] : 0.0
+        self.value = options[:fraction] || 0.0
       end
 
       def render
@@ -14,9 +14,9 @@ module CyberarmEngine
 
       def recalculate
         _width = dimensional_size(@style.width, :width)
-        _height= dimensional_size(@style.height,:height)
+        _height = dimensional_size(@style.height, :height)
         @width = _width
-        @height= _height
+        @height = _height
 
         update_background
       end
@@ -44,8 +44,8 @@ module CyberarmEngine
         update_background
 
         publish(:changed, @fraction)
-        return @fraction
+        @fraction
       end
     end
   end
-end
+end

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

@@ -3,4 +3,4 @@ module CyberarmEngine
     class Radio < Element
     end
   end
-end
+end

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

@@ -9,13 +9,13 @@ module CyberarmEngine
           event(:drag_update)
           event(:end_drag)
 
-          subscribe :begin_drag do |sender, x, y, button|
+          subscribe :begin_drag do |_sender, x, y, _button|
             @drag_start_pos = Vector.new(x, y)
 
             :handled
           end
 
-          subscribe :drag_update do |sender, x, y, button|
+          subscribe :drag_update do |_sender, x, y, _button|
             @parent.handle_dragged_to(x, y)
 
             :handled
@@ -33,21 +33,22 @@ module CyberarmEngine
         end
       end
 
-      attr_reader :range, :step_size
+      attr_reader :range, :step_size, :value
+
       def initialize(options = {}, block = nil)
         super(options, block)
 
-        @range     = @options[:range] ? @options[:range] : 0.0..1.0
-        @step_size = @options[:step] ? @options[:step] : 0.1
-        @value     = @options[:value] ? @options[:value] : (@range.first + @range.last) / 2
+        @range     = @options[:range] || (0.0..1.0)
+        @step_size = @options[:step] || 0.1
+        @value     = @options[:value] || (@range.first + @range.last) / 2
 
         @handle = Handle.new("", parent: self, width: 8, height: 1.0) { close }
-        self.add(@handle)
+        add(@handle)
       end
 
       def recalculate
         _width = dimensional_size(@style.width, :width)
-        _height= dimensional_size(@style.height,:height)
+        _height = dimensional_size(@style.height, :height)
 
         @width  = _width
         @height = _height
@@ -61,7 +62,7 @@ module CyberarmEngine
 
       def position_handle
         @handle.x = @x + @style.padding_left + @style.border_thickness_left +
-          ((content_width - @handle.outer_width) * (@value - @range.min) / (@range.max - @range.min).to_f)
+                    ((content_width - @handle.outer_width) * (@value - @range.min) / (@range.max - @range.min).to_f)
 
         @handle.y = @y + @style.border_thickness_top + @style.padding_top
       end
@@ -79,22 +80,18 @@ module CyberarmEngine
         @handle.tip = @tip
       end
 
-      def holding_left_mouse_button(sender, x, y)
+      def holding_left_mouse_button(_sender, x, y)
         handle_dragged_to(x, y)
 
         :handled
       end
 
-      def handle_dragged_to(x, y)
+      def handle_dragged_to(x, _y)
         @ratio = ((x - @handle.width / 2) - @x) / (content_width - @handle.outer_width)
 
         self.value = @ratio.clamp(0.0, 1.0) * (@range.max - @range.min) + @range.min
       end
 
-      def value
-        @value
-      end
-
       def value=(n)
         @value = n
         position_handle
@@ -104,4 +101,4 @@ module CyberarmEngine
       end
     end
   end
-end
+end

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

@@ -8,4 +8,4 @@ module CyberarmEngine
       end
     end
   end
-end
+end

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

@@ -0,0 +1,153 @@
+module CyberarmEngine
+  class Element
+    class TextBlock < Element
+      def initialize(text, options = {}, block = nil)
+        super(options, block)
+
+        @text = Text.new(
+          text, font: @options[:font], z: @z, color: @options[:color],
+                size: @options[:text_size], shadow: @options[:text_shadow],
+                shadow_size: @options[:text_shadow_size],
+                shadow_color: @options[:text_shadow_color]
+        )
+
+        @raw_text = text
+      end
+
+      def render
+        @text.draw
+      end
+
+      def recalculate
+        @width  = 0
+        @height = 0
+
+        _width  = dimensional_size(@style.width,  :width)
+        _height = dimensional_size(@style.height, :height)
+
+        handle_text_wrapping(_width)
+
+        @width  = _width  || @text.width.round
+        @height = _height || @text.height.round
+
+        @text.y = @style.border_thickness_top + @style.padding_top + @y
+        @text.z = @z + 3
+
+        if (text_alignment = @options[:text_align])
+          case text_alignment
+          when :left
+            @text.x = @style.border_thickness_left + @style.padding_left + @x
+          when :center
+            @text.x = if @text.width <= outer_width
+                        @x + outer_width / 2 - @text.width / 2
+                      else # Act as left aligned
+                        @style.border_thickness_left + @style.padding_left + @x
+                      end
+          when :right
+            @text.x = @x + outer_width - (@text.width + @style.border_thickness_right + @style.padding_right)
+          end
+        end
+
+        update_background
+      end
+
+      def handle_text_wrapping(max_width)
+        max_width ||= @parent&.width
+        max_width ||= @x - (window.width + noncontent_width)
+        wrap_behavior = style.text_wrap
+        copy = @raw_text.to_s.dup
+
+        if line_width(copy[0]) <= max_width && line_width(copy) > max_width && wrap_behavior != :none
+          breaks = []
+          line_start = 0
+          line_end   = copy.length
+
+          while line_start != copy.length
+            if line_width(copy[line_start...line_end]) > max_width
+              line_end = ((line_end - line_start) / 2.0)
+              line_end = 1.0 if line_end <= 1
+            elsif line_end < copy.length && line_width(copy[line_start...line_end + 1]) < max_width
+              # To small, grow!
+              # TODO: find a more efficient way
+              line_end += 1
+
+            else # FOUND IT!
+              entering_line_end = line_end.floor
+              max_reach = line_end.floor - line_start < 63 ? line_end.floor - line_start : 63
+              reach = 0
+
+              if wrap_behavior == :word_wrap
+                max_reach.times do |i|
+                  reach = i
+                  break if copy[line_end.floor - i].to_s.match(/[[:punct:]]| /)
+                end
+
+                # puts "Max width: #{max_width}/#{line_width(@raw_text)} Reach: {#{reach}/#{max_reach}} Line Start: #{line_start}/#{line_end.floor} (#{copy.length}|#{@raw_text.length}) [#{entering_line_end}] '#{copy}' {#{copy[line_start...line_end]}}"
+                line_end = line_end.floor - reach + 1 if reach != max_reach # Add +1 to walk in front of punctuation
+              end
+
+              breaks << line_end.floor
+              line_start = line_end.floor
+              line_end = copy.length
+
+              break if entering_line_end == copy.length || reach == max_reach
+            end
+          end
+
+          breaks.each_with_index do |pos, index|
+            copy.insert(pos + index, "\n") if pos + index >= 0 && pos + index < copy.length
+          end
+        end
+
+        @text.text = copy
+      end
+
+      def line_width(text)
+        (@text.textobject.markup_width(text) + noncontent_width)
+      end
+
+      def value
+        @raw_text
+      end
+
+      def value=(value)
+        @raw_text = value.to_s.chomp
+
+        old_width = width
+        old_height = height
+        recalculate
+
+        root.gui_state.request_recalculate if old_width != width || old_height != height
+
+        publish(:changed, self.value)
+      end
+    end
+
+    class Banner < TextBlock
+    end
+
+    class Title < TextBlock
+    end
+
+    class Subtitle < TextBlock
+    end
+
+    class Tagline < TextBlock
+    end
+
+    class Caption < TextBlock
+    end
+
+    class Para < TextBlock
+    end
+
+    class Inscription < TextBlock
+    end
+
+    class ToolTip < TextBlock
+    end
+
+    class Link < TextBlock
+    end
+  end
+end

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

@@ -1,51 +1,59 @@
 module CyberarmEngine
   class Element
     class ToggleButton < Button
-      attr_reader :toggled
+      attr_reader :toggled, :value
 
       def initialize(options, block = nil)
-        super(options[:checkmark], options, block)
+        if options.dig(:theme, :ToggleButton, :checkmark_image)
+          options[:theme][:ToggleButton][:image_width] ||= options[:theme][:Label][:text_size]
+          super(get_image(options.dig(:theme, :ToggleButton, :checkmark_image)), options, block)
+
+          @_image = @image
+        else
+          super(options[:checkmark], options, block)
+        end
+
         @value = options[:checked] || false
+
         if @value
-          @text.text = @options[:checkmark]
+          @image = @_image if @_image
+          @raw_text = @options[:checkmark]
         else
-          @text.text = ""
+          @image = nil
+          @raw_text = ""
         end
-
-        return self
       end
 
-      def clicked_left_mouse_button(sender, x, y)
+      def clicked_left_mouse_button(_sender, _x, _y)
         self.value = !@value
 
         @block.call(self) if @block
 
-        return :handled
+        :handled
       end
 
       def recalculate
         super
+        return if @image
 
-        _width = dimensional_size(@style.width, :width)
-        _height= dimensional_size(@style.height,:height)
+        _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
+        @width  = _width  || @text.textobject.text_width(@options[:checkmark])
+        @height = _height || @text.height
 
         update_background
       end
 
-      def value
-        @value
-      end
-
       def value=(boolean)
         @value = boolean
 
         if boolean
-          @text.text = @options[:checkmark]
+          @image = @_image if @_image
+          @raw_text = @options[:checkmark]
         else
-          @text.text = ""
+          @image = nil
+          @raw_text = ""
         end
 
         recalculate
@@ -54,4 +62,4 @@ module CyberarmEngine
       end
     end
   end
-end
+end

data/lib/cyberarm_engine/ui/event.rb

@@ -15,20 +15,18 @@ module CyberarmEngine
 
       return unless enabled?
 
-      if respond_to?(event)
-        return :handled if send(event, self, *args) == :handled
-      end
+      return :handled if respond_to?(event) && (send(event, self, *args) == :handled)
 
       @event_handler[event].reverse_each do |handler|
         return :handled if handler.call(self, *args) == :handled
       end
 
       parent.publish(event, *args) if parent
-      return nil
+      nil
     end
 
     def event(event)
-      @event_handler ||= Hash.new
+      @event_handler ||= {}
       @event_handler[event] ||= []
     end
   end
@@ -37,11 +35,13 @@ module CyberarmEngine
     attr_reader :publisher, :event, :handler
 
     def initialize(publisher, event, handler)
-      @publisher, @event, @handler = publisher, event, handler
+      @publisher = publisher
+      @event = event
+      @handler = handler
     end
 
     def unsubscribe
       @publisher.unsubscribe(self)
     end
   end
-end
+end

data/lib/cyberarm_engine/ui/gui_state.rb

@@ -17,22 +17,28 @@ module CyberarmEngine
       @active_width  = window.width
       @active_height = window.height
 
+      @menu = nil
       @focus = nil
       @mouse_over = nil
       @mouse_down_on = {}
       @mouse_down_position = {}
+      @last_mouse_pos = nil
+      @dragging_element = nil
       @pending_recalculate_request = false
 
-      @tip = CyberarmEngine::Text.new("", size: 22, z: Float::INFINITY)
       @menu = nil
       @min_drag_distance = 0
       @mouse_pos = Vector.new
     end
 
+    def post_setup
+      @tip = Element::ToolTip.new("", parent: @root_container, z: Float::INFINITY, theme: current_theme)
+    end
+
     # throws :blur event to focused element and sets GuiState focused element
     # Does NOT throw :focus event at element or set element as focused
     def focus=(element)
-      @focus.publish(:blur) if @focus and element && @focus != element
+      @focus.publish(:blur) if @focus && element && @focus != element
       @focus = element
     end
 
@@ -43,22 +49,45 @@ module CyberarmEngine
     def draw
       super
 
-      if @tip.text.length > 0
-        Gosu.draw_rect(@tip.x - 2, @tip.y - 2, @tip.width + 4, @tip.height + 4, 0xff020202, Float::INFINITY)
+      if @menu
+        Gosu.flush
+        @menu.draw
+      end
+
+      if @tip.value.length.positive?
+        Gosu.flush
         @tip.draw
       end
+
+      if defined?(GUI_DEBUG)
+        Gosu.flush
+
+        @root_container.debug_draw
+      end
     end
 
     def update
       if @pending_recalculate_request
         @root_container.recalculate
         @root_container.recalculate
+        @root_container.recalculate
+
         @pending_recalculate_request = false
       end
 
+      if @pending_focus_request
+        @pending_focus_request = false
+
+        self.focus = @pending_focus_element
+        @pending_focus_element.publish(:focus)
+      end
+
+      @menu&.update
       super
 
-      new_mouse_over = @root_container.hit_element?(window.mouse_x, window.mouse_y)
+      new_mouse_over = @menu.hit_element?(window.mouse_x, window.mouse_y) if @menu
+      new_mouse_over ||= @root_container.hit_element?(window.mouse_x, window.mouse_y)
+
       if new_mouse_over
         new_mouse_over.publish(:enter) if new_mouse_over != @mouse_over
         new_mouse_over.publish(:hover)
@@ -73,10 +102,17 @@ module CyberarmEngine
 
       if Vector.new(window.mouse_x, window.mouse_y) == @last_mouse_pos
         if @mouse_over && (Gosu.milliseconds - @mouse_moved_at) > tool_tip_delay
-          @tip.text = @mouse_over.tip if @mouse_over
-          @tip.x, @tip.y = window.mouse_x - @tip.width / 2, window.mouse_y - @tip.height - 4
+          @tip.value = @mouse_over.tip if @mouse_over
+          @tip.x = window.mouse_x - @tip.width / 2
+          @tip.x = 0 if @tip.x < 0
+          @tip.x = window.width - @tip.width if @tip.x + @tip.width > window.width
+          @tip.y = window.mouse_y - (@tip.height + 5)
+          @tip.y = 0 if @tip.y < 0
+          @tip.y = window.height - @tip.height if @tip.y + @tip.height > window.height
+          @tip.update
+          @tip.recalculate
         else
-          @tip.text = ""
+          @tip.value = ""
         end
       else
         @mouse_moved_at = Gosu.milliseconds
@@ -85,14 +121,17 @@ module CyberarmEngine
       @last_mouse_pos = Vector.new(window.mouse_x, window.mouse_y)
       @mouse_pos = @last_mouse_pos.clone
 
-      request_recalculate if @active_width != window.width || @active_height != window.height
+      if @active_width != window.width || @active_height != window.height
+        request_recalculate
+        @root_container.publish(:window_size_changed)
+      end
 
       @active_width  = window.width
       @active_height = window.height
     end
 
     def tool_tip_delay
-      500 # ms
+      250 # ms
     end
 
     def button_down(id)
@@ -108,6 +147,8 @@ module CyberarmEngine
       when Gosu::KbF5
         request_recalculate
       end
+
+      @focus.button_down(id) if @focus.respond_to?(:button_down)
     end
 
     def button_up(id)
@@ -125,9 +166,13 @@ module CyberarmEngine
       when Gosu::MsWheelDown
         redirect_mouse_wheel(:down)
       end
+
+      @focus.button_up(id) if @focus.respond_to?(:button_up)
     end
 
     def redirect_mouse_button(button)
+      hide_menu unless @menu && (@menu == @mouse_over) || (@mouse_over&.parent == @menu)
+
       if @focus && @mouse_over != @focus
         @focus.publish(:blur)
         @focus = nil
@@ -145,9 +190,14 @@ module CyberarmEngine
     end
 
     def redirect_released_mouse_button(button)
+      hide_menu if @menu && (@menu == @mouse_over) || (@mouse_over&.parent == @menu)
+
       if @mouse_over
         @mouse_over.publish(:"released_#{button}_mouse_button", window.mouse_x, window.mouse_y)
-        @mouse_over.publish(:"clicked_#{button}_mouse_button", window.mouse_x, window.mouse_y) if @mouse_over == @mouse_down_on[button]
+        if @mouse_over == @mouse_down_on[button]
+          @mouse_over.publish(:"clicked_#{button}_mouse_button", window.mouse_x,
+                              window.mouse_y)
+        end
       end
 
       if @dragging_element
@@ -162,13 +212,13 @@ module CyberarmEngine
     def redirect_holding_mouse_button(button)
       if !@dragging_element && @mouse_down_on[button] && @mouse_down_on[button].draggable?(button) && @mouse_pos.distance(@mouse_down_position[button]) > @min_drag_distance
         @dragging_element = @mouse_down_on[button]
-        @dragging_element.publish(:"begin_drag", window.mouse_x, window.mouse_y, button)
+        @dragging_element.publish(:begin_drag, window.mouse_x, window.mouse_y, button)
       end
 
       if @dragging_element
-        @dragging_element.publish(:"drag_update", window.mouse_x, window.mouse_y, button) if @dragging_element
-      else
-        @mouse_over.publish(:"holding_#{button}_mouse_button", window.mouse_x, window.mouse_y) if @mouse_over
+        @dragging_element.publish(:drag_update, window.mouse_x, window.mouse_y, button) if @dragging_element
+      elsif @mouse_over
+        @mouse_over.publish(:"holding_#{button}_mouse_button", window.mouse_x, window.mouse_y)
       end
     end
 
@@ -180,5 +230,27 @@ module CyberarmEngine
     def request_recalculate
       @pending_recalculate_request = true
     end
+
+    def request_focus(element)
+      @pending_focus_request = true
+      @pending_focus_element = element
+    end
+
+    def show_menu(list_box)
+      @menu = list_box
+    end
+
+    def hide_menu
+      @menu = nil
+    end
+
+    def to_s
+      # "#{self.class} children=#{@children.map { |c| c.to_s }}"
+      @root_container.to_s
+    end
+
+    def inspect
+      to_s
+    end
   end
-end
+end