cyberarm_engine 0.12.1 → 0.13.0

data/lib/cyberarm_engine/ui/border_canvas.rb

@@ -1,101 +1,101 @@
-module CyberarmEngine
-  class BorderCanvas
-    attr_reader :element, :top, :right, :bottom, :left
-    def initialize(element:)
-      @element = element
-
-      @top    = Background.new
-      @right  = Background.new
-      @bottom = Background.new
-      @left   = Background.new
-    end
-
-    def color=(color)
-      if color.is_a?(Numeric)
-        @top.background    = color
-        @right.background  = color
-        @bottom.background = color
-        @left.background   = color
-
-      elsif color.is_a?(Gosu::Color)
-        @top.background    = color
-        @right.background  = color
-        @bottom.background = color
-        @left.background   = color
-
-      elsif color.is_a?(Array)
-        if color.size == 1
-          color=color.first
-
-        elsif color.size == 2
-          @top.background    = color.first
-          @right.background  = color.first
-          @bottom.background = color.last
-          @left.background   = color.last
-
-        elsif color.size == 4
-          @top.background    = color[0]
-          @right.background  = color[1]
-          @bottom.background = color[2]
-          @left.background   = color[3]
-        else
-          raise ArgumentError, "color array was empty or had wrong number of elements (expected 2 or 4 elements)"
-        end
-
-      elsif color.is_a?(Hash)
-        @top.background    = color[:top]
-        @right.background  = color[:right]
-        @bottom.background = color[:bottom]
-        @left.background   = color[:left]
-      else
-        raise ArgumentError, "color '#{color}' of type '#{color.class}' was not able to be processed"
-      end
-    end
-
-    def draw
-      @top.draw
-      @right.draw
-      @bottom.draw
-      @left.draw
-    end
-
-    def update
-      # TOP
-      @top.x = @element.x# + @element.border_thickness_left
-      @top.y = @element.y
-      @top.z = @element.z
-
-      @top.width  = @element.width
-      @top.height = @element.style.border_thickness_top
-
-      # RIGHT
-      @right.x = @element.x + @element.width
-      @right.y = @element.y + @element.style.border_thickness_top
-      @right.z = @element.z
-
-      @right.width  = -@element.style.border_thickness_right
-      @right.height = @element.height - @element.style.border_thickness_top
-
-      # BOTTOM
-      @bottom.x = @element.x
-      @bottom.y = @element.y + @element.height
-      @bottom.z = @element.z
-
-      @bottom.width  = @element.width - @element.style.border_thickness_right
-      @bottom.height = -@element.style.border_thickness_bottom
-
-      # LEFT
-      @left.x = @element.x
-      @left.y = @element.y
-      @left.z = @element.z
-
-      @left.width  = @element.style.border_thickness_left
-      @left.height = @element.height - @element.style.border_thickness_bottom
-
-      @top.update
-      @right.update
-      @bottom.update
-      @left.update
-    end
-  end
+module CyberarmEngine
+  class BorderCanvas
+    attr_reader :element, :top, :right, :bottom, :left
+    def initialize(element:)
+      @element = element
+
+      @top    = Background.new
+      @right  = Background.new
+      @bottom = Background.new
+      @left   = Background.new
+    end
+
+    def color=(color)
+      if color.is_a?(Numeric)
+        @top.background    = color
+        @right.background  = color
+        @bottom.background = color
+        @left.background   = color
+
+      elsif color.is_a?(Gosu::Color)
+        @top.background    = color
+        @right.background  = color
+        @bottom.background = color
+        @left.background   = color
+
+      elsif color.is_a?(Array)
+        if color.size == 1
+          color=color.first
+
+        elsif color.size == 2
+          @top.background    = color.first
+          @right.background  = color.first
+          @bottom.background = color.last
+          @left.background   = color.last
+
+        elsif color.size == 4
+          @top.background    = color[0]
+          @right.background  = color[1]
+          @bottom.background = color[2]
+          @left.background   = color[3]
+        else
+          raise ArgumentError, "color array was empty or had wrong number of elements (expected 2 or 4 elements)"
+        end
+
+      elsif color.is_a?(Hash)
+        @top.background    = color[:top]
+        @right.background  = color[:right]
+        @bottom.background = color[:bottom]
+        @left.background   = color[:left]
+      else
+        raise ArgumentError, "color '#{color}' of type '#{color.class}' was not able to be processed"
+      end
+    end
+
+    def draw
+      @top.draw
+      @right.draw
+      @bottom.draw
+      @left.draw
+    end
+
+    def update
+      # TOP
+      @top.x = @element.x# + @element.border_thickness_left
+      @top.y = @element.y
+      @top.z = @element.z
+
+      @top.width  = @element.width
+      @top.height = @element.style.border_thickness_top
+
+      # RIGHT
+      @right.x = @element.x + @element.width
+      @right.y = @element.y + @element.style.border_thickness_top
+      @right.z = @element.z
+
+      @right.width  = -@element.style.border_thickness_right
+      @right.height = @element.height - @element.style.border_thickness_top
+
+      # BOTTOM
+      @bottom.x = @element.x
+      @bottom.y = @element.y + @element.height
+      @bottom.z = @element.z
+
+      @bottom.width  = @element.width - @element.style.border_thickness_right
+      @bottom.height = -@element.style.border_thickness_bottom
+
+      # LEFT
+      @left.x = @element.x
+      @left.y = @element.y
+      @left.z = @element.z
+
+      @left.width  = @element.style.border_thickness_left
+      @left.height = @element.height - @element.style.border_thickness_bottom
+
+      @top.update
+      @right.update
+      @bottom.update
+      @left.update
+    end
+  end
 end

