Bump version

README.md

@@ -35,7 +35,7 @@ class Hello < CyberarmEngine::GuiState
     background Gosu::Color::GRAY
 
     stack do
-      banner "Hello World!"
+      label "Hello World!"
 
       button "close" do
         window.close

lib/cyberarm_engine.rb

@@ -10,7 +10,6 @@ require "json"
 require_relative "cyberarm_engine/version"
 require_relative "cyberarm_engine/stats"
 require_relative "cyberarm_engine/result"
-require_relative "cyberarm_engine/event_bus"
 
 require_relative "cyberarm_engine/common"
 
@@ -59,7 +58,6 @@ require_relative "cyberarm_engine/ui/elements/image"
 require_relative "cyberarm_engine/ui/elements/container"
 require_relative "cyberarm_engine/ui/elements/flow"
 require_relative "cyberarm_engine/ui/elements/stack"
-require_relative "cyberarm_engine/ui/elements/widget"
 require_relative "cyberarm_engine/ui/elements/check_box"
 require_relative "cyberarm_engine/ui/elements/radio"
 require_relative "cyberarm_engine/ui/elements/progress"
@@ -69,8 +67,6 @@ require_relative "cyberarm_engine/ui/elements/menu_item"
 
 require_relative "cyberarm_engine/game_state"
 require_relative "cyberarm_engine/ui/gui_state"
-require_relative "cyberarm_engine/ui/dialog"
-require_relative "cyberarm_engine/ui/page"
 
 require_relative "cyberarm_engine/builtin/intro_state"
 

lib/cyberarm_engine/background.rb

@@ -21,27 +21,19 @@ module CyberarmEngine
     end
 
     def draw
-      if @angle.zero?
+      Gosu.clip_to(@x, @y, @width, @height) do
-        render
+        Gosu.draw_quad(
-      else
+          @top_left.x,     @top_left.y,     @paint.top_left,
-        Gosu.clip_to(@x, @y, @width, @height) do
+          @top_right.x,    @top_right.y,    @paint.top_right,
-          render
+          @bottom_right.x, @bottom_right.y, @paint.bottom_right,
-        end
+          @bottom_left.x,  @bottom_left.y,  @paint.bottom_left,
+          @z
+        )
       end
 
       debug_outline if @debug
     end
 
-    def render
-      Gosu.draw_quad(
-        @top_left.x,     @top_left.y,     @paint.top_left,
-        @top_right.x,    @top_right.y,    @paint.top_right,
-        @bottom_right.x, @bottom_right.y, @paint.bottom_right,
-        @bottom_left.x,  @bottom_left.y,  @paint.bottom_left,
-        @z
-      )
-    end
-
     def update
       @top_left.x     = @x
       @top_left.y     = @y
@@ -154,3 +146,13 @@ module CyberarmEngine
     end
   end
 end
+
+# Add <=> method to support Range based gradients
+# NOTE: Disabled, causes stack overflow 🙃
+# module Gosu
+#   class Color
+#     def <=>(_other)
+#       self
+#     end
+#   end
+# end

lib/cyberarm_engine/background_nine_slice.rb

@@ -1,11 +1,8 @@
 module CyberarmEngine
   class BackgroundNineSlice
     include CyberarmEngine::Common
-
+    attr_accessor :x, :y, :z, :width, :height, :left, :top, :right, :bottom, :mode, :color
-    CACHE = {}
+    attr_reader :image
-
-    attr_accessor :x, :y, :z, :width, :height, :mode, :color
-    attr_reader :image, :left, :top, :right, :bottom
 
     def initialize(image_path: nil, x: 0, y: 0, z: 0, width: 0, height: 0, mode: :tiled, left: 1, top: 1, right: 1, bottom: 1, color: Gosu::Color::WHITE)
       @image = get_image(image_path) if image_path
@@ -35,43 +32,8 @@ module CyberarmEngine
       nine_slice if @image && old_image != @image
     end
 
-    def set_edges(left: @left, right: @right, top: @top, bottom: @bottom)
-      changed = [left == @left, right == @right, top == @top, bottom == @bottom].any?(false)
-
-      @left = left
-      @top = top
-      @right = right
-      @bottom = bottom
-
-      nine_slice if changed
-    end
-
-    def left=(n)
-      nine_slice if n != @left
-      @left = n
-      n
-    end
-
-    def right=(n)
-      nine_slice if n != @right
-      @right = n
-      n
-    end
-
-    def top=(n)
-      nine_slice if n != @top
-      @top = n
-      n
-    end
-
-    def bottom=(n)
-      nine_slice if n != @bottom
-      @bottom = n
-      n
-    end
-
     def nine_slice
-      # pp [@left, @top, @right, @bottom, @image.width, @image.height]
+      # pp [@left, @top, @right, @bottom, @image.width]
 
       @segment_top_left = @image.subimage(0, 0, @left, @top)
       @segment_top_right = @image.subimage(@image.width - @right, 0, @right, @top)
@@ -130,7 +92,6 @@ module CyberarmEngine
       @segment_bottom.draw(@x + @segment_bottom_left.width, (@y + @height) - @segment_bottom.height, @z, width_scale, 1, @color) # SCALE X
       @segment_bottom_left.draw(@x, (@y + @height) - @segment_bottom_left.height, @z, 1, 1, @color)
       @segment_left.draw(@x, @y + @top, @z, 1, height_scale, @color) # SCALE Y
-
       @segment_middle.draw(@x + @segment_top_left.width, @y + @segment_top.height, @z, width_scale, height_scale, @color) # SCALE X and SCALE Y
     end
 

lib/cyberarm_engine/event_bus.rb

@@ -1,39 +0,0 @@
-module CyberarmEngine
-  class EventBus
-    Subscriber = Data.define(:event, :listener, :method, :callback)
-    @subscribers = []
-
-    def self.subscribe(event, listener = nil, method = nil, &block)
-      raise "Subscriber cannot have both a method AND a callback block" if method && block_given?
-
-      subscriber = Subscriber.new(event, listener, method, block)
-      @subscribers << subscriber
-
-      subscriber
-    end
-
-    def self.unsubscribe(event, listener_or_subscriber)
-      @subscribers.delete_if { |s| s.event == event && (s == listener_or_subscriber || s.listener == listener_or_subscriber) }
-    end
-
-    def self.unsubscribe!(event)
-      @subscribers.delete_if { |s| s.event == event }
-    end
-
-    def self.announce(event, *payload)
-      subscribers = @subscribers.select { |s| s.event == event }
-
-      subscribers.each do |subscriber|
-        subscriber&.listener&.send(subscriber.method, *payload) if subscriber&.method
-        subscriber.callback&.call(*payload)
-      rescue StandardError => e
-        # TODO
-        warn "Failed to deliver event (#{event}) to listener (#{subscriber.inspect}): #{e}"
-      end
-    end
-
-    def self.publish(*args)
-      announce(*args)
-    end
-  end
-end

lib/cyberarm_engine/game_state.rb

@@ -3,12 +3,11 @@ module CyberarmEngine
     include Common
 
     attr_accessor :options, :global_pause
-    attr_reader :game_objects, :timers
+    attr_reader :game_objects
 
     def initialize(options = {})
       @options = options
       @game_objects = []
-      @timers = []
       @global_pause = false
       window.text_input = nil unless options[:preserve_text_input]
 
@@ -29,8 +28,6 @@ module CyberarmEngine
 
     def update
       @game_objects.each(&:update)
-      @timers.each(&:update)
-      @timers.delete_if(&:dead?)
     end
 
     def needs_redraw?
@@ -123,9 +120,5 @@ module CyberarmEngine
     def add_game_object(object)
       @game_objects << object
     end
-
-    def add_timer(timer)
-      @timers << timer
-    end
   end
 end

lib/cyberarm_engine/result.rb

@@ -9,7 +9,7 @@ module CyberarmEngine
     end
 
     def okay?
-      !error?
+      !@error
     end
 
     def error?
@@ -17,3 +17,4 @@ module CyberarmEngine
     end
   end
 end
+

lib/cyberarm_engine/text.rb

@@ -23,7 +23,7 @@ module CyberarmEngine
         @color = Gosu::Color::WHITE
       end
       @mode      = options[:mode]      || :default
-      @alignment = options[:alignment] || :left
+      @alignment = options[:alignment] || nil
 
       @border   = options[:border]
       @border   = true if options[:border].nil?
@@ -39,6 +39,17 @@ module CyberarmEngine
       @static = options[:static] || (options[:static].nil? || options[:static] == false ? false : true)
 
       @textobject = check_cache(@size, @font)
+
+      if @alignment
+        case @alignment
+        when :left
+          @x = 0 + BUTTON_PADDING
+        when :center
+          @x = (CyberarmEngine::Window.instance.width / 2) - (@textobject.text_width(@text) / 2)
+        when :right
+          @x = CyberarmEngine::Window.instance.width - BUTTON_PADDING - @textobject.text_width(@text)
+        end
+      end
     end
 
     def check_cache(size, font_name)
@@ -102,38 +113,6 @@ module CyberarmEngine
       invalidate_cache! if old_color != color
     end
 
