Bumped version

lib/cyberarm_engine/ui/border_canvas.rb

@@ -66,31 +66,31 @@ module CyberarmEngine
       @top.z = @element.z
 
       @top.width  = @element.width
-      @top.height = @element.border_thickness_top
+      @top.height = @element.style.border_thickness_top
 
       # RIGHT
       @right.x = @element.x + @element.width
-      @right.y = @element.y + @element.border_thickness_top
+      @right.y = @element.y + @element.style.border_thickness_top
       @right.z = @element.z
 
-      @right.width  = -@element.border_thickness_right
-      @right.height = @element.height - @element.border_thickness_top
+      @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.border_thickness_right
-      @bottom.height = -@element.border_thickness_bottom
+      @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.border_thickness_left
-      @left.height = @element.height - @element.border_thickness_bottom
+      @left.width  = @element.style.border_thickness_left
+      @left.height = @element.height - @element.style.border_thickness_bottom
 
       @top.update
       @right.update

lib/cyberarm_engine/ui/button.rb

@@ -3,7 +3,7 @@ module CyberarmEngine
     def initialize(text, options = {}, block = nil)
       super(text, options, block)
 
-      @background_canvas.background = default(:background)
+      @style.background_canvas.background = default(:background)
     end
 
     def render
@@ -18,17 +18,17 @@ module CyberarmEngine
       @focus = false unless window.button_down?(Gosu::MsLeft)
 
       if @focus
-        @background_canvas.background = default(:active, :background)
+        @style.background_canvas.background = default(:active, :background)
         @text.color = default(:active, :color)
       else
-        @background_canvas.background = default(:hover, :background)
+        @style.background_canvas.background = default(:hover, :background)
         @text.color = default(:hover, :color)
       end
     end
 
     def left_mouse_button(sender, x, y)
       @focus = true
-      @background_canvas.background = default(:active, :background)
+      @style.background_canvas.background = default(:active, :background)
       window.current_state.focus = self
       @text.color = default(:active, :color)
     end
@@ -42,7 +42,7 @@ module CyberarmEngine
     end
 
     def leave(sender)
-      @background_canvas.background = default(:background)
+      @style.background_canvas.background = default(:background)
       @text.color = default(:color)
     end
 

lib/cyberarm_engine/ui/check_box.rb

@@ -12,8 +12,8 @@ module CyberarmEngine
       add(@toggle_button)
       add(@label)
 
-      @width  = @toggle_button.width + @label.width
-      @height = @toggle_button.height + @label.height
+      @style.width  = @toggle_button.width + @label.width
+      @style.height = @toggle_button.height + @label.height
     end
 
     def text=(text)

lib/cyberarm_engine/ui/container.rb

@@ -15,12 +15,9 @@ module CyberarmEngine
       @text_color = options[:color]
 
       @children = []
-
-      @theme = {}
     end
 
     def build
-      @theme.merge(@parent.theme) if @parent
       @block.call(self) if @block
 
       recalculate
@@ -40,14 +37,6 @@ module CyberarmEngine
       @children.each(&:update)
     end
 
-    def theme
-      @theme
-    end
-
-    def color(color)
-      @theme[:color] = color
-    end
-
     def hit_element?(x, y)
       @children.reverse_each do |child|
         case child
@@ -64,25 +53,23 @@ module CyberarmEngine
     end
 
     def recalculate
-      @current_position = Vector.new(@margin_left, @margin_top)
-      unless @visible
-        @width = 0
-        @height= 0
-        return
-      end
+      @current_position = Vector.new(@style.margin_left + @style.padding_left, @style.margin_top + @style.padding_top)
+      return unless visible?
+      stylize
 
       layout
 
-      @width  = @max_width  ? @max_width  : (@children.map {|c| c.x + c.width  + c.margin_right }.max || 0).round
-      @height = @max_height ? @max_height : (@children.map {|c| c.y + c.height + c.margin_bottom}.max || 0).round
+      @style.width  = @max_width  ? @max_width  : (@children.map {|c| c.x + c.outer_width }.max || 0).round
+      @style.height = @max_height ? @max_height : (@children.map {|c| c.y + c.outer_height}.max || 0).round
 
       # Move child to parent after positioning
       @children.each do |child|
         child.x += @x
         child.y += @y
 
-        # Fix child being displaced
+        child.stylize
         child.recalculate