data/lib/cyberarm_engine/ui/dsl.rb

@@ -1,102 +1,99 @@
-module CyberarmEngine
-  module DSL
-    def flow(options = {}, &block)
-      options[:parent] = @containers.last
-      options[:theme] = current_theme
-      _container = Element::Flow.new(options, block)
-      @containers << _container
-      _container.build
-      _container.parent.add(_container)
-      @containers.pop
-
-      return _container
-    end
-
-    def stack(options = {}, &block)
-      options[:parent] = @containers.last
-      options[:theme] = current_theme
-      _container = Element::Stack.new(options, block)
-      @containers << _container
-      _container.build
-      _container.parent.add(_container)
-      @containers.pop
-
-      return _container
-    end
-
-    def label(text, options = {}, &block)
-      options[:parent] = @containers.last
-      options[:theme] = current_theme
-      _element = Element::Label.new(text, options, block)
-      @containers.last.add(_element)
-
-      return _element
-    end
-
-    def button(text, options = {}, &block)
-      options[:parent] = @containers.last
-      options[:theme] = current_theme
-      _element = Element::Button.new(text, options, block) { if block.is_a?(Proc); block.call; end }
-      @containers.last.add(_element)
-
-      return _element
-    end
-
-    def edit_line(text, options = {}, &block)
-      options[:parent] = @containers.last
-      options[:theme] = current_theme
-      _element = Element::EditLine.new(text, options, block)
-      @containers.last.add(_element)
-
-      return _element
-    end
-
-    def toggle_button(options = {}, &block)
-      options[:parent] = @containers.last
-      options[:theme] = current_theme
-      _element = Element::ToggleButton.new(options, block)
-      @containers.last.add(_element)
-
-      return _element
-    end
-
-    def check_box(text, options = {}, &block)
-      options[:parent] = @containers.last
-      options[:theme] = current_theme
-      _element = Element::CheckBox.new(text, options, block)
-      @containers.last.add(_element)
-
-      return _element
-    end
-
-    def image(path, options = {}, &block)
-      options[:parent] = @containers.last
-      options[:theme] = current_theme
-      _element = Element::Image.new(path, options, block)
-      @containers.last.add(_element)
-
-      return _element
-    end
-
-    def progress(options = {}, &block)
-      options[:parent] = @containers.last
-      options[:theme] = current_theme
-      _element = Element::Progress.new(options, block)
-      @containers.last.add(_element)
-
-      return _element
-    end
-
-    def background(color = Gosu::Color::NONE)
-      @containers.last.style.background = color
-    end
-
-    def theme(theme)
-      @containers.last.options[:theme] = theme
-    end
-
-    def current_theme
-      @containers.last.options[:theme]
-    end
-  end
+module CyberarmEngine
+  module DSL
+    def flow(options = {}, &block)
+      container(CyberarmEngine::Element::Flow, options, &block)
+    end
+
+    def stack(options = {}, &block)
+      container(CyberarmEngine::Element::Stack, options, &block)
+    end
+
+    def label(text, options = {}, &block)
+      options[:parent] = element_parent
+      options[:theme] = current_theme
+
+      add_element( Element::Label.new(text, options, block) )
+    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 } )
+    end
+
+    def edit_line(text, options = {}, &block)
+      options[:parent] = element_parent
+      options[:theme] = current_theme
+
+      add_element( Element::EditLine.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) )
+    end
+
+    def check_box(text, options = {}, &block)
+      options[:parent] = element_parent
+      options[:theme] = current_theme
+
+      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) )
+    end
+
+    def progress(options = {}, &block)
+      options[:parent] = element_parent
+      options[:theme] = current_theme
+
+      add_element( Element::Progress.new(options, block) )
+    end
+
+    def background(color = Gosu::Color::NONE)
+      element_parent.style.background = color
+    end
+
+    def theme(theme)
+      element_parent.options[:theme] = theme
+    end
+
+    def current_theme
+      element_parent.options[:theme]
+    end
+
+    private def add_element(element)
+      element_parent.add(element)
+
+      return element
+    end
+
+    private def element_parent
+      $__current_container__
+    end
+
+    private def container(klass, options = {}, &block)
+      options[:parent] = element_parent
+      options[:theme] = current_theme
+
+      _container = klass.new(options, block)
+
+      old_parent = element_parent
+      $__current_container__ = _container
+
+      _container.build
+      _container.parent.add(_container)
+
+      $__current_container__ = old_parent
+
+      return _container
+    end
+  end
 end