-    def alignment=(value)
-      invalidate_cache! if @alignment != value
-      @alignment = value
-    end
-
-    def shadow=(value)
-      invalidate_cache! if @shadow != value
-      @shadow = value
-    end
-
-    def shadow_color=(color)
-      old_color = @shadow_color
-
-      if color
-        @shadow_color = color.is_a?(Gosu::Color) ? color : Gosu::Color.new(color)
-      else
-        raise "color cannot be nil"
-      end
-
-      invalidate_cache! if old_color != color
-    end
-
-    def shadow_alpha=(value)
-      invalidate_cache! if @shadow_alpha != value
-      @shadow_alpha = value
-    end
-
-    def shadow_size=(value)
-      invalidate_cache! if @shadow_size != value
-      @shadow_size = value
-    end
-
     def border=(boolean)
       invalidate_cache! if @border != boolean
       @border = boolean
@@ -150,15 +129,8 @@ module CyberarmEngine
     end
 
     def border_color=(n)
-      old_color = @border_color
+      invalidate_cache! if @border_color != n
-
+      @border_color = n
-      if color
-        @border_color = color.is_a?(Gosu::Color) ? color : Gosu::Color.new(color)
-      else
-        raise "color cannot be nil"
-      end
-
-      invalidate_cache! if old_color != color
     end
 
     def width(text = @text)
@@ -222,9 +194,9 @@ module CyberarmEngine
           end
         end
 
-        @cached_text_shadow_image ||= Gosu::Image.send(:"from_#{method.to_s.split("_").last}", @text, @size, font: @font, align: @alignment) if @shadow
+        @cached_text_shadow_image ||= Gosu::Image.send(:"from_#{method.to_s.split("_").last}", @text, @size, font: @font) if @shadow
 
-        @gosu_cached_text_image ||= Gosu::Image.send(:"from_#{method.to_s.split("_").last}", @text, @size, font: @font, align: @alignment)
+        @gosu_cached_text_image ||= Gosu::Image.send(:"from_#{method.to_s.split("_").last}", @text, @size, font: @font)
 
         @cached_text_border_image.draw(@x, @y, @z, @factor_x, @factor_y, @border_color, @mode) if @border
 

lib/cyberarm_engine/timer.rb

@@ -19,9 +19,5 @@ module CyberarmEngine
         @block.call if @block
       end
     end
-
-    def dead?
-      @triggered && !@looping
-    end
   end
 end

lib/cyberarm_engine/ui/border_canvas.rb

@@ -62,36 +62,36 @@ module CyberarmEngine
 
     def update
       # TOP
-      @top.x = @element.x + @element.styled(:margin_left) + @element.styled(:border_thickness_left)
+      @top.x = @element.x + @element.style.border_thickness_left
-      @top.y = @element.y + @element.styled(:margin_top)
+      @top.y = @element.y
       @top.z = @element.z
 
-      @top.width  = @element.width - @element.styled(:border_thickness_left)
+      @top.width  = @element.width - @element.style.border_thickness_left
-      @top.height = @element.styled(:border_thickness_top)
+      @top.height = @element.style.border_thickness_top
 
       # RIGHT
-      @right.x = @element.x + @element.styled(:margin_left) + @element.width
+      @right.x = @element.x + @element.width
-      @right.y = @element.y + @element.styled(:margin_top) + @element.styled(:border_thickness_top)
+      @right.y = @element.y + @element.style.border_thickness_top
       @right.z = @element.z
 
-      @right.width  = -@element.styled(:border_thickness_right)
+      @right.width  = -@element.style.border_thickness_right
-      @right.height = @element.height - @element.styled(:border_thickness_top)
+      @right.height = @element.height - @element.style.border_thickness_top
 
       # BOTTOM
-      @bottom.x = @element.x + @element.styled(:margin_left)
+      @bottom.x = @element.x
-      @bottom.y = @element.y + @element.styled(:margin_top) + @element.height
+      @bottom.y = @element.y + @element.height
       @bottom.z = @element.z
 
-      @bottom.width  = @element.width - @element.styled(:border_thickness_right)
+      @bottom.width  = @element.width - @element.style.border_thickness_right
-      @bottom.height = -@element.styled(:border_thickness_bottom)
+      @bottom.height = -@element.style.border_thickness_bottom
 
       # LEFT
-      @left.x = @element.x + @element.styled(:margin_left)
+      @left.x = @element.x
-      @left.y = @element.y + @element.styled(:margin_top)
+      @left.y = @element.y
       @left.z = @element.z
 
-      @left.width  = @element.styled(:border_thickness_left)
+      @left.width  = @element.style.border_thickness_left
-      @left.height = @element.height - @element.styled(:border_thickness_bottom)
+      @left.height = @element.height - @element.style.border_thickness_bottom
 
       @top.update
       @right.update

lib/cyberarm_engine/ui/dialog.rb

@@ -1,24 +0,0 @@
-module CyberarmEngine
-  class Dialog < CyberarmEngine::GuiState
-    def draw
-      previous_state&.draw
-
-      Gosu.flush
-
-      super
-    end
-
-    def update
-      super
-
-      return unless window.current_state == self
-
-      window.states.reverse.each do |state|
-        # Don't update ourselves, forever
-        next if state == self && state.is_a?(CyberarmEngine::GuiState)
-
-        state.update
-      end
-    end
-  end
-end

lib/cyberarm_engine/ui/dsl.rb

@@ -1,17 +1,5 @@
 module CyberarmEngine
   module DSL
-    def every(milliseconds, &block)
-      element_parent.root.gui_state.add_timer(
-        CyberarmEngine::Timer.new(milliseconds, true, &block)
-      )
-    end
-
-    def after(milliseconds, &block)
-      element_parent.root.gui_state.add_timer(
-        CyberarmEngine::Timer.new(milliseconds, false, &block)
-      )
-    end
-
     def flow(options = {}, &block)
       container(CyberarmEngine::Element::Flow, options, &block)
     end
@@ -20,10 +8,6 @@ module CyberarmEngine
       container(CyberarmEngine::Element::Stack, options, &block)
     end
 
-    def widget(options = {}, &block)
-      container(CyberarmEngine::Element::Widget, options, &block)
-    end
-
     def menu(options = {}, &block)
       container(CyberarmEngine::Element::Menu, options, &block)
     end
@@ -116,20 +100,8 @@ module CyberarmEngine
       add_element(Element::Slider.new(options, block))
     end
 
-    def page(klass, options = {})
-      element_parent.root.gui_state.page(klass, options)
-    end
-
-    def current_page
-      element_parent.root.gui_state.current_page
-    end
-
-    def dialog(klass, options = {})
-      element_parent.root.gui_state.window.push_state(klass, options)
-    end
-
     def background(color = Gosu::Color::NONE)
-      element_parent.style.background = color
+      element_parent.style.default[:background] = color
     end
 
     def theme(theme)

lib/cyberarm_engine/ui/element.rb

@@ -18,7 +18,6 @@ module CyberarmEngine
       @visible = !@options.key?(:visible) ? true  : @options[:visible]
       @tip     = @options[:tip] || ""
 
-      @debug = @options[:debug] || CyberarmEngine.const_defined?("GUI_DEBUG") && CyberarmEngine::GUI_DEBUG || false
       @debug_color = @options[:debug_color].nil? ? Gosu::Color::RED : @options[:debug_color]
 
       @style = Style.new(options)
@@ -39,12 +38,12 @@ module CyberarmEngine
       @style.width  = default(:width)  || nil
       @style.height = default(:height) || nil
 
-      @background_canvas = nil # Background.new
+      @style.background_canvas = Background.new
-      @background_nine_slice_canvas = nil # BackgroundNineSlice.new
+      @style.background_nine_slice_canvas = BackgroundNineSlice.new
-      @background_image_canvas = nil # BackgroundImage.new
+      @style.background_image_canvas = BackgroundImage.new
-      @border_canvas = nil # BorderCanvas.new(element: self)
+      @style.border_canvas = BorderCanvas.new(element: self)
 
-      @style_event = enabled? ? :default : :disabled
+      @style_event = :default
 
       stylize
 
@@ -53,52 +52,33 @@ module CyberarmEngine
       root.gui_state.request_focus(self) if @options[:autofocus]
     end
 
-    def resolution_scaled(n)
-      return n unless @style.design_width
-
-      ((@style.design_width / Gosu.screen_width(window).to_f) * n).floor
-    end
-
     def stylize
-      @style_event = :disabled unless enabled?
-
       set_static_position
 
       set_color
       set_font
 
+      set_padding
+      set_margin
+
       set_background
       set_background_nine_slice
       set_background_image
 
-      set_border
+      set_border_thickness
+      set_border_color
 
       root.gui_state.request_repaint
     end
 
