cyberarm_engine 0.13.1 → 0.17.1

data/lib/cyberarm_engine/ui/border_canvas.rb

@@ -1,6 +1,7 @@
 module CyberarmEngine
   class BorderCanvas
     attr_reader :element, :top, :right, :bottom, :left
+
     def initialize(element:)
       @element = element
 
@@ -25,7 +26,7 @@ module CyberarmEngine
 
       elsif color.is_a?(Array)
         if color.size == 1
-          color=color.first
+          color = color.first
 
         elsif color.size == 2
           @top.background    = color.first
@@ -61,7 +62,7 @@ module CyberarmEngine
 
     def update
       # TOP
-      @top.x = @element.x# + @element.border_thickness_left
+      @top.x = @element.x # + @element.border_thickness_left
       @top.y = @element.y
       @top.z = @element.z
 
@@ -98,4 +99,4 @@ module CyberarmEngine
       @left.update
     end
   end
-end
+end

data/lib/cyberarm_engine/ui/dsl.rb

@@ -8,53 +8,92 @@ module CyberarmEngine
       container(CyberarmEngine::Element::Stack, options, &block)
     end
 
+    # TODO: Remove in version 0.16.0+
     def label(text, options = {}, &block)
       options[:parent] = element_parent
       options[:theme] = current_theme
 
-      add_element( Element::Label.new(text, options, block) )
+      add_element(Element::TextBlock.new(text, options, block))
+    end
+
+    [
+      "Banner",
+      "Title",
+      "Subtitle",
+      "Tagline",
+      "Caption",
+      "Para",
+      "Inscription"
+    ].each do |const|
+      define_method(:"#{const.downcase}") do |text, options = {}, &block|
+        options[:parent] = element_parent
+        options[:theme] = current_theme
+
+        add_element(Element.const_get(const).new(text, options, block))
+      end
     end
 
     def button(text, options = {}, &block)
       options[:parent] = element_parent
       options[:theme] = current_theme
 
-      add_element( Element::Button.new(text, options, block) { if block.is_a?(Proc); block.call; end } )
+      add_element(Element::Button.new(text, options, block) { block.call if block.is_a?(Proc) })
+    end
+
+    def list_box(options = {}, &block)
+      options[:parent] = element_parent
+      options[:theme] = current_theme
+
+      add_element(Element::ListBox.new(options, block) { block.call if block.is_a?(Proc) })
     end
 
     def edit_line(text, options = {}, &block)
       options[:parent] = element_parent
       options[:theme] = current_theme
 
-      add_element( Element::EditLine.new(text, options, block) )
+      add_element(Element::EditLine.new(text, options, block))
+    end
+
+    def edit_box(text, options = {}, &block)
+      options[:parent] = element_parent
+      options[:theme] = current_theme
+
+      add_element(Element::EditBox.new(text, options, block))
     end
 
     def toggle_button(options = {}, &block)
       options[:parent] = element_parent
       options[:theme] = current_theme
 
-      add_element( Element::ToggleButton.new(options, block) )
+      add_element(Element::ToggleButton.new(options, block))
     end
 
     def check_box(text, options = {}, &block)
       options[:parent] = element_parent
       options[:theme] = current_theme
 
-      add_element( Element::CheckBox.new(text, options, block) )
+      add_element(Element::CheckBox.new(text, options, block))
     end
 
     def image(path, options = {}, &block)
       options[:parent] = element_parent
       options[:theme] = current_theme
 
-      add_element( Element::Image.new(path, options, block) )
+      add_element(Element::Image.new(path, options, block))
     end
 
     def progress(options = {}, &block)
       options[:parent] = element_parent
       options[:theme] = current_theme
 
-      add_element( Element::Progress.new(options, block) )
+      add_element(Element::Progress.new(options, block))
+    end
+
+    def slider(options = {}, &block)
+      options[:parent] = element_parent
+      options[:theme] = current_theme
+
+      add_element(Element::Slider.new(options, block))
     end
 
     def background(color = Gosu::Color::NONE)
@@ -72,7 +111,7 @@ module CyberarmEngine
     private def add_element(element)
       element_parent.add(element)
 
-      return element
+      element
     end
 
     private def element_parent
@@ -93,7 +132,7 @@ module CyberarmEngine
 
       $__current_container__ = old_parent
 
-      return _container
+      _container
     end
   end
-end
+end

data/lib/cyberarm_engine/ui/element.rb

@@ -4,7 +4,7 @@ module CyberarmEngine
     include Event
     include Common
 
-    attr_accessor :x, :y, :z, :enabled
+    attr_accessor :x, :y, :z, :enabled, :tip
     attr_reader :parent, :options, :style, :event_handler, :background_canvas, :border_canvas
 
     def initialize(options = {}, block = nil)
@@ -13,12 +13,16 @@ module CyberarmEngine
       @options = options
       @block = block
 