data/lib/cyberarm_engine/ui/element.rb

@@ -1,260 +1,276 @@
-module CyberarmEngine
-  class Element
-    include Theme
-    include Event
-    include Common
-
-    attr_accessor :x, :y, :z, :enabled
-    attr_reader :parent, :options, :style, :event_handler, :background_canvas, :border_canvas
-
-    def initialize(options = {}, block = nil)
-      @parent = options.delete(:parent) # parent Container (i.e. flow/stack)
-      options = theme_defaults(options)
-      @options = options
-      @block = block
-
-      @focus   = false
-      @enabled = true
-      @visible = true
-
-      @style = Style.new(options)
-
-      @x = @style.x
-      @y = @style.y
-      @z = @style.z
-
-      @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
-
-      @style.background_canvas = Background.new
-      @style.border_canvas     = BorderCanvas.new(element: self)
-
-      stylize
-
-      default_events
-    end
-
-    def stylize
-      set_border_thickness(@style.border_thickness)
-
-      set_padding(@style.padding)
-
-      set_margin(@style.margin)
-
-      set_background(@style.background)
-      set_border_color(@style.border_color)
-    end
-
-    def set_background(background)
-      @style.background = background
-      @style.background_canvas.background = background
-    end
-
-    def set_border_thickness(border_thickness)
-      @style.border_thickness = border_thickness
-
-      @style.border_thickness_left   = default(:border_thickness_left)   || @style.border_thickness
-      @style.border_thickness_right  = default(:border_thickness_right)  || @style.border_thickness
-      @style.border_thickness_top    = default(:border_thickness_top)    || @style.border_thickness
-      @style.border_thickness_bottom = default(:border_thickness_bottom) || @style.border_thickness
-    end
-
-    def set_border_color(color)
-      @style.border_color = color
-
-      @style.border_color_left   = default(:border_color_left)   || @style.border_color
-      @style.border_color_right  = default(:border_color_right)  || @style.border_color
-      @style.border_color_top    = default(:border_color_top)    || @style.border_color
-      @style.border_color_bottom = default(:border_color_bottom) || @style.border_color
-
-      @style.border_canvas.color = color
-    end
-
-    def set_padding(padding)
-      @style.padding = padding
-
-      @style.padding_left   = default(:padding_left)   || @style.padding
-      @style.padding_right  = default(:padding_right)  || @style.padding
-      @style.padding_top    = default(:padding_top)    || @style.padding
-      @style.padding_bottom = default(:padding_bottom) || @style.padding
-    end
-
-    def set_margin(margin)
-      @style.margin = margin
-
-      @style.margin_left   = default(:margin_left)   || @style.margin
-      @style.margin_right  = default(:margin_right)  || @style.margin
-      @style.margin_top    = default(:margin_top)    || @style.margin
-      @style.margin_bottom = default(:margin_bottom) || @style.margin
-    end
-
-    def default_events
-      [:left, :middle, :right].each do |button|
-        event(:"#{button}_mouse_button")
-        event(:"released_#{button}_mouse_button")
-        event(:"clicked_#{button}_mouse_button")
-        event(:"holding_#{button}_mouse_button")
-      end
-
-      event(:mouse_wheel_up)
-      event(:mouse_wheel_down)
-
-      event(:enter)
-      event(:hover)
-      event(:leave)
-
-      event(:blur)
-    end
-
-    def enabled?
-      @enabled
-    end
-
-    def visible?
-      @visible
-    end
-
-    def toggle
-      @visible = !@visible
-      root.gui_state.request_recalculate
-    end
-
-    def show
-      @visible = true
-      root.gui_state.request_recalculate
-    end
-
-    def hide
-      @visible = false
-      root.gui_state.request_recalculate
-    end
-
-    def draw
-      return unless @visible
-
-      @style.background_canvas.draw
-      @style.border_canvas.draw
-      render
-    end
-
-    def update
-    end
-
-    def button_down(id)
-    end
-
-    def button_up(id)
-    end
-
-    def render
-    end
-
-    def hit?(x, y)
-      x.between?(@x, @x + width) &&
-      y.between?(@y, @y + height)
-    end
-
-    def width
-      if visible?
-        inner_width + @width
-      else
-        0
-      end
-    end
-
-    def outer_width
-      @style.margin_left + width + @style.margin_right
-    end
-
-    def inner_width
-      (@style.border_thickness_left + @style.padding_left) + (@style.padding_right + @style.border_thickness_right)
-    end
-
-    def height
-      if visible?
-        inner_height + @height
-      else
-        0
-      end
-    end
-
-    def outer_height
-      @style.margin_top + height + @style.margin_bottom
-    end
-
-    def inner_height
-      (@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
-      if size && size.is_a?(Numeric)
-        if size.between?(0.0, 1.0)
-          @parent.send(:"#{dimension}") * size
-        else
-          size
-        end
-      else
-        nil
-      end
-    end
-
-    def background=(_background)
-      @style.background_canvas.background=(_background)
-      update_background
-    end
-
-    def update_background
-      @style.background_canvas.x = @x
-      @style.background_canvas.y = @y
-      @style.background_canvas.z = @z
-      @style.background_canvas.width  = width
-      @style.background_canvas.height = height
-
-      @style.background_canvas.update
-
-      @style.border_canvas.update
-    end
-
-    def root
-      unless @root && @root.parent.nil?
-        @root = parent
-
-        loop do
-          if @root.parent.nil?
-            break
-          else
-            @root = @root.parent
-          end
-        end
-      end
-
-      @root
-    end
-
-    def is_root?
-      @gui_state != nil
-    end
-
-    def recalculate
-      raise "#{self.class}#recalculate was not overridden!"
-    end
-
-    def reposition
-    end
-
-    def value
-      raise "#{self.class}#value was not overridden!"
-    end
-
-    def value=(value)
-      raise "#{self.class}#value= was not overridden!"
-    end
-  end
+module CyberarmEngine
+  class Element
+    include Theme
+    include Event
+    include Common
+
+    attr_accessor :x, :y, :z, :enabled
+    attr_reader :parent, :options, :style, :event_handler, :background_canvas, :border_canvas
+
+    def initialize(options = {}, block = nil)
+      @parent = options.delete(:parent) # parent Container (i.e. flow/stack)
+      options = theme_defaults(options)
+      @options = options
+      @block = block
+
+      @focus   = false
+      @enabled = true
+      @visible = true
+
+      @style = Style.new(options)
+
+      @x = @style.x
+      @y = @style.y
+      @z = @style.z
+
+      @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
+
+      @style.background_canvas = Background.new
+      @style.border_canvas     = BorderCanvas.new(element: self)
+
+      stylize
+
+      default_events
+    end
+
+    def stylize
+      set_border_thickness(@style.border_thickness)
+
+      set_padding(@style.padding)
+
+      set_margin(@style.margin)
+
+      set_background(@style.background)
+      set_border_color(@style.border_color)
+    end
+
+    def set_background(background)
+      @style.background = background
+      @style.background_canvas.background = background
+    end
+
+    def set_border_thickness(border_thickness)
+      @style.border_thickness = border_thickness
+
+      @style.border_thickness_left   = default(:border_thickness_left)   || @style.border_thickness
+      @style.border_thickness_right  = default(:border_thickness_right)  || @style.border_thickness
+      @style.border_thickness_top    = default(:border_thickness_top)    || @style.border_thickness
+      @style.border_thickness_bottom = default(:border_thickness_bottom) || @style.border_thickness
+    end
+
+    def set_border_color(color)
+      @style.border_color = color
+
+      @style.border_color_left   = default(:border_color_left)   || @style.border_color
+      @style.border_color_right  = default(:border_color_right)  || @style.border_color
+      @style.border_color_top    = default(:border_color_top)    || @style.border_color
+      @style.border_color_bottom = default(:border_color_bottom) || @style.border_color
+
+      @style.border_canvas.color = color
+    end
+
+    def set_padding(padding)
+      @style.padding = padding
+
+      @style.padding_left   = default(:padding_left)   || @style.padding
+      @style.padding_right  = default(:padding_right)  || @style.padding
+      @style.padding_top    = default(:padding_top)    || @style.padding
+      @style.padding_bottom = default(:padding_bottom) || @style.padding
+    end
+
+    def set_margin(margin)
+      @style.margin = margin
+
+      @style.margin_left   = default(:margin_left)   || @style.margin
+      @style.margin_right  = default(:margin_right)  || @style.margin
+      @style.margin_top    = default(:margin_top)    || @style.margin
+      @style.margin_bottom = default(:margin_bottom) || @style.margin
+    end
+
+    def default_events
+      [:left, :middle, :right].each do |button|
+        event(:"#{button}_mouse_button")
+        event(:"released_#{button}_mouse_button")
+        event(:"clicked_#{button}_mouse_button")
+        event(:"holding_#{button}_mouse_button")
+      end
+
+      event(:mouse_wheel_up)
+      event(:mouse_wheel_down)
+
+      event(:enter)
+      event(:hover)
+      event(:leave)
+
+      event(:blur)
+    end
+
+    def enabled?
+      @enabled
+    end
+
+    def visible?
+      @visible
+    end
+
+    def toggle
+      @visible = !@visible
+      root.gui_state.request_recalculate
+    end
+
+    def show
+      @visible = true
+      root.gui_state.request_recalculate
+    end
+
+    def hide
+      @visible = false
+      root.gui_state.request_recalculate
+    end
+
+    def draw
+      return unless @visible
+
+      @style.background_canvas.draw
+      @style.border_canvas.draw
+      render
+    end
+
+    def update
+    end
+
+    def button_down(id)
+    end
+
+    def button_up(id)
+    end
+
+    def render
+    end
+
+    def hit?(x, y)
+      x.between?(@x, @x + width) &&
+      y.between?(@y, @y + height)
+    end
+
+    def width
+      if visible?
+        inner_width + @width
+      else
+        0
+      end
+    end
+
+    def content_width
+      @width
+    end
+
+    def noncontent_width
+      (inner_width + outer_width) - width
+    end
+
+    def outer_width
+      @style.margin_left + width + @style.margin_right
+    end
+
+    def inner_width
+      (@style.border_thickness_left + @style.padding_left) + (@style.padding_right + @style.border_thickness_right)
+    end
+
+    def height
+      if visible?
+        inner_height + @height
+      else
+        0
+      end
+    end
+
+    def content_height
+      @height
+    end
+
+    def noncontent_height
+      (inner_height + outer_height) - height
+    end
+
+    def outer_height
+      @style.margin_top + height + @style.margin_bottom
+    end
+
+    def inner_height
+      (@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
+      if size && size.is_a?(Numeric)
+        if size.between?(0.0, 1.0)
+          ((@parent.send(:"content_#{dimension}") - self.send(:"noncontent_#{dimension}") - 1) * size).round
+        else
+          size
+        end
+      else
+        nil
+      end
+    end
+
+    def background=(_background)
+      @style.background_canvas.background=(_background)
+      update_background
+    end
+
+    def update_background
+      @style.background_canvas.x = @x
+      @style.background_canvas.y = @y
+      @style.background_canvas.z = @z
+      @style.background_canvas.width  = width
+      @style.background_canvas.height = height
+
+      @style.background_canvas.update
+
+      @style.border_canvas.update
+    end
+
+    def root
+      unless @root && @root.parent.nil?
+        @root = parent
+
+        loop do
+          if @root.parent.nil?
+            break
+          else
+            @root = @root.parent
+          end
+        end
+      end
+
+      @root
+    end
+
+    def is_root?
+      @gui_state != nil
+    end
+
+    def recalculate
+      raise "#{self.class}#recalculate was not overridden!"
+    end
+
+    def reposition
+    end
+
+    def value
+      raise "#{self.class}#value was not overridden!"
+    end
+
+    def value=(value)
+      raise "#{self.class}#value= was not overridden!"
+    end
+  end
 end