+        child.reposition # TODO: Implement top,bottom,left,center, and right positioning
       end
 
       update_background
@@ -93,7 +80,7 @@ module CyberarmEngine
     end
 
     def max_width
-      @max_width ? @max_width : window.width - (@parent ? @parent.margin_right + @margin_right : @margin_right)
+      @max_width ? @max_width : window.width - (@parent ? @parent.style.margin_right + @style.margin_right : @style.margin_right)
     end
 
     def fits_on_line?(element) # Flow
@@ -102,13 +89,13 @@ module CyberarmEngine
     end
 
     def position_on_current_line(element) # Flow
-      element.x = element.margin_left + @current_position.x
-      element.y = element.margin_top  + @current_position.y
+      element.x = element.style.margin_left + @current_position.x
+      element.y = element.style.margin_top  + @current_position.y
 
       element.recalculate
 
       @current_position.x += element.outer_width
-      @current_position.x = @margin_left if @current_position.x >= max_width
+      @current_position.x = @style.margin_left if @current_position.x >= max_width
     end
 
     def tallest_neighbor(querier, y_position) # Flow
@@ -122,11 +109,11 @@ module CyberarmEngine
     end
 
     def position_on_next_line(child) # Flow
-      @current_position.x = @margin_left
+      @current_position.x = @style.margin_left
       @current_position.y += tallest_neighbor(child, @current_position.y).outer_height
 
-      child.x = child.margin_left + @current_position.x
-      child.y = child.margin_top  + @current_position.y
+      child.x = child.style.margin_left + @current_position.x
+      child.y = child.style.margin_top  + @current_position.y
 
       child.recalculate
 
@@ -134,8 +121,8 @@ module CyberarmEngine
     end
 
     def move_to_next_line(element) # Stack
-      element.x = element.margin_left + @current_position.x
-      element.y = element.margin_top  + @current_position.y
+      element.x = element.style.margin_left + @current_position.x
+      element.y = element.style.margin_top  + @current_position.y
 
       element.recalculate
 

lib/cyberarm_engine/ui/dsl.rb

@@ -2,11 +2,11 @@ module CyberarmEngine
   module DSL
     def flow(options = {}, &block)
       options[:parent] = @containers.last
-      options[:theme] = @current_theme
+      options[:theme] = current_theme
       _container = Flow.new(options, block)
       @containers << _container
       _container.build
-      options[:parent].add(_container)
+      _container.parent.add(_container)
       @containers.pop
 
       return _container
@@ -14,11 +14,11 @@ module CyberarmEngine
 
     def stack(options = {}, &block)
       options[:parent] = @containers.last
-      options[:theme] = @current_theme
+      options[:theme] = current_theme
       _container = Stack.new(options, block)
       @containers << _container
       _container.build
-      options[:parent].add(_container)
+      _container.parent.add(_container)
       @containers.pop
 
       return _container
@@ -26,7 +26,7 @@ module CyberarmEngine
 
     def label(text, options = {}, &block)
       options[:parent] = @containers.last
-      options[:theme] = @current_theme
+      options[:theme] = current_theme
       _element = Label.new(text, options, block)
       @containers.last.add(_element)
 
@@ -35,7 +35,7 @@ module CyberarmEngine
 
     def button(text, options = {}, &block)
       options[:parent] = @containers.last
-      options[:theme] = @current_theme
+      options[:theme] = current_theme
       _element = Button.new(text, options, block) { if block.is_a?(Proc); block.call; end }
       @containers.last.add(_element)
 
@@ -44,7 +44,7 @@ module CyberarmEngine
 
     def edit_line(text, options = {}, &block)
       options[:parent] = @containers.last
-      options[:theme] = @current_theme
+      options[:theme] = current_theme
       _element = EditLine.new(text, options, block)
       @containers.last.add(_element)
 
@@ -53,7 +53,7 @@ module CyberarmEngine
 
     def toggle_button(options = {}, &block)
       options[:parent] = @containers.last
-      options[:theme] = @current_theme
+      options[:theme] = current_theme
       _element = ToggleButton.new(options, block)
       @containers.last.add(_element)
 
@@ -62,7 +62,7 @@ module CyberarmEngine
 
     def check_box(text, options = {}, &block)
       options[:parent] = @containers.last
-      options[:theme] = @current_theme
+      options[:theme] = current_theme
       _element = CheckBox.new(text, options, block)
       @containers.last.add(_element)
 