-      @focus   = false
-      @enabled = true
-      @visible = true
+      @focus   = @options[:focus].nil?   ? false : @options[:focus]
+      @enabled = @options[:enabled].nil? ? true  : @options[:enabled]
+      @visible = @options[:visible].nil? ? true  : @options[:visible]
+      @tip     = @options[:tip] || ""
 
       @style = Style.new(options)
 
+      @root ||= nil
+      @gui_state ||= nil
+
       @x = @style.x
       @y = @style.y
       @z = @style.z
@@ -26,9 +30,6 @@ module CyberarmEngine
       @width  = 0
       @height = 0
 
-      @fixed_x = @x if @x != 0
-      @fixed_y = @y if @y != 0
-
       @style.width  = default(:width)  || nil
       @style.height = default(:height) || nil
 
@@ -38,9 +39,12 @@ module CyberarmEngine
       stylize
 
       default_events
+
+      root.gui_state.request_focus(self) if @options[:autofocus]
     end
 
     def stylize
+      set_static_position
       set_border_thickness(@style.border_thickness)
 
       set_padding(@style.padding)
@@ -51,6 +55,11 @@ module CyberarmEngine
       set_border_color(@style.border_color)
     end
 
+    def set_static_position
+      @x = @style.x if @style.x != 0
+      @y = @style.y if @style.y != 0
+    end
+
     def set_background(background)
       @style.background = background
       @style.background_canvas.background = background
@@ -95,7 +104,7 @@ module CyberarmEngine
     end
 
     def default_events
-      [:left, :middle, :right].each do |button|
+      %i[left middle right].each do |button|
         event(:"#{button}_mouse_button")
         event(:"released_#{button}_mouse_button")
         event(:"clicked_#{button}_mouse_button")
@@ -109,7 +118,10 @@ module CyberarmEngine
       event(:hover)
       event(:leave)
 
+      event(:focus)
       event(:blur)
+
+      event(:changed)
     end
 
     def enabled?
@@ -126,21 +138,26 @@ module CyberarmEngine
     end
 
     def show
+      bool = visible?
       @visible = true
-      root.gui_state.request_recalculate
+      root.gui_state.request_recalculate unless bool
     end
 
     def hide
+      bool = visible?
       @visible = false
-      root.gui_state.request_recalculate
+      root.gui_state.request_recalculate if bool
     end
 
     def draw
-      return unless @visible
+      return unless visible?
 
       @style.background_canvas.draw
       @style.border_canvas.draw
-      render
+
+      Gosu.clip_to(@x, @y, width, height) do
+        render
+      end
     end
 
     def update
@@ -152,12 +169,16 @@ module CyberarmEngine
     def button_up(id)
     end
 
+    def draggable?(_button)
+      false
+    end
+
     def render
     end
 
     def hit?(x, y)
       x.between?(@x, @x + width) &&
-      y.between?(@y, @y + height)
+        y.between?(@y, @y + height)
     end
 
     def width
@@ -208,21 +229,36 @@ module CyberarmEngine
       (@style.border_thickness_top + @style.padding_top) + (@style.padding_bottom + @style.border_thickness_bottom)
     end
 
-    private def dimensional_size(size, dimension)
-      raise "dimension must be either :width or :height" unless dimension == :width || dimension == :height
+    def scroll_width
+      @children.sum { |c| c.width } + noncontent_width
+    end
+
+    def scroll_height
+      @children.sum { |c| c.height } + noncontent_height
+    end
+
+    def max_scroll_width
+      scroll_width - width
+    end
+
+    def max_scroll_height
+      scroll_height - height
+    end
+
+    def dimensional_size(size, dimension)
+      raise "dimension must be either :width or :height" unless %i[width height].include?(dimension)
+
       if size && size.is_a?(Numeric)
         if size.between?(0.0, 1.0)
-          ((@parent.send(:"content_#{dimension}") - self.send(:"noncontent_#{dimension}") - 1) * size).round
+          ((@parent.send(:"content_#{dimension}") - send(:"noncontent_#{dimension}")) * size).round
         else
           size
         end
-      else
-        nil
       end
     end
 
     def background=(_background)
-      @style.background_canvas.background=(_background)
+      @style.background_canvas.background = (_background)
       update_background
     end
 
@@ -239,6 +275,8 @@ module CyberarmEngine
     end
 
     def root
+      return self if is_root?
+
       unless @root && @root.parent.nil?
         @root = parent
 
@@ -258,6 +296,12 @@ module CyberarmEngine
       @gui_state != nil
     end
 
+    def focus(_)
+      warn "#{self.class}#focus was not overridden!"
+
+      :handled
+    end
+
     def recalculate
       raise "#{self.class}#recalculate was not overridden!"
     end
@@ -269,8 +313,16 @@ module CyberarmEngine
       raise "#{self.class}#value was not overridden!"
     end
 