-    def styled(key)
-      case key
-      when :border_color_bottom, :border_color_left, :border_color_right, :border_color_top
-        safe_style_fetch(key, :border_color)
-      when :border_thickness_bottom, :border_thickness_left, :border_thickness_right, :border_thickness_top
-        visible? ? safe_style_fetch(key, :border_thickness) : 0
-      when :margin_bottom, :margin_left, :margin_right, :margin_top
-        visible? ? safe_style_fetch(key, :margin) : 0
-      when :padding_bottom, :padding_left, :padding_right, :padding_top
-        visible? ? safe_style_fetch(key, :padding) : 0
-      else
-        safe_style_fetch(key)
-      end
-    end
-
     def safe_style_fetch(key, fallback_key = nil)
       # Attempt to return value for requested key
-      v = @style.send(@style_event)&.send(key) || @style.send(key)
+      v = @style.hash.dig(@style_event, key)
       return v if v
 
       # Attempt to return overriding value
       if fallback_key
-        v = @style.send(@style_event)&.send(fallback_key) || @style.send(fallback_key)
+        v = @style.hash.dig(@style_event, fallback_key)
         return v if v
       end
 
@@ -112,73 +92,86 @@ module CyberarmEngine
     end
 
     def set_color
-      @text&.color = safe_style_fetch(:color)
+      @style.color = safe_style_fetch(:color)
+      @text&.color = @style.color
     end
 
     def set_font
-      @text&.swap_font(resolution_scaled(safe_style_fetch(:text_size)), safe_style_fetch(:font))
+      @text&.swap_font(safe_style_fetch(:text_size), safe_style_fetch(:font))
     end
 
     def set_background
-      return unless bg = safe_style_fetch(:background)
+      @style.background = safe_style_fetch(:background)
 
-      @background_canvas ||= Background.new
+      @style.background_canvas.background = @style.background
-      @background_canvas.background = bg
     end
 
     def set_background_nine_slice
-      return unless img = safe_style_fetch(:background_nine_slice)
+      @style.background_nine_slice = safe_style_fetch(:background_nine_slice)
 
-      @background_nine_slice_canvas ||= BackgroundNineSlice.new
+      @style.background_nine_slice_mode = safe_style_fetch(:background_nine_slice_mode) || :stretch
+      @style.background_nine_slice_color = safe_style_fetch(:background_nine_slice_color) || Gosu::Color::WHITE
+      @style.background_nine_slice_canvas.color = @style.background_nine_slice_color
 
-      @background_nine_slice_canvas.image = img
+      @style.background_nine_slice_from_edge = safe_style_fetch(:background_nine_slice_from_edge)
 
-      @background_nine_slice_canvas.x = @x + styled(:margin_left)
+      @style.background_nine_slice_left      = safe_style_fetch(:background_nine_slice_left, :background_nine_slice_from_edge)
-      @background_nine_slice_canvas.y = @y + styled(:margin_top)
+      @style.background_nine_slice_top       = safe_style_fetch(:background_nine_slice_top, :background_nine_slice_from_edge)
-      @background_nine_slice_canvas.z = @z
+      @style.background_nine_slice_right     = safe_style_fetch(:background_nine_slice_right, :background_nine_slice_from_edge)
-      @background_nine_slice_canvas.width = width
+      @style.background_nine_slice_bottom    = safe_style_fetch(:background_nine_slice_bottom, :background_nine_slice_from_edge)
-      @background_nine_slice_canvas.height = height
-
-      @background_nine_slice_canvas.mode = safe_style_fetch(:background_nine_slice_mode) || :stretch
-
-      @background_nine_slice_canvas.color = safe_style_fetch(:background_nine_slice_color) || Gosu::Color::WHITE
-
-      @background_nine_slice_canvas.set_edges(
-        left: safe_style_fetch(:background_nine_slice_left, :background_nine_slice_from_edge) || 1,
-        top: safe_style_fetch(:background_nine_slice_top, :background_nine_slice_from_edge) || 1,
-        right: safe_style_fetch(:background_nine_slice_right, :background_nine_slice_from_edge) || 1,
-        bottom: safe_style_fetch(:background_nine_slice_bottom, :background_nine_slice_from_edge) || 1
-      )
     end
 
     def set_background_image
-      return unless img = safe_style_fetch(:background_image)
+      @style.background_image = safe_style_fetch(:background_image)
-
+      @style.background_image_mode = safe_style_fetch(:background_image_mode) || :stretch
-      @background_image_canvas ||= BackgroundImage.new
+      @style.background_image_color = safe_style_fetch(:background_image_color) || Gosu::Color::WHITE
-
+      @style.background_image_canvas.mode = @style.background_image_mode
-      @background_image_canvas.image = img
+      @style.background_image_canvas.color = @style.background_image_color
-      @background_image_canvas.mode = safe_style_fetch(:background_image_mode) || :stretch
-      @background_image_canvas.color = safe_style_fetch(:background_image_color) || Gosu::Color::WHITE
     end
 
-    def set_border
+    def set_border_thickness
-      return unless [
+      @style.border_thickness = safe_style_fetch(:border_thickness)
-        safe_style_fetch(:border_thickness_bottom, :border_thickness),
-        safe_style_fetch(:border_thickness_left, :border_thickness),
-        safe_style_fetch(:border_thickness_right, :border_thickness),
-        safe_style_fetch(:border_thickness_top, :border_thickness),
-      ].any?(&:positive?)
 
-      @border_canvas ||= BorderCanvas.new(element: self)
+      @style.border_thickness_left   = safe_style_fetch(:border_thickness_left, :border_thickness)
+      @style.border_thickness_right  = safe_style_fetch(:border_thickness_right, :border_thickness)
+      @style.border_thickness_top    = safe_style_fetch(:border_thickness_top, :border_thickness)
+      @style.border_thickness_bottom = safe_style_fetch(:border_thickness_bottom, :border_thickness)
+    end
 