@@ -71,7 +71,7 @@ module CyberarmEngine
 
     def image(path, options = {}, &block)
       options[:parent] = @containers.last
-      options[:theme] = @current_theme
+      options[:theme] = current_theme
       _element = Image.new(path, options, block)
       @containers.last.add(_element)
 
@@ -79,16 +79,15 @@ module CyberarmEngine
     end
 
     def background(color = Gosu::Color::NONE)
-      @containers.last.background = color
+      @containers.last.style.background = color
     end
 
-    # Foreground color, e.g. Text
-    def color(color)
-      @containers.last.color(color)
+    def theme(theme)
+      @containers.last.options[:theme] = theme
     end
 
-    def set_theme(theme)
-      @current_theme = theme
+    def current_theme
+      @containers.last.options[:theme]
     end
   end
 end

lib/cyberarm_engine/ui/edit_line.rb

@@ -5,7 +5,6 @@ module CyberarmEngine
 
       @type = default(:type)
 
-
       @caret_width = default(:caret_width)
       @caret_height= @text.height
       @caret_color = default(:caret_color)
@@ -20,7 +19,7 @@ module CyberarmEngine
     end
 
     def render
-      Gosu.clip_to(@text.x, @text.y, @width, @text.height) do
+      Gosu.clip_to(@text.x, @text.y, @style.width, @text.height) do
         draw_text
         Gosu.draw_rect(caret_position, @text.y, @caret_width, @caret_height, @caret_color, @z + 40) if @focus && @show_caret
       end
@@ -47,20 +46,23 @@ module CyberarmEngine
 
     def enter(sender)
       if @focus
-        @background_canvas.background = default(:active, :background)
+        @style.background_canvas.background = default(:active, :background)
         @text.color = default(:active, :color)
       else
-        @background_canvas.background = default(:hover, :background)
+        @style.background_canvas.background = default(:hover, :background)
         @text.color = default(:hover, :color)
       end
     end
 
     def leave(sender)
+      unless @focus
+        super
+      end
     end
 
     def blur(sender)
       @focus = false
-      @background_canvas.background = default(:background)
+      @style.background_canvas.background = default(:background)
       @text.color = default(:color)
       window.text_input = nil
     end
@@ -77,13 +79,7 @@ module CyberarmEngine
     def recalculate
       super
 
-      unless @visible
-        @width = 0
-        @height= 0
-        return
-      end
-
-      @width = default(:width)
+      @style.width = default(:width)
       update_background
     end
 

lib/cyberarm_engine/ui/element.rb

@@ -5,100 +5,90 @@ module CyberarmEngine
     include Common
 
     attr_accessor :x, :y, :z, :enabled
-    attr_reader :width, :height, :parent, :options, :event_handler, :background_canvas, :border_canvas
-
-    attr_reader :border_thickness, :border_thickness_left, :border_thickness_right, :border_thickness_top, :border_thickness_bottom
-    attr_reader :border_color, :border_color_left, :border_color_right, :border_color_top, :border_color_bottom
-
-    attr_reader :padding, :padding_left, :padding_right, :padding_top, :padding_bottom
-    attr_reader :margin, :margin_left, :margin_right, :margin_top, :margin_bottom
+    attr_reader :parent, :options, :style, :event_handler, :background_canvas, :border_canvas
 
     def initialize(options = {}, block = nil)
-      @parent = options[:parent] # parent Container (i.e. flow/stack)
+      @parent = options.delete(:parent) # parent Container (i.e. flow/stack)
       options = theme_defaults(options)
       @options = options
       @block = block
 
-      @style             = Style.new(options)
-      @focus             = false
-      @background_canvas = Background.new
-      @border_canvas     = BorderCanvas.new(element: self)
+      @focus   = false
+      @enabled = true
+      @visible = true
 
-      @x = default(:x)
-      @y = default(:y)
-      @z = default(:z)
+      @style = Style.new(options)
+
+      @x = @style.x
+      @y = @style.y
+      @z = @style.z
 
       @fixed_x = @x if @x != 0
       @fixed_y = @y if @y != 0
 
-      @width  = default(:width)  || $window.width
-      @height = default(:height) || $window.height
+      @style.width  = default(:width)  || $window.width
+      @style.height = default(:height) || $window.height
 