-    def value=(value)
+    def value=(_value)
       raise "#{self.class}#value= was not overridden!"
     end
+
+    def to_s
+      "#{self.class} x=#{x} y=#{y} width=#{width} height=#{height} value=#{value.is_a?(String) ? "\"#{value}\"" : value}"
+    end
+
+    def inspect
+      to_s
+    end
   end
-end
+end

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

@@ -1,67 +1,160 @@
 module CyberarmEngine
   class Element
-    class Button < Label
-      def initialize(text, options = {}, block = nil)
-        super(text, options, block)
+    class Button < TextBlock
+      def initialize(text_or_image, options = {}, block = nil)
+        @image = nil
+        @scale_x = 1
+        @scale_y = 1
 
-        @style.background_canvas.background = default(:background)
+        @image = text_or_image if text_or_image.is_a?(Gosu::Image)
+
+        super(text_or_image, options, block)
+
+        @style.background_canvas.background = @style.background
       end
 
       def render
-        draw_text
+        if @image
+          draw_image
+        else
+          draw_text
+        end
+      end
+
+      def draw_image
+        @image.draw(
+          @style.border_thickness_left + @style.padding_left + @x,
+          @style.border_thickness_top + @style.padding_top + @y,
+          @z + 2,
+          @scale_x, @scale_y, @text.color
+        )
       end
 
       def draw_text
         @text.draw
       end
 
-      def enter(sender)
+      def enter(_sender)
         @focus = false unless window.button_down?(Gosu::MsLeft)
 
-        if @focus
-          @style.background_canvas.background = default(:active, :background)
-          @text.color = default(:active, :color)
+        if !@enabled
+          @style.background_canvas.background = @style.disabled[:background]
+          @text.color = @style.disabled[:color]
+        elsif @focus
+          @style.background_canvas.background = @style.active[:background]
+          @text.color = @style.active[:color]
         else
-          @style.background_canvas.background = default(:hover, :background)
-          @text.color = default(:hover, :color)
+          @style.background_canvas.background = @style.hover[:background]
+          @text.color = @style.hover[:color]
         end
 
-        return :handled
+        :handled
       end
 
-      def left_mouse_button(sender, x, y)
+      def left_mouse_button(_sender, _x, _y)
         @focus = true
-        @style.background_canvas.background = default(:active, :background)
+
+        unless @enabled
+          @style.background_canvas.background = @style.disabled[:background]
+          @text.color = @style.disabled[:color]
+        else
+          @style.background_canvas.background = @style.active[:background]
+          @text.color = @style.active[:color]
+        end
+
         window.current_state.focus = self
-        @text.color = default(:active, :color)
 
-        return :handled
+        :handled
       end
 
-      def released_left_mouse_button(sender,x, y)
+      def released_left_mouse_button(sender, _x, _y)
         enter(sender)
 
-        return :handled
+        :handled
       end
 
-      def clicked_left_mouse_button(sender, x, y)
-        @block.call(self) if @block
+      def clicked_left_mouse_button(_sender, _x, _y)
+        @block.call(self) if @enabled && @block
 
-        return :handled
+        :handled
       end
 
-      def leave(sender)
-        @style.background_canvas.background = default(:background)
-        @text.color = default(:color)
+      def leave(_sender)
+        unless @enabled
+          @style.background_canvas.background = @style.disabled[:background]
+          @text.color = @style.disabled[:color]
+        else
+          @style.background_canvas.background = @style.background
+          @text.color = @style.color
+        end
 
-        return :handled
+        :handled
       end
 
-      def blur(sender)
+      def blur(_sender)
         @focus = false
 
-        return :handled
+        :handled
+      end
+
+      def recalculate
+        unless @enabled
+          @style.background_canvas.background = @style.disabled[:background]
+          @text.color = @style.disabled[:color]
+        else
+          @style.background_canvas.background = @style.background
+          @text.color = @style.color
+        end
+
+        if @image
+          @width = 0
+          @height = 0
+
+          _width = dimensional_size(@style.image_width, :width)
+          _height = dimensional_size(@style.image_height, :height)
+
+          if _width && _height
+            @scale_x = _width.to_f / @image.width
+            @scale_y = _height.to_f / @image.height
+          elsif _width
+            @scale_x = _width.to_f / @image.width
+            @scale_y = @scale_x
+          elsif _height
+            @scale_y = _height.to_f / @image.height
+            @scale_x = @scale_y
+          else
+            @scale_x = 1
+            @scale_y = 1
+          end
+
+          @width = _width || @image.width.round * @scale_x
+          @height = _height || @image.height.round * @scale_y
+
+          update_background
+        else
+          super
+        end
+      end
+
+      def value
+        @image || super
+      end
+
+      def value=(value)
+        if value.is_a?(Gosu::Image)
+          @image = value
+        else
+          super
+        end
+
+        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
   end
-end
+end