-      @border_canvas&.color = [
+    def set_border_color
-        styled(:border_color_top),
+      @style.border_color = safe_style_fetch(:border_color)
-        styled(:border_color_right),
+
-        styled(:border_color_bottom),
+      @style.border_color_left   = safe_style_fetch(:border_color_left, :border_color)
-        styled(:border_color_left)
+      @style.border_color_right  = safe_style_fetch(:border_color_right, :border_color)
+      @style.border_color_top    = safe_style_fetch(:border_color_top, :border_color)
+      @style.border_color_bottom = safe_style_fetch(:border_color_bottom, :border_color)
+
+      @style.border_canvas.color = [
+        @style.border_color_top,
+        @style.border_color_right,
+        @style.border_color_bottom,
+        @style.border_color_left
       ]
     end
 
+    def set_padding
+      @style.padding = safe_style_fetch(:padding)
+
+      @style.padding_left   = safe_style_fetch(:padding_left, :padding)
+      @style.padding_right  = safe_style_fetch(:padding_right, :padding)
+      @style.padding_top    = safe_style_fetch(:padding_top, :padding)
+      @style.padding_bottom = safe_style_fetch(:padding_bottom, :padding)
+    end
+
+    def set_margin
+      @style.margin = safe_style_fetch(:margin)
+
+      @style.margin_left   = safe_style_fetch(:margin_left, :margin)
+      @style.margin_right  = safe_style_fetch(:margin_right, :margin)
+      @style.margin_top    = safe_style_fetch(:margin_top, :margin)
+      @style.margin_bottom = safe_style_fetch(:margin_bottom, :margin)
+    end
+
     def update_styles(event = :default)
       old_width = width
       old_height = height
@@ -222,7 +215,7 @@ module CyberarmEngine
 
       if !@enabled
         update_styles(:disabled)
-      elsif @focus && !@style.active.empty?
+      elsif @focus
         update_styles(:active)
       else
         update_styles(:hover)
@@ -237,7 +230,7 @@ module CyberarmEngine
       unless @enabled
         update_styles(:disabled)
       else
-        update_styles(:active) unless @style.active.empty?
+        update_styles(:active)
       end
 
       window.current_state.focus = self
@@ -283,7 +276,6 @@ module CyberarmEngine
       root.gui_state.request_repaint if @enabled != boolean
 
       @enabled = boolean
-      @style_event = :default if boolean && @style_event == :disabled
 
       recalculate
 
@@ -330,16 +322,15 @@ module CyberarmEngine
       return unless visible?
       return unless element_visible?
 
-      @background_canvas&.draw
+      @style.background_canvas.draw
-      @background_nine_slice_canvas&.draw
+      @style.background_nine_slice_canvas.draw
-      @background_image_canvas&.draw
+      @style.background_image_canvas.draw
-      @border_canvas&.draw
+      @style.border_canvas.draw
 
       render
     end
 
     def debug_draw
-      return unless @debug # allow elements to opt out of debug drawing, makes debugging some things easier.
       return if CyberarmEngine.const_defined?("GUI_DEBUG_ONLY_ELEMENT") && self.class == GUI_DEBUG_ONLY_ELEMENT
 
       Gosu.draw_line(
@@ -366,11 +357,6 @@ module CyberarmEngine
 
     def update
       recalculate_if_size_changed
-
-      if @style.dirty?
-        @style.mark_clean!
-        stylize
-      end
     end
 
     def button_down(id)
@@ -387,8 +373,8 @@ module CyberarmEngine
     end
 
     def hit?(x, y)
-      x.between?(@x + styled(:margin_left), @x + styled(:margin_left) + width) &&
+      x.between?(@x, @x + width) &&
-        y.between?(@y + styled(:margin_top), @y + styled(:margin_top) + height)
+        y.between?(@y, @y + height)
     end
 
     def width
@@ -408,11 +394,11 @@ module CyberarmEngine
     end
 
     def outer_width
-      styled(:margin_left) + width + styled(:margin_right)
+      @style.margin_left + width + @style.margin_right
     end
 
     def inner_width
-      (styled(:border_thickness_left) + styled(:padding_left)) + (styled(:padding_right) + styled(:border_thickness_right))
+      (@style.border_thickness_left + @style.padding_left) + (@style.padding_right + @style.border_thickness_right)
     end
 
     def height
@@ -432,11 +418,11 @@ module CyberarmEngine
     end
 
     def outer_height
-      styled(:margin_top) + height + styled(:margin_bottom)
+      @style.margin_top + height + @style.margin_bottom
     end
 
     def inner_height
-      (styled(:border_thickness_top) + styled(:padding_top)) + (styled(:padding_bottom) + styled(:border_thickness_bottom))
+      (@style.border_thickness_top + @style.padding_top) + (@style.padding_bottom + @style.border_thickness_bottom)
     end
 
     def scroll_width
@@ -468,9 +454,9 @@ module CyberarmEngine
 
         pairs_ << a_ unless pairs_.last == a_
 
-        @cached_scroll_height = pairs_.sum { |pair| pair.map(&:outer_height).max } + noncontent_height
+        @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
-        @cached_scroll_height = noncontent_height + @children.sum(&:outer_height)
+        @cached_scroll_height = @style.padding_top + @style.border_thickness_top + @children.sum(&:outer_height) + @style.padding_bottom + @style.border_thickness_bottom
       end
     end
 
@@ -492,60 +478,79 @@ module CyberarmEngine
                  end
 
       # Handle fill behavior
-      if @parent && styled(:fill) &&
+      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
 
-      return styled(:"min_#{dimension}") if styled(:"min_#{dimension}") && new_size.to_f < styled(:"min_#{dimension}")
+      return @style.send(:"min_#{dimension}") if @style.send(:"min_#{dimension}") && new_size.to_f < @style.send(:"min_#{dimension}")
-      return styled(:"max_#{dimension}") if styled(:"max_#{dimension}") && new_size.to_f > styled(:"max_#{dimension}")
+      return @style.send(:"max_#{dimension}") if @style.send(:"max_#{dimension}") && new_size.to_f > @style.send(:"max_#{dimension}")
 
       new_size
     end
 
     def space_available_width
       # TODO: This may get expensive if there are a lot of children, probably should cache it somehow
-      fill_siblings = @parent.children.select { |c| c.styled(:fill) }.count.to_f # include self since we're dividing
+      fill_siblings = @parent.children.select { |c| c.style.fill }.count.to_f # include self since we're dividing
 
-      available_space = ((@parent.content_width - (@parent.children.reject { |c| c.styled(:fill) }).map(&:outer_width).sum) / fill_siblings)
+      available_space = ((@parent.content_width - (@parent.children.reject { |c| c.style.fill }).map(&:outer_width).sum) / fill_siblings)
       (available_space.nan? || available_space.infinite?) ? 0 : available_space.floor # The parent element might not have its dimensions, yet.
     end
 
     def space_available_height
       # TODO: This may get expensive if there are a lot of children, probably should cache it somehow
-      fill_siblings = @parent.children.select { |c| c.styled(:fill) }.count.to_f # include self since we're dividing
+      fill_siblings = @parent.children.select { |c| c.style.fill }.count.to_f # include self since we're dividing
 
-      available_space = ((@parent.content_height - (@parent.children.reject { |c| c.styled(:fill) }).map(&:outer_height).sum) / fill_siblings)
+      available_space = ((@parent.content_height - (@parent.children.reject { |c| c.style.fill }).map(&:outer_height).sum) / fill_siblings)
       (available_space.nan? || available_space.infinite?) ? 0 : available_space.floor # The parent element might not have its dimensions, yet.
     end
 
     def background=(_background)
       root.gui_state.request_repaint
 
-      @background_canvas.background = _background
+      @style.background_canvas.background = _background
       update_background
     end
 
     def update_background
-      @background_canvas&.x = @x + styled(:margin_left)
+      @style.background_canvas.x = @x
-      @background_canvas&.y = @y + styled(:margin_top)
+      @style.background_canvas.y = @y
-      @background_canvas&.z = @z
+      @style.background_canvas.z = @z
-      @background_canvas&.width  = width
+      @style.background_canvas.width  = width
-      @background_canvas&.height = height
+      @style.background_canvas.height = height
 
-      @background_canvas&.update
+      @style.background_canvas.update
-      set_background_nine_slice
+      update_background_nine_slice
       update_background_image
-      @border_canvas&.update
+      @style.border_canvas.update
     end
 
     def background_nine_slice=(_image_path)
       root.gui_state.request_repaint
 
-      @background_nine_slice_canvas.image = _image_path
+      @style.background_nine_slice_canvas.image = _image_path
-      set_background_nine_slice
+      update_background_nine_slice
+    end
+
+    def update_background_nine_slice
+      @style.background_nine_slice_canvas.x = @x
+      @style.background_nine_slice_canvas.y = @y
+      @style.background_nine_slice_canvas.z = @z
+      @style.background_nine_slice_canvas.width = width
+      @style.background_nine_slice_canvas.height = height
+
+      @style.background_nine_slice_canvas.mode = @style.background_nine_slice_mode
+
+      @style.background_nine_slice_canvas.color = @style.background_nine_slice_color
+
+      @style.background_nine_slice_canvas.left   = @style.background_nine_slice_left
+      @style.background_nine_slice_canvas.top    = @style.background_nine_slice_top
+      @style.background_nine_slice_canvas.right  = @style.background_nine_slice_right
+      @style.background_nine_slice_canvas.bottom = @style.background_nine_slice_bottom
+
+      @style.background_nine_slice_canvas.image = @style.background_nine_slice
     end
 
     def background_image=(image_path)
@@ -556,18 +561,16 @@ module CyberarmEngine
     end
 
     def update_background_image
-      return unless @background_image_canvas
+      @style.background_image_canvas.x = @x
+      @style.background_image_canvas.y = @y
+      @style.background_image_canvas.z = @z
+      @style.background_image_canvas.width = width
+      @style.background_image_canvas.height = height
 
-      @background_image_canvas.x = @x + styled(:margin_left)
+      @style.background_image_canvas.mode = @style.background_image_mode
-      @background_image_canvas.y = @y + styled(:margin_top)
+      @style.background_image_canvas.color = @style.background_image_color
-      @background_image_canvas.z = @z
-      @background_image_canvas.width = width
-      @background_image_canvas.height = height
 
-      @background_image_canvas.mode = safe_style_fetch(:background_image_mode) || :stretch
+      @style.background_image_canvas.image = @style.background_image
-      @background_image_canvas.color = safe_style_fetch(:background_image_color) || Gosu::Color::WHITE
-
-      @background_image_canvas.image = safe_style_fetch(:background_image)
     end
 
     def recalculate_if_size_changed
@@ -631,7 +634,7 @@ module CyberarmEngine
       root.gui_state.request_recalculate if @parent && !is_a?(ToolTip) && (width != old_width || height != old_height)
       root.gui_state.request_repaint if width != old_width || height != old_height
 
-      root.gui_state.active_menu.recalculate if root.gui_state.active_menu && root.gui_state.active_menu.parent == self
+      root.gui_state.menu.recalculate if root.gui_state.menu && root.gui_state.menu.parent == self
     end
 
     def layout

lib/cyberarm_engine/ui/elements/button.rb

@@ -10,7 +10,7 @@ module CyberarmEngine
 
         super(text_or_image, options, block)
 
-        @background_canvas.background = styled(:background)
+        @style.background_canvas.background = @style.background
       end
 
       def render
@@ -23,8 +23,8 @@ module CyberarmEngine
 
       def draw_image
         @image.draw(
-          styled(:border_thickness_left) + styled(:margin_left) + styled(:padding_left) + @x,
+          @style.border_thickness_left + @style.padding_left + @x,
-          styled(:border_thickness_top) + styled(:margin_top) + styled(:padding_top) + @y,
+          @style.border_thickness_top + @style.padding_top + @y,
           @z + 2,
           @scale_x, @scale_y, @text.color
         )
@@ -35,15 +35,20 @@ module CyberarmEngine
       end
 
       def layout
-        @background_canvas.background = styled(:background)
+        unless @enabled
-        @text.color = styled(:color)
+          @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(styled(:image_width), :width)
+          _width = dimensional_size(@style.image_width, :width)
-          _height = dimensional_size(styled(:image_height), :height)
+          _height = dimensional_size(@style.image_height, :height)
 
           if _width && _height
             @scale_x = _width.to_f / @image.width
@@ -73,8 +78,6 @@ module CyberarmEngine
       end
 
       def value=(value)
-        old_value = self.value
-
         if value.is_a?(Gosu::Image)
           @image = value
         else
@@ -90,9 +93,7 @@ module CyberarmEngine
           recalculate
         end
 
-        publish(:changed, self.value) if value != old_value
+        publish(:changed, self.value)
-
-        self.value
       end
     end
   end

lib/cyberarm_engine/ui/elements/check_box.rb

@@ -46,12 +46,8 @@ module CyberarmEngine
       end
 
       def value=(bool)
-        old_value = this.value
-
         @toggle_button.value = bool
-        publish(:changed, bool) if bool != old_value
+        publish(:changed, @toggle_button.value)
-
-        bool
       end
     end
   end

lib/cyberarm_engine/ui/elements/container.rb

@@ -80,19 +80,15 @@ module CyberarmEngine
 
       def render
         Gosu.clip_to(
-          @x - 1 + styled(:margin_left) + styled(:border_thickness_left) + styled(:padding_left),
+          @x + @style.border_thickness_left + @style.padding_left,
-          @y - 1 + styled(:margin_top) + styled(:border_thickness_top) + styled(:padding_top),
+          @y + @style.border_thickness_top + @style.padding_top,
           content_width + 1,
           content_height + 1
         ) do
-
           Gosu.translate(@scroll_position.x, @scroll_position.y) do
             @children.each(&:draw)
           end
         end
-
-        @children.each(&:debug_draw)
-        debug_draw
       end
 
       def debug_draw
@@ -102,16 +98,13 @@ module CyberarmEngine
       end
 
       def update
-        update_scroll if styled(:scroll)
+        update_scroll if @style.scroll
         @children.each(&:update)
       end
 
-      # return nil if element was not hit, or array of hit elements if hit, includes self.
+      def hit_element?(x, y)
-      def hit_element?(x, y, elements = [])
         return unless hit?(x, y)
 
-        elements << self
-
         # Offset child hit point by scroll position/offset
         child_x = x - @scroll_position.x
         child_y = y - @scroll_position.y
@@ -121,23 +114,20 @@ module CyberarmEngine
 
           case child
           when Container
-            if (child.hit_element?(child_x, child_y, elements))
+            if (element = child.hit_element?(child_x, child_y))
-              return elements
+              return element
             end
           else
-            if child.hit?(child_x, child_y)
+            return child if child.hit?(child_x, child_y)
-              elements << child
-              return elements
-            end
           end
         end
 
-        elements
+        self if hit?(x, y)
       end
 
       def update_child_element_visibity(child)
-        child.element_visible = child.x >= ((styled(:margin_left) + @x) - @scroll_position.x) - child.width && child.x <= ((styled(:margin_left) + @x) - @scroll_position.x) + width &&
+        child.element_visible = child.x >= (@x - @scroll_position.x) - child.width && child.x <= (@x - @scroll_position.x) + width &&
-                                child.y >= ((styled(:margin_top) + @y) - @scroll_position.y) - child.height && child.y <= ((styled(:margin_top) + @y) - @scroll_position.y) + height
+                                child.y >= (@y - @scroll_position.y) - child.height && child.y <= (@y - @scroll_position.y) + height
       end
 
       def update_scroll
@@ -164,7 +154,7 @@ module CyberarmEngine
       end
 
       def recalculate
-        @current_position = Vector.new(styled(:margin_left) + styled(:padding_left), styled(:margin_top) + styled(:padding_top))
+        @current_position = Vector.new(@style.margin_left + @style.padding_left, @style.margin_top + @style.padding_top)
 
         return unless visible?
 
@@ -183,7 +173,7 @@ module CyberarmEngine
         @cached_scroll_height = nil
 
         if is_root?
-          @width  = @style.width = window.width
+          @width  = @style.width  = window.width
           @height = @style.height = window.height
         else
           @width = 0
@@ -192,39 +182,39 @@ module CyberarmEngine
           _width = dimensional_size(@style.width, :width)
           _height = dimensional_size(@style.height, :height)
 
-          @width  = _width  || (@children.map { |c| c.x + c.outer_width }.max.to_f - (styled(:margin_left) + styled(:padding_left))).floor
+          @width  = _width  || (@children.map { |c| c.x + c.outer_width }.max || 0).floor
-          @height = _height || (@children.map { |c| c.y + c.outer_height }.max.to_f - (styled(:margin_top) + styled(:padding_top))).floor
+          @height = _height || (@children.map { |c| c.y + c.outer_height }.max || 0).floor
         end
 
         # FIXME: Correctly handle alignment when element has siblings
         # FIXME: Enable alignment for any element, not just containers
-        if styled(:v_align)
+        if @style.v_align
           space = space_available_height
 
-          case styled(:v_align)
+          case @style.v_align
           when :center
-            @y = parent.y + parent.styled(:margin_top) + parent.height / 2 - height / 2
+            @y = parent.height / 2 - height / 2
           when :bottom
-            @y = parent.y + parent.styled(:margin_top) + parent.height - height
+            @y = parent.height - height
           end
         end
 
-        if styled(:h_align)
+        if @style.h_align
           space = space_available_width
 
-          case styled(:h_align)
+          case @style.h_align
           when :center
-            @x = parent.x + parent.styled(:margin_left) + parent.width / 2 - width / 2
+            @x = parent.width / 2 - width / 2
           when :right
-            @x = parent.x + parent.styled(:margin_left) + parent.width - width
+            @x = parent.width - width
           end
         end
 
         # t = Gosu.milliseconds
         # Move children to parent after positioning
         @children.each do |child|
-          child.x += (@x + styled(:border_thickness_left))
+          child.x += (@x + @style.border_thickness_left) - style.margin_left
-          child.y += (@y + styled(:border_thickness_top))
+          child.y += (@y + @style.border_thickness_top) - style.margin_top
 
           child.stylize
           child.recalculate
@@ -259,6 +249,13 @@ module CyberarmEngine
       end
 
       def max_width
+        # _width = dimensional_size(@style.width, :width)
+        # if _width
+        #   outer_width
+        # else
+        #   window.width - (@parent ? @parent.style.margin_right + @style.margin_right : @style.margin_right)
+        # end
+
         outer_width
       end
 
@@ -268,8 +265,8 @@ module CyberarmEngine
       end
 
       def position_on_current_line(element) # Flow
-        element.x = @current_position.x
+        element.x = element.style.margin_left + @current_position.x
-        element.y = @current_position.y
+        element.y = element.style.margin_top  + @current_position.y
 
         @current_position.x += element.outer_width
       end
@@ -285,24 +282,24 @@ module CyberarmEngine
       end
 
       def position_on_next_line(element) # Flow
-        @current_position.x = 0
+        @current_position.x = @style.margin_left + @style.padding_left
         @current_position.y += tallest_neighbor(element, @current_position.y).outer_height
 
-        element.x = @current_position.x
+        element.x = element.style.margin_left + @current_position.x
-        element.y = @current_position.y
+        element.y = element.style.margin_top  + @current_position.y
 
         @current_position.x += element.outer_width
       end
 
       def move_to_next_line(element) # Stack
-        element.x = @current_position.x
+        element.x = element.style.margin_left + @current_position.x
-        element.y = @current_position.y
+        element.y = element.style.margin_top  + @current_position.y
 
         @current_position.y += element.outer_height
       end
 
       def mouse_wheel_up(sender, x, y)
-        return unless styled(:scroll)
+        return unless @style.scroll
 
         # Allow overscrolling UP, only if one can scroll DOWN
         return unless height < scroll_height
@@ -317,7 +314,7 @@ module CyberarmEngine
       end
 
       def mouse_wheel_down(sender, x, y)
-        return unless styled(:scroll)
+        return unless @style.scroll
 
         return unless height < scroll_height
 
@@ -331,7 +328,7 @@ module CyberarmEngine
       end
 
       def scroll_jump_to_top(sender, x, y)
-        return unless styled(:scroll)
+        return unless @style.scroll
 
         @scroll_position.y = 0
         @scroll_target_position.y = 0
@@ -340,7 +337,7 @@ module CyberarmEngine
       end
 
       def scroll_jump_to_end(sender, x, y)
-        return unless styled(:scroll)
+        return unless @style.scroll
 
         @scroll_position.y = -max_scroll_height
         @scroll_target_position.y = -max_scroll_height
@@ -349,7 +346,7 @@ module CyberarmEngine
       end
 
       def scroll_page_up(sender, x, y)
-        return unless styled(:scroll)
+        return unless @style.scroll
 
         @scroll_position.y += height
         @scroll_position.y = 0 if @scroll_position.y > 0
@@ -359,7 +356,7 @@ module CyberarmEngine
       end
 
       def scroll_page_down(sender, x, y)
-        return unless styled(:scroll)
+        return unless @style.scroll
 
         @scroll_position.y -= height
         @scroll_position.y = -max_scroll_height if @scroll_position.y < -max_scroll_height

lib/cyberarm_engine/ui/elements/edit_box.rb

@@ -45,23 +45,19 @@ module CyberarmEngine
 
       def draw_selection
         selection_width = caret_position - selection_start_position
-        selection_start_line = calculate_line(@text_input.caret_pos)
-        selection_end_line = calculate_line(@text_input.selection_start)
 
-        # pp [selection_width, selection_start_line, selection_end_line]
+        Gosu.draw_rect(selection_start_position, @text.y, selection_width, @text.textobject.height,
-
-        Gosu.draw_rect(selection_start_position, @text.y + selection_start_line * @text.textobject.height, selection_width, @text.textobject.height,
                        default(:selection_color), @z)
       end
 
-      def text_input_position_for(method)
+      def text_input_position_for(_method)
-        line = @text_input.text[0...@text_input.send(method)].lines.last
+        line = @text_input.text[0...@text_input.caret_pos].lines.last
         _x = @text.x + @offset_x
 
         if @type == :password
-          _x + @text.width(default(:password_character) * line.length) - @style.border_thickness_left
+          _x + @text.width(default(:password_character) * line.length)
         else
-          _x + @text.width(line) - @style.border_thickness_left
+          _x + @text.width(line)
         end
       end
 
@@ -70,12 +66,9 @@ module CyberarmEngine
         @text_input.selection_start = @text_input.caret_pos = int
       end
 
-      def calculate_line(caret_pos = @text_input.caret_pos)
-        sub_text = @text_input.text[0...caret_pos].lines.size - 1
-      end
-
       def calculate_active_line
-        @active_line = calculate_line(@text_input.caret_pos)
+        sub_text = @text_input.text[0...@text_input.caret_pos]
+        @active_line = sub_text.lines.size - 1
       end
 
       def caret_stay_left_of_last_newline
@@ -86,20 +79,8 @@ module CyberarmEngine
       end
 
       def caret_position_under_mouse(mouse_x, mouse_y)
-        # get y scroll offset of element to get EditBox's selected row
+        active_line = row_at(mouse_y)
-        y_scroll_offset = 0
+        right_offset = column_at(mouse_x, mouse_y)
-        e = parent
-        while (e)
-          if e.is_a?(Container)
-            y_scroll_offset += e.scroll_position.y
-
-            # root element has no parent so loop will terminate
-            e = e.parent
-          end
-        end
-
-        active_line = row_at(mouse_y - y_scroll_offset)
-        right_offset = column_at(mouse_x, mouse_y - y_scroll_offset)
 
         buffer = @text_input.text.lines[0..active_line].join if active_line != 0
         buffer = @text_input.text.lines.first if active_line == 0
@@ -183,8 +164,6 @@ module CyberarmEngine
           pos = text.length
         end
 
-        pp [direction, pos, @active_line]
-
         set_position(pos)
       end
 

lib/cyberarm_engine/ui/elements/edit_line.rb

@@ -197,9 +197,9 @@ module CyberarmEngine
 
       def text_input_position_for(method)
         if @type == :password
-          @text.x + @text.width(default(:password_character) * @text_input.text[0...@text_input.send(method)].length) - styled(:border_thickness_left)
+          @text.x + @text.width(default(:password_character) * @text_input.text[0...@text_input.send(method)].length) - @style.border_thickness_left
         else
-          @text.x + @text.width(@text_input.text[0...@text_input.send(method)]) - styled(:border_thickness_left)
+          @text.x + @text.width(@text_input.text[0...@text_input.send(method)]) - @style.border_thickness_left
         end
       end
 
@@ -291,8 +291,6 @@ module CyberarmEngine
 
       def value=(string)
         @text_input.text = string
-
-        string
       end
     end
   end

lib/cyberarm_engine/ui/elements/image.rb

@@ -14,10 +14,10 @@ module CyberarmEngine
 
       def render
         @image.draw(
-          styled(:margin_left) + styled(:border_thickness_left) + styled(:padding_left) + @x,
+          @style.border_thickness_left + @style.padding_left + @x,
-          styled(:margin_top) + styled(:border_thickness_top) + styled(:padding_top) + @y,
+          @style.border_thickness_top + @style.padding_top + @y,
           @z + 2,
-          @scale_x, @scale_y, styled(:color)
+          @scale_x, @scale_y, @style.color
         )
       end
 
@@ -56,18 +56,12 @@ module CyberarmEngine
       end
 
       def value=(path_or_image, retro: false, tileable: false)
-        old_value = self.value
-
         @path = path_or_image if path_or_image.is_a?(String)
 
         @image = Gosu::Image.new(path_or_image, retro: retro, tileable: tileable) if @path
         @image = path_or_image unless @path
 
         recalculate
-
-        publish(:changed, @image) if old_value != self.value
-
-        self.value
       end
 
       def path

lib/cyberarm_engine/ui/elements/list_box.rb

@@ -10,7 +10,7 @@ module CyberarmEngine
 
         super(@choose, options, block)
 
-        @background_canvas.background = default(:background)
+        @style.background_canvas.background = default(:background)
 
         @menu = Menu.new(parent: self, theme: @options[:theme])
 
@@ -21,7 +21,7 @@ module CyberarmEngine
         super
 
         w = @text.textobject.text_width("▼")
-        @text.textobject.draw_text("▼", @x + content_width - w, @y + styled(:padding_top), @z, 1, 1, @text.color)
+        @text.textobject.draw_text("▼", @x + content_width - w, @y + @style.padding_top, @z, 1, 1, @text.color)
       end
 
       def choose=(item)
@@ -56,7 +56,7 @@ module CyberarmEngine
       def show_menu
         @menu.clear do
 
-          @menu.style.width = width - (@menu.styled(:border_thickness_left) + @menu.styled(:border_thickness_right))
+          @menu.style.width = width
 
           @items.each do |item|
             # prevent already selected item from appearing in list

lib/cyberarm_engine/ui/elements/menu.rb

@@ -11,10 +11,10 @@ module CyberarmEngine
         # FIXME: properly find scrollable parent, if any.
         parent_scroll_top = parent&.parent ? parent.parent.scroll_top : 0
 
-        @x = @parent.x + @parent.styled(:border_thickness_left)
+        @x = @parent.x
-        @y = parent_scroll_top + @parent.y + @parent.height + @parent.styled(:border_thickness_top)
+        @y = parent_scroll_top + @parent.y + @parent.height
 
-        @y = (parent_scroll_top + @parent.y + @parent.styled(:border_thickness_top)) - height if @y + height > window.height
+        @y = (parent_scroll_top + @parent.y) - height if @y + height > window.height
       end
 
       def show

lib/cyberarm_engine/ui/elements/progress.rb

@@ -11,7 +11,7 @@ module CyberarmEngine
         @marquee_offset = 0
         @marquee_animation_time = Gosu.milliseconds
         @type = options[:type] || :linear
-        @fraction_background = Background.new(background: styled(:fraction_background))
+        @fraction_background = Background.new(background: @style.fraction_background)
         self.value = options[:fraction] || 0.0
       end
 
@@ -31,13 +31,13 @@ module CyberarmEngine
       def update_background
         super
 
-        @fraction_background.x = (styled(:border_thickness_left) + styled(:padding_left) + @x) + @marquee_offset
+        @fraction_background.x = (@style.border_thickness_left + @style.padding_left + @x) + @marquee_offset
-        @fraction_background.y = styled(:border_thickness_top) + styled(:padding_top) + @y
+        @fraction_background.y = @style.border_thickness_top + @style.padding_top + @y
         @fraction_background.z = @z
         @fraction_background.width = @width * (@type == :marquee ? @marquee_width : @fraction)
         @fraction_background.height = @height
 
-        @fraction_background.background = styled(:fraction_background)
+        @fraction_background.background = @style.fraction_background
       end
 
       def update
@@ -83,11 +83,9 @@ module CyberarmEngine
         @fraction = decimal.clamp(0.0, 1.0)
         update_background
 
-        if @fraction != old_value
+        root.gui_state.request_repaint if @fraction != old_value
-          root.gui_state.request_repaint
-          publish(:changed, @fraction)
-        end
 
+        publish(:changed, @fraction)
         @fraction
       end
     end

lib/cyberarm_engine/ui/elements/slider.rb

@@ -62,10 +62,10 @@ module CyberarmEngine
       end
 
       def position_handle
-        @handle.x = styled(:margin_left) + @x + @handle.styled(:margin_left) + styled(:padding_left) + styled(:border_thickness_left) +
+        @handle.x = @x + @handle.style.margin_left + @style.padding_left + @style.border_thickness_left +
                     ((content_width - @handle.outer_width) * (@value - @range.min) / (@range.max - @range.min).to_f)
 
-        @handle.y = styled(:margin_top) + @y + @handle.styled(:margin_top) + styled(:border_thickness_top) + styled(:padding_top)
+        @handle.y = @y + @handle.style.margin_top + @style.border_thickness_top + @style.padding_top
       end
 
       def draw
@@ -94,17 +94,13 @@ module CyberarmEngine
       end
 
       def value=(n)
-        old_value = this.value
-
         @value = n
         position_handle
         @handle.recalculate
 
         root.gui_state.request_repaint
 
-        publish(:changed, @value) if old_value != n
+        publish(:changed, @value)
-
-        n
       end
     end
   end

lib/cyberarm_engine/ui/elements/text_block.rb

@@ -8,7 +8,6 @@ module CyberarmEngine
           text, font: @options[:font], z: @z, color: @options[:color],
                 size: @options[:text_size], shadow: @options[:text_shadow],
                 static: @options[:text_static],
-                alignment: @options[:text_align],
                 shadow_size: @options[:text_shadow_size],
                 shadow_color: @options[:text_shadow_color],
                 border: @options[:text_border],
@@ -33,7 +32,7 @@ module CyberarmEngine
       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
-          Gosu.clip_to(@text.x, @text.y, @width, @height) do
+          Gosu.clip_to(@x, @y, width, height) do
             @text.draw
           end
         else
@@ -42,18 +41,11 @@ module CyberarmEngine
       end
 
       def layout
-        @text.color = styled(:color)
+        unless @enabled
-        @text.alignment = styled(:text_align)
+          @text.color = @style.disabled[:color]
-
+        else
-        @text.shadow = styled(:text_shadow)
+          @text.color = @style.color
-        @text.shadow_color = styled(:text_shadow_color)
+        end
-        @text.shadow_alpha = styled(:text_shadow_alpha)
-        @text.shadow_size = styled(:text_shadow_size)
-
-        @text.border = styled(:text_border)
-        @text.border_color = styled(:text_border_color)
-        @text.border_alpha = styled(:text_border_alpha)
-        @text.border_size = styled(:text_border_size)
 
         @width  = 0
         @height = 0
@@ -70,21 +62,21 @@ module CyberarmEngine
         @width  = _width  || @text_width.floor
         @height = _height || @text_height.floor
 
-        @text.y = styled(:margin_top) + styled(:border_thickness_top) + styled(:padding_top) + @y
+        @text.y = @style.border_thickness_top + @style.padding_top + @y
         @text.z = @z + 3
 
         if (text_alignment = @options[:text_align] || @options[:text_h_align])
           case text_alignment
           when :left
-            @text.x = styled(:margin_left) + styled(:border_thickness_left) + styled(:padding_left) + @x
+            @text.x = @style.border_thickness_left + @style.padding_left + @x
           when :center
             @text.x = if @text_width <= width
-                        @x + styled(:margin_left) + width / 2 - @text_width / 2
+                        @x + width / 2 - @text_width / 2
                       else # Act as left aligned
-                        styled(:margin_left) + styled(:border_thickness_left) + styled(:padding_left) + @x
+                        @style.border_thickness_left + @style.padding_left + @x
                       end
           when :right
-            @text.x = @x + styled(:margin_left) + outer_width - (@text_width + styled(:border_thickness_right) + styled(:padding_right))
+            @text.x = @x + outer_width - (@text_width + @style.border_thickness_right + @style.padding_right)
           end
         end
 
@@ -92,12 +84,12 @@ module CyberarmEngine
           case vertical_alignment
           when :center
             @text.y = if @text_height <= height
-                        @y + styled(:margin_top) + height / 2 - @text_height / 2
+                        @y + height / 2 - @text_height / 2
                       else
-                        styled(:margin_top) + styled(:border_thickness_top) + styled(:padding_top) + @y
+                        @style.border_thickness_top + @style.padding_top + @y
                       end
           when :bottom
-            @text.y = @y + styled(:margin_top) + outer_height - (@text_height + styled(:border_thickness_bottom) + styled(:padding_bottom))
+            @text.y = @y + outer_height - (@text_height + @style.border_thickness_bottom + @style.padding_bottom)
           end
         end
 
@@ -107,7 +99,7 @@ module CyberarmEngine
       def handle_text_wrapping(max_width)
         max_width ||= @parent&.content_width
         max_width ||= @x - (window.width + noncontent_width)
-        wrap_behavior = styled(:text_wrap)
+        wrap_behavior = style.text_wrap
         copy = @raw_text.to_s.dup
 
         # Only perform text wrapping: if it is enabled, is possible to wrap, and text is too long to fit on one line
@@ -194,12 +186,9 @@ module CyberarmEngine
           recalculate
         end
 
-        if old_value != @raw_text
+        root.gui_state.request_repaint if old_value != @raw_text
-          root.gui_state.request_repaint
-          publish(:changed, @raw_text)
-        end
 
-        value
+        publish(:changed, self.value)
       end
     end
 
@@ -225,9 +214,6 @@ module CyberarmEngine
     end
 
     class ToolTip < TextBlock
-      def needs_repaint?
-        @needs_repaint || !value.to_s.empty?
-      end
     end
 
     class Link < TextBlock

lib/cyberarm_engine/ui/elements/toggle_button.rb

@@ -50,8 +50,6 @@ module CyberarmEngine
       end
 
       def value=(boolean)
-        old_value = self.value
-
         @value = boolean
 
         if boolean
@@ -62,9 +60,7 @@ module CyberarmEngine
 
         recalculate
 
-        publish(:changed, @value) if old_value != boolean
+        publish(:changed, @value)
-
-        boolean
       end
     end
   end

lib/cyberarm_engine/ui/elements/widget.rb

@@ -1,36 +0,0 @@
-module CyberarmEngine
-  class Element
-    # Special container that has a layout like a Flow
-    # and makes all its children mirror its styling (i.e. hover, active, disabled...)
-    class Widget < Flow
-      def update_styles(style = :default)
-        super
-
-        @children.each do |child|
-          recursive_styles(style, self)
-        end
-      end
-
-      # Make child elements mirror the widgets styling
-      # disabled elements will not have their styling overridden
-      def recursive_styles(style, container)
-        container.children.each do |child|
-          child.update_styles(style)
-
-          recursive_styles(style, child) if child.is_a?(Container)
-        end
-      end
-
-      # Enable child elements to display their tooltips
-      # but fall back to the Widget if no hit element has a tip
-      def tip
-        elements = hit_element?(window.mouse_x, window.mouse_y)
-
-        return @tip unless elements
-
-        elements.delete(self) # prevent infinite recursive loop (Widget#tip)
-        elements.reverse.find { |e| !e.tip.empty? }&.tip || @tip
-      end
-    end
-  end
-end

lib/cyberarm_engine/ui/event.rb

@@ -13,7 +13,7 @@ module CyberarmEngine
     def publish(event, *args)
       raise ArgumentError, "#{self.class} does not handle #{event.inspect}" unless @event_handler.include?(event)
 
-      return if !enabled? && event != :changed
+      return unless enabled?
 
       was_handled = false
 

lib/cyberarm_engine/ui/gui_state.rb

@@ -6,7 +6,6 @@ module CyberarmEngine
     def initialize(options = {})
       @options = options
       @game_objects = []
-      @timers = []
       @global_pause = false
 
       @down_keys = {}
@@ -18,10 +17,6 @@ module CyberarmEngine
       @active_width  = window.width
       @active_height = window.height
 
-      @pages = {}
-      @page_host = nil
-      @page = nil
-
       @menu = nil
       @focus = nil
       @mouse_over = nil
@@ -31,7 +26,6 @@ module CyberarmEngine
       @dragging_element = nil
       @pending_recalculate_request = false
       @pending_element_recalculate_requests = []
-      @hit_elements = []
 
       @needs_repaint = false
 
@@ -44,45 +38,14 @@ module CyberarmEngine
       @tip = Element::ToolTip.new("", parent: @root_container, z: Float::INFINITY, theme: current_theme)
     end
 
-    def active_menu
+    def menu
       @menu
     end
 
-    def page(klass, options = {})
-      @page&.blur
-
-      @pages[klass] = klass.new(parent: options[:parent] || self) unless @pages[klass]
-      @page = @pages[klass]
-
-      @page.options = options
-      page_host.clear do
-        @page.setup
-      end
-      @page.focus
-    end
-
-    def current_page
-      @page
-    end
-
-    def page_host
-      return @page.parent if @page.parent.is_a?(CyberarmEngine::Element::Container)
-      return @page_host if @page_host && @page_host.is_a?(CyberarmEngine::Element::Container)
-
-      @root_container
-    end
-
-    def page_host=(container)
-      raise "page host must be a CyberarmEngine::Element::Container" unless container.is_a?(Container)
-
-      @page_host = container
-    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 && element && @focus != element
-      @hit_elements.delete(@focus)
       @focus = element
     end
 
@@ -134,8 +97,6 @@ module CyberarmEngine
       end
 
       @needs_repaint = false
-
-      @page&.draw
     end
 
     def needs_repaint?
@@ -165,37 +126,22 @@ module CyberarmEngine
       return unless window.has_focus?
       return unless window.current_state == self
 
-      # list of containers decending down to hit element
+      new_mouse_over = @menu.hit_element?(window.mouse_x, window.mouse_y) if @menu
-      new_hit_elements = (@menu || @root_container).hit_element?(window.mouse_x, window.mouse_y)
+      new_mouse_over ||= @root_container.hit_element?(window.mouse_x, window.mouse_y)
-      # element the mouse is over, if any.
-      new_mouse_over = new_hit_elements&.find { |c| c.is_a?(CyberarmEngine::Element::Widget) } || new_hit_elements&.last
 
-      # is the currently hit element the same as last hit element?
+      if new_mouse_over
-      same_element = @mouse_over && new_mouse_over == @mouse_over
+        new_mouse_over.publish(:enter) if new_mouse_over != @mouse_over
-
+        new_mouse_over.publish(:hover)
-      unless @hit_elements == new_hit_elements
+        # puts "#{new_mouse_over.class}[#{new_mouse_over.value}]: #{new_mouse_over.x}:#{new_mouse_over.y} #{new_mouse_over.width}:#{new_mouse_over.height}" if new_mouse_over != @mouse_over
-        added_hit_elements = (new_hit_elements || []) - @hit_elements
-        removed_hit_elements = @hit_elements - (new_hit_elements || [])
-
-        added_hit_elements.each do |e|
-          e.publish(:enter)
-          e.publish(:hover)
-        end
-
-        removed_hit_elements.each do |e|
-          e.publish(:leave)
-        end
       end
-
+      @mouse_over.publish(:leave) if @mouse_over && new_mouse_over != @mouse_over
       @mouse_over = new_mouse_over
-      @hit_elements = new_hit_elements || []
 
       redirect_holding_mouse_button(:left) if @mouse_over && Gosu.button_down?(Gosu::MS_LEFT)
       redirect_holding_mouse_button(:middle) if @mouse_over && Gosu.button_down?(Gosu::MS_MIDDLE)
       redirect_holding_mouse_button(:right) if @mouse_over && Gosu.button_down?(Gosu::MS_RIGHT)
 
-      # handle tooltip
+      if Vector.new(window.mouse_x, window.mouse_y) == @last_mouse_pos
-      if same_element
         if @mouse_over && (Gosu.milliseconds - @mouse_moved_at) > tool_tip_delay
           @tip.value = @mouse_over.tip if @mouse_over
           @tip.x = window.mouse_x
@@ -215,8 +161,6 @@ module CyberarmEngine
 
       @last_mouse_pos = Vector.new(window.mouse_x, window.mouse_y)
       @mouse_pos = @last_mouse_pos.clone
-
-      @page&.update
     end
 
     def button_down(id)
@@ -234,8 +178,6 @@ module CyberarmEngine
       end
 
       @focus.button_down(id) if @focus.respond_to?(:button_down)
-
-      @page&.button_down(id)
     end
 
     def button_up(id)
@@ -266,8 +208,6 @@ module CyberarmEngine
 
       # Prevents menu from popping back up if the listbox is clicked to hide it.
       @hid_menu_for = nil
-
-      @page&.button_up(id)
     end
 
     def tool_tip_delay
@@ -278,7 +218,6 @@ module CyberarmEngine
       hide_menu unless @menu && (@menu == @mouse_over) || (@mouse_over&.parent == @menu)
 
       if @focus && @mouse_over != @focus
-        @hit_elements.delete(@focus)
         @focus.publish(:blur)
         @focus = nil
       end
@@ -332,14 +271,10 @@ module CyberarmEngine
     end
 
     def redirect_scroll_jump_to(edge)
-      return if window.text_input
-
       @mouse_over.publish(:"scroll_jump_to_#{edge}", window.mouse_x, window.mouse_y) if (@mouse_over && !@menu) || (@mouse_over && @mouse_over == @menu)
     end
 
     def redirect_scroll_page(edge)
-      return if window.text_input
-
       @mouse_over.publish(:"scroll_page_#{edge}", window.mouse_x, window.mouse_y) if (@mouse_over && !@menu) || (@mouse_over && @mouse_over == @menu)
     end
 

lib/cyberarm_engine/ui/page.rb

@@ -1,39 +0,0 @@
-module CyberarmEngine
-  class Page
-    include CyberarmEngine::DSL
-    include CyberarmEngine::Common
-
-    attr_reader :parent
-
-    def initialize(parent:)
-      @parent = parent
-
-      @options = {}
-    end
-
-    def options=(options)
-      @options = options
-    end
-
-    def setup
-    end
-
-    def focus
-    end
-
-    def blur
-    end
-
-    def draw
-    end
-
-    def update
-    end
-
-    def button_down(id)
-    end
-
-    def button_up(id)
-    end
-  end
-end

lib/cyberarm_engine/ui/style.rb

@@ -16,14 +16,11 @@ module Gosu
 end
 
 module CyberarmEngine
-  class StyleData
+  class Style
-    def initialize(hash = {})
+    attr_reader :hash
-      @hash = hash
-      @dirty = false
-    end
 
     %i[
-      x y z design_width width height min_width min_height max_width max_height color background
+      x y z width height min_width min_height max_width max_height color background
       background_image background_image_mode background_image_color
       background_nine_slice background_nine_slice_mode background_nine_slice_color background_nine_slice_from_edge
       background_nine_slice_left background_nine_slice_top background_nine_slice_right background_nine_slice_bottom
@@ -31,64 +28,34 @@ module CyberarmEngine
       border_thickness border_thickness_left border_thickness_right border_thickness_top border_thickness_bottom
       padding padding_left padding_right padding_top padding_bottom
       margin margin_left margin_right margin_top margin_bottom
-      aspect_ratio
+      background_canvas background_nine_slice_canvas background_image_canvas border_canvas
 
-      fraction_background scroll fill text_wrap v_align h_align delay tag font
+      fraction_background scroll fill text_wrap v_align h_align delay tag
-      text_align text_static text_size
-      text_shadow text_shadow_size text_shadow_alpha text_shadow_color
-      text_border text_border_size text_border_alpha text_border_color
       image_width image_height
+
+      default hover active disabled
     ].each do |item|
       define_method(item) do
         @hash[item]
       end
       define_method(:"#{item}=") do |value|
-        @dirty = true if @hash[item] != value
-
         @hash[item] = value
       end
     end
 
-    # NOTE: do not change return value
-    def default
-      nil
-    end
-
-    def dirty?
-      @dirty
-    end
-
-    def mark_clean!
-      @dirty = false
-    end
-
-    def empty?
-      @hash.empty?
-    end
-  end
-
-  class Style < StyleData
-    attr_reader :hash, :hover, :active, :disabled
-
     def initialize(hash = {})
-      @hash = hash
+      h = hash
+      # h = Marshal.load(Marshal.dump(hash))
 
-      @hover = StyleData.new(hash[:hover] || {})
+      h[:default] = {}
-      @active = StyleData.new(hash[:active] || {})
-      @disabled = StyleData.new(hash[:disabled] || {})
 
-      @substyles = [@hover, @active, @disabled]
+      h.each do |key, value|
+        next if value.is_a?(Hash)
 
-      super
+        h[:default][key] = value
-    end
+      end
 
-    def dirty?
+      @hash = h
-      @dirty || @substyles.any?(&:dirty?)
-    end
-
-    def mark_clean!
-      @substyles.each(&:mark_clean!)
-      @dirty = false
     end
   end
 end

lib/cyberarm_engine/ui/theme.rb

@@ -30,11 +30,6 @@ module CyberarmEngine
         end
       end
 
-      # css-like style classes, however First In, First Out- that is,
-       options[:style_class]&.each do |klass|
-         hash = deep_merge(hash, _theme[klass]) if _theme[klass]
-       end
-
       deep_merge(hash, options)
     end
 
@@ -58,7 +53,6 @@ module CyberarmEngine
         y: 0,
         z: 30,
 
-        design_width: nil,
         width: nil,
         height: nil,
         color: Gosu::Color::WHITE,
@@ -74,25 +68,25 @@ module CyberarmEngine
         debug_color: Gosu::Color::YELLOW
       },
 
-      Button: { # < TextBlock
+      Button: { # < Label
         margin: 1,
         padding: 4,
         border_thickness: 1,
-        border_color: [0xffd59674, 0xffff8746],
+        border_color: ["ffd59674".hex, "ffff8746".hex],
         border_radius: 0,
-        background: [0xffc75e61, 0xffe26623],
+        background: ["ffc75e61".to_i(16), "ffe26623".to_i(16)],
         text_align: :center,
         text_v_align: :center,
         text_wrap: :none,
 
         hover: {
           color: Gosu::Color.rgb(200, 200, 200),
-          background: [0xffB23E41, 0xffFF7C00]
+          background: ["ffB23E41".to_i(16), "ffFF7C00".to_i(16)]
         },
 
         active: {
           color: Gosu::Color::BLACK,
-          background: [0xffB23E41]
+          background: ["ffB23E41".to_i(16)]
         },
 
         disabled: {
@@ -127,13 +121,7 @@ module CyberarmEngine
         text_size: 28,
         text_wrap: :word_wrap, # :word_wrap, :break_word, :none
         text_shadow: false,
-        text_shadow_color: 0,
-        text_shadow_alpha: 30,
-        text_shadow_size: 2,
         text_border: false,
-        text_border_color: 0,
-        text_border_alpha: 30,
-        text_border_size: 2,
         text_align: :left,
         font: "Arial",
         margin: 0,