-      set_border_thickness(default(:border_thickness))
-
-      set_padding(default(:padding))
-
-      set_margin(default(:margin))
-
-      set_background(default(:background))
-      set_border_color(default(:border_color))
-
-      raise "#{self.class} 'x' must be a number" unless @x.is_a?(Numeric)
-      raise "#{self.class} 'y' must be a number" unless @y.is_a?(Numeric)
-      raise "#{self.class} 'z' must be a number" unless @z.is_a?(Numeric)
-      raise "#{self.class} 'width' must be a number"  unless @width.is_a?(Numeric)  || @width.nil?
-      raise "#{self.class} 'height' must be a number" unless @height.is_a?(Numeric) || @height.nil?
-      raise "#{self.class} 'options' must be a Hash" unless @options.is_a?(Hash)
-
-      # raise "#{self.class} 'padding' must be a number" unless @padding.is_a?(Numeric)
-
-      @enabled = true
-      @visible = true
+      stylize
 
       default_events
     end
 
+    def stylize
+      set_border_thickness(@style.border_thickness)
+
+      set_padding(@style.padding)
+
+      set_margin(@style.margin)
+
+      @style.background_canvas = Background.new
+      @style.border_canvas     = BorderCanvas.new(element: self)
+
+      set_background(@style.background)
+      set_border_color(@style.border_color)
+    end
+
     def set_background(background)
-      @background = background
-      @background_canvas.background = background
+      @style.background = background
+      @style.background_canvas.background = background
     end
 
     def set_border_thickness(border_thickness)
-      @border_thickness = border_thickness
+      @style.border_thickness = border_thickness
 
-      @border_thickness_left   = default(:border_thickness_left)   || @border_thickness
-      @border_thickness_right  = default(:border_thickness_right)  || @border_thickness
-      @border_thickness_top    = default(:border_thickness_top)    || @border_thickness
-      @border_thickness_bottom = default(:border_thickness_bottom) || @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)
-      @border_color = color
+      @style.border_color = color
 
-      @border_color_left   = default(:border_color_left)   || @border_color
-      @border_color_right  = default(:border_color_right)  || @border_color
-      @border_color_top    = default(:border_color_top)    || @border_color
-      @border_color_bottom = default(:border_color_bottom) || @border_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
 
-      @border_canvas.color = color
+      @style.border_canvas.color = color
     end
 
     def set_padding(padding)
-      @padding = padding
+      @style.padding = padding
 
-      @padding_left   = default(:padding_left)   || @padding
-      @padding_right  = default(:padding_right)  || @padding
-      @padding_top    = default(:padding_top)    || @padding
-      @padding_bottom = default(:padding_bottom) || @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)
-      @margin = margin
+      @style.margin = margin
 
-      @margin_left   = default(:margin_left)   || @margin
-      @margin_right  = default(:margin_right)  || @margin
-      @margin_top    = default(:margin_top)    || @margin
-      @margin_bottom = default(:margin_bottom) || @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
@@ -145,8 +135,8 @@ module CyberarmEngine
     def draw
       return unless @visible
 
-      @background_canvas.draw
-      @border_canvas.draw
+      @style.background_canvas.draw
+      @style.border_canvas.draw
       render
     end
 
@@ -168,44 +158,44 @@ module CyberarmEngine
     end
 
     def width
-      (@border_thickness_left + @padding_left) + @width + (@padding_right + @border_thickness_right)
-    end
-
-    def outer_width
-      @margin_left + width + @margin_right
-    end
-
-    def height
-      (@border_thickness_top + @padding_top) + @height + (@padding_bottom + @border_thickness_bottom)
-    end
-
-    def outer_height
-      @margin_top + height + @margin_bottom
-    end
-
-    def style(hash)
-      if hash
-        @style.set(hash)
+      if visible?
+        (@style.border_thickness_left + @style.padding_left) + @style.width + (@style.padding_right + @style.border_thickness_right)
       else
-        @style.hash
+        0
       end
     end
 
+    def outer_width
+      @style.margin_left + width + @style.margin_right
+    end
+
+    def height
+      if visible?
+        (@style.border_thickness_top + @style.padding_top) + @style.height + (@style.padding_bottom + @style.border_thickness_bottom)
+      else
+        0
+      end
+    end
+
+    def outer_height
+      @style.margin_top + height + @style.margin_bottom
+    end
+
     def background=(_background)
-      @background_canvas.background=(_background)
+      @style.background_canvas.background=(_background)
       update_background
     end
 
     def update_background
-      @background_canvas.x = @x
-      @background_canvas.y = @y
-      @background_canvas.z = @z
-      @background_canvas.width  = width
-      @background_canvas.height = height
+      @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
 
-      @background_canvas.update
+      @style.background_canvas.update
 
-      @border_canvas.update
+      @style.border_canvas.update
     end
 
     def root
@@ -229,7 +219,6 @@ module CyberarmEngine
     end
 
     def reposition
-      raise "#{self.class}#reposition was not overridden!"
     end
 
     def value

lib/cyberarm_engine/ui/image.rb

@@ -23,7 +23,11 @@ module CyberarmEngine
     end
 
     def render
-      @image.draw(@border_thickness_left + @padding_left + @x, @border_thickness_top + @padding_top + @y, @z + 2, @scale_x, @scale_y) # TODO: Add color support?
+      @image.draw(
+        @style.border_thickness_left + @style.padding_left + @x,
+        @style.border_thickness_top + @style.padding_top + @y,
+        @z + 2,
+        @scale_x, @scale_y) # TODO: Add color support?
     end
 
     def clicked_left_mouse_button(sender, x, y)
@@ -31,14 +35,8 @@ module CyberarmEngine
     end
 
     def recalculate
-      unless @visible
-        @width = 0
-        @height= 0
-        return
-      end
-
-      @width  = @image.width * @scale_x
-      @height = @image.height * @scale_y
+      @style.width  = @image.width * @scale_x
+      @style.height = @image.height * @scale_y
     end
 
     def value

lib/cyberarm_engine/ui/label.rb

@@ -17,17 +17,11 @@ module CyberarmEngine
     end
 
     def recalculate
-      unless @visible
-        @width = 0
-        @height= 0
-        return
-      end
+      @style.width = @text.width.round
+      @style.height= @text.height.round
 
-      @width = @text.width.round
-      @height= @text.height.round
-
-      @text.x = @border_thickness_left + @padding_left + @x
-      @text.y = @border_thickness_top + @padding_top  + @y
+      @text.x = @style.border_thickness_left + @style.padding_left + @x
+      @text.y = @style.border_thickness_top + @style.padding_top  + @y
       @text.z = @z + 3
 
       update_background

lib/cyberarm_engine/ui/style.rb

@@ -1,15 +1,37 @@
+module Gosu
+  class Color
+    def _dump(level)
+      [
+        "%02X" % self.alpha,
+        "%02X" % self.red,
+        "%02X" % self.green,
+        "%02X" % self.blue
+      ].join
+    end
+
+    def self._load(hex)
+      argb(hex.to_i(16))
+    end
+  end
+end
+
 module CyberarmEngine
   class Style
-    def initialize(hash)
-      @hash = hash
+    def initialize(hash = {})
+      @hash = Marshal.load(Marshal.dump(hash))
     end
 
-    def hash
-      @hash
-    end
+    def method_missing(method, *args, &block)
+      if method.to_s.end_with?("=")
+        raise "Did not expect more than 1 argument" if args.size > 1
+        return @hash[method.to_s.sub("=", "").to_sym] = args.first
 
-    def set(hash)
-      @hash.merge!(hash)
+      elsif args.size == 0
+        return @hash[method]
+
+      else
+        raise ArgumentError, "Did not expect arguments"
+      end
     end
   end
 end

lib/cyberarm_engine/ui/theme.rb

@@ -13,7 +13,7 @@ module CyberarmEngine
       raise "Error" unless self.class.ancestors.include?(CyberarmEngine::Element)
       _theme = THEME
       _theme = _theme.merge(options[:theme]) if options[:theme]
-      options.delete(:theme)
+      _theme.delete(:theme) if options[:theme]
 
       hash = {}
       class_names = self.class.ancestors

lib/cyberarm_engine/ui/toggle_button.rb

@@ -38,13 +38,7 @@ module CyberarmEngine
     def recalculate
       super
 
-      unless @visible
-        @width = 0
-        @height= 0
-        return
-      end
-
-      @width = @text.textobject.text_width(@options[:checkmark])
+      @style.width = @text.textobject.text_width(@options[:checkmark])
       update_background
     end
 

lib/cyberarm_engine/version.rb

@@ -1,4 +1,4 @@
 module CyberarmEngine
   NAME    = "InDev"
-  VERSION = "0.7.0"
+  VERSION = "0.8.1"
 end