cyberarm_engine 0.16.0 → 0.19.0

data/lib/cyberarm_engine/text.rb

@@ -3,7 +3,9 @@ module CyberarmEngine
     CACHE = {}
 
     attr_accessor :x, :y, :z, :size, :options
-    attr_reader :text, :textobject, :factor_x, :factor_y, :color, :shadow, :shadow_size, :shadow_alpha, :shadow_color
+    attr_reader :text, :textobject, :factor_x, :factor_y, :color,
+                :border, :border_size, :border_alpha, :border_color,
+                :shadow, :shadow_size, :shadow_alpha, :shadow_color
 
     def initialize(text, options = {})
       @text = text.to_s || ""
@@ -15,16 +17,25 @@ module CyberarmEngine
       @z = options[:z] || 1025
       @factor_x = options[:factor_x]  || 1
       @factor_y = options[:factor_y]  || 1
-      @color    = options[:color]     || Gosu::Color::WHITE
+      if options[:color]
+        @color = options[:color].is_a?(Gosu::Color) ? options[:color] : Gosu::Color.new(options[:color])
+      else
+        @color = Gosu::Color::WHITE
+      end
       @mode     = options[:mode]      || :default
       @alignment = options[:alignment] || nil
-      @shadow   = true  if options[:shadow] == true
-      @shadow   = false if options[:shadow] == false
-      @shadow   = true if options[:shadow].nil?
-      @shadow_size = options[:shadow_size] || 1
-      @shadow_alpha = options[:shadow_alpha] || 30
+
+      @border   = options[:border]
+      @border   = true if options[:border].nil?
+      @border_size = options[:border_size] || 1
+      @border_alpha = options[:border_alpha] || 30
+      @border_color = options[:border_color]
+
+      @shadow = options[:shadow]
+      @shadow_size = options[:shadow_size] || 2
       @shadow_alpha = options[:shadow_alpha] || 30
       @shadow_color = options[:shadow_color]
+
       @textobject = check_cache(@size, @font)
 
       if @alignment
@@ -37,8 +48,6 @@ module CyberarmEngine
           @x = $window.width - BUTTON_PADDING - @textobject.text_width(@text)
         end
       end
-
-      self
     end
 
     def check_cache(size, font_name)
@@ -65,82 +74,110 @@ module CyberarmEngine
       font
     end
 
+    def swap_font(size, font_name = @font)
+      if @size != size || @font != font_name
+        @size = size
+        @font = font_name
+
+        @textobject = check_cache(size, font_name)
+      end
+    end
+
     def text=(string)
-      @rendered_shadow = nil
+      @rendered_border = nil
       @text = string
     end
 
     def factor_x=(n)
-      @rendered_shadow = nil
+      @rendered_border = nil
       @factor_x = n
     end
 
     def factor_y=(n)
-      @rendered_shadow = nil
+      @rendered_border = nil
       @factor_y = n
     end
 
     def color=(color)
-      @rendered_shadow = nil
-      @color = color
+      @rendered_border = nil
+      if color
+        @color = color.is_a?(Gosu::Color) ? color : Gosu::Color.new(color)
+      else
+        raise "color cannot be nil"
+      end
     end
 
-    def shadow=(boolean)
-      @rendered_shadow = nil
-      @shadow = boolean
+    def border=(boolean)
+      @rendered_border = nil
+      @border = boolean
     end
 
-    def shadow_size=(n)
-      @rendered_shadow = nil
-      @shadow_size = n
+    def border_size=(n)
+      @rendered_border = nil
+      @border_size = n
     end
 
-    def shadow_alpha=(n)
-      @rendered_shadow = nil
-      @shadow_alpha = n
+    def border_alpha=(n)
+      @rendered_border = nil
+      @border_alpha = n
     end
 
-    def shadow_color=(n)
-      @rendered_shadow = nil
-      @shadow_color = n
+    def border_color=(n)
+      @rendered_border = nil
+      @border_color = n
     end
 
     def width(text = @text)
-      textobject.text_width(text)
+      markup_width(text)
+    end
+
+    def text_width(text = @text)
+      textobject.text_width(text) + @border_size + @shadow_size
     end
 
     def markup_width(text = @text)
-      textobject.markup_width(text)
+      textobject.markup_width(text) + @border_size + @shadow_size
     end
 
     def height(text = @text)
-      text.lines.count > 0 ? text.lines.count * textobject.height : @textobject.height
+      if text.lines.count > 0
+        text.lines.count * textobject.height + @border_size + @shadow_size
+      else
+        @textobject.height + @border_size + @shadow_size
+      end
     end
 
     def draw(method = :draw_markup)
-      if @shadow && !ARGV.join.include?("--no-shadow")
-        shadow_alpha = @color.alpha <= 30 ? @color.alpha : @shadow_alpha
-        shadow_color = @shadow_color || Gosu::Color.rgba(@color.red, @color.green, @color.blue,
-                                                         shadow_alpha)
+      if @border && !ARGV.join.include?("--no-border")
+        border_alpha = @color.alpha <= 30 ? @color.alpha : @border_alpha
+        border_color = @border_color || Gosu::Color.rgba(@color.red, @color.green, @color.blue,
+                                                         border_alpha)
         white = Gosu::Color::WHITE
 
-        _x = @shadow_size
-        _y = @shadow_size
+        _x = @border_size
+        _y = @border_size
+        _width = method == :draw_markup ? text_width : markup_width
 
-        @rendered_shadow ||= Gosu.render((width + (shadow_size * 2)).ceil, (height + (@shadow_size * 2)).ceil) do
-          @textobject.send(method, @text, _x - @shadow_size, _y, @z, @factor_x, @factor_y, white, :add)
-          @textobject.send(method, @text, _x - @shadow_size, _y - @shadow_size, @z, @factor_x, @factor_y, white, :add)
+        @rendered_border ||= Gosu.render((_width + (border_size * 2)).ceil, (height + (@border_size * 2)).ceil) do
+          @textobject.send(method, @text, _x - @border_size, _y, @z, @factor_x, @factor_y, white, @mode)
+          @textobject.send(method, @text, _x - @border_size, _y - @border_size, @z, @factor_x, @factor_y, white, @mode)
 
-          @textobject.send(method, @text, _x, _y - @shadow_size, @z, @factor_x, @factor_y, white, :add)
-          @textobject.send(method, @text, _x + @shadow_size, _y - @shadow_size, @z, @factor_x, @factor_y, white, :add)
+          @textobject.send(method, @text, _x, _y - @border_size, @z, @factor_x, @factor_y, white, @mode)
+          @textobject.send(method, @text, _x + @border_size, _y - @border_size, @z, @factor_x, @factor_y, white, @mode)
 
-          @textobject.send(method, @text, _x, _y + @shadow_size, @z, @factor_x, @factor_y, white, :add)
-          @textobject.send(method, @text, _x - @shadow_size, _y + @shadow_size, @z, @factor_x, @factor_y, white, :add)
+          @textobject.send(method, @text, _x, _y + @border_size, @z, @factor_x, @factor_y, white, @mode)
+          @textobject.send(method, @text, _x - @border_size, _y + @border_size, @z, @factor_x, @factor_y, white, @mode)
 
-          @textobject.send(method, @text, _x + @shadow_size, _y, @z, @factor_x, @factor_y, white, :add)
-          @textobject.send(method, @text, _x + @shadow_size, _y + @shadow_size, @z, @factor_x, @factor_y, white, :add)
+          @textobject.send(method, @text, _x + @border_size, _y, @z, @factor_x, @factor_y, white, @mode)
+          @textobject.send(method, @text, _x + @border_size, _y + @border_size, @z, @factor_x, @factor_y, white, @mode)
         end
-        @rendered_shadow.draw(@x - @shadow_size, @y - @shadow_size, @z, @factor_x, @factor_y, shadow_color)
+
+        @rendered_border.draw(@x - @border_size, @y - @border_size, @z, @factor_x, @factor_y, border_color)
+      end
+
+      if @shadow
+        shadow_color = @shadow_color || Gosu::Color.rgba(@color.red, @color.green, @color.blue, @shadow_alpha)
+        @textobject.send(method, @text, @x + @shadow_size, @y + @shadow_size, @z, @factor_x, @factor_y, shadow_color, @mode)
       end
 
       @textobject.send(method, @text, @x, @y, @z, @factor_x, @factor_y, @color, @mode)

data/lib/cyberarm_engine/ui/dsl.rb

@@ -23,7 +23,8 @@ module CyberarmEngine
       "Tagline",
       "Caption",
       "Para",
-      "Inscription"
+      "Inscription",
+      "Link"
     ].each do |const|
       define_method(:"#{const.downcase}") do |text, options = {}, &block|
         options[:parent] = element_parent
@@ -97,7 +98,7 @@ module CyberarmEngine
     end
 
     def background(color = Gosu::Color::NONE)
-      element_parent.style.background = color
+      element_parent.style.default[:background] = color
     end
 
     def theme(theme)

data/lib/cyberarm_engine/ui/element.rb

@@ -18,6 +18,8 @@ module CyberarmEngine
       @visible = @options[:visible].nil? ? true  : @options[:visible]
       @tip     = @options[:tip] || ""
 
+      @debug_color = @options[:debug_color].nil? ? Gosu::Color::RED : @options[:debug_color]
+
       @style = Style.new(options)
 
       @root ||= nil
@@ -34,23 +36,33 @@ module CyberarmEngine
       @style.height = default(:height) || nil
 
       @style.background_canvas = Background.new
-      @style.border_canvas     = BorderCanvas.new(element: self)
+      @style.background_nine_slice_canvas = BackgroundNineSlice.new
+      @style.border_canvas = BorderCanvas.new(element: self)
+
+      @style_event = :default
 
       stylize
 
       default_events
+
+      root.gui_state.request_focus(self) if @options[:autofocus]
     end
 
     def stylize
       set_static_position
-      set_border_thickness(@style.border_thickness)
 
-      set_padding(@style.padding)
+      set_padding
+      set_margin
 
-      set_margin(@style.margin)
+      set_background
+      set_background_nine_slice
+
+      set_border_thickness
+      set_border_color
+    end
 
-      set_background(@style.background)
-      set_border_color(@style.border_color)
+    def safe_style_fetch(*args)
+      @style.hash.dig(@style_event, *args) || @style.hash.dig(:default, *args) || default(*args)
     end
 
     def set_static_position
@@ -58,47 +70,89 @@ module CyberarmEngine
       @y = @style.y if @style.y != 0
     end
 
-    def set_background(background)
-      @style.background = background
-      @style.background_canvas.background = background
+    def set_background
+      @style.background = safe_style_fetch(:background)
+
+      @style.background_canvas.background = @style.background
+    end
+
+    def set_background_nine_slice
+      @style.background_nine_slice = safe_style_fetch(:background_nine_slice)
+
+      @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
+
+      @style.background_nine_slice_from_edge = safe_style_fetch(:background_nine_slice_from_edge)
+
+      @style.background_nine_slice_left      = safe_style_fetch(:background_nine_slice_left)   || @style.background_nine_slice_from_edge
+      @style.background_nine_slice_top       = safe_style_fetch(:background_nine_slice_top)    || @style.background_nine_slice_from_edge
+      @style.background_nine_slice_right     = safe_style_fetch(:background_nine_slice_right)  || @style.background_nine_slice_from_edge
+      @style.background_nine_slice_bottom    = safe_style_fetch(:background_nine_slice_bottom) || @style.background_nine_slice_from_edge
     end
 
-    def set_border_thickness(border_thickness)
-      @style.border_thickness = border_thickness
+    def set_border_thickness
+      @style.border_thickness = safe_style_fetch(: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
+      @style.border_thickness_left   = safe_style_fetch(:border_thickness_left)   || @style.border_thickness
+      @style.border_thickness_right  = safe_style_fetch(:border_thickness_right)  || @style.border_thickness
+      @style.border_thickness_top    = safe_style_fetch(:border_thickness_top)    || @style.border_thickness
+      @style.border_thickness_bottom = safe_style_fetch(:border_thickness_bottom) || @style.border_thickness
     end
 
-    def set_border_color(color)
-      @style.border_color = color
+    def set_border_color
+      @style.border_color = safe_style_fetch(: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
+      @style.border_color_left   = safe_style_fetch(:border_color_left)   || @style.border_color
+      @style.border_color_right  = safe_style_fetch(:border_color_right)  || @style.border_color
+      @style.border_color_top    = safe_style_fetch(:border_color_top)    || @style.border_color
+      @style.border_color_bottom = safe_style_fetch(:border_color_bottom) || @style.border_color
 
-      @style.border_canvas.color = 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(padding)
-      @style.padding = padding
+    def set_padding
+      @style.padding = safe_style_fetch(: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
+      @style.padding_left   = safe_style_fetch(:padding_left)   || @style.padding
+      @style.padding_right  = safe_style_fetch(:padding_right)  || @style.padding
+      @style.padding_top    = safe_style_fetch(:padding_top)    || @style.padding
+      @style.padding_bottom = safe_style_fetch(:padding_bottom) || @style.padding
     end
 
-    def set_margin(margin)
-      @style.margin = margin
+    def set_margin
+      @style.margin = safe_style_fetch(:margin)
+
+      @style.margin_left   = safe_style_fetch(:margin_left)   || @style.margin
+      @style.margin_right  = safe_style_fetch(:margin_right)  || @style.margin
+      @style.margin_top    = safe_style_fetch(:margin_top)    || @style.margin
+      @style.margin_bottom = safe_style_fetch(:margin_bottom) || @style.margin
+    end
+
+    def update_styles(event = :default)
+      old_width = width
+      old_height = height
+
+      _style = @style.send(event)
+      @style_event = event
 
-      @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
+      if @text.is_a?(CyberarmEngine::Text)
+        @text.color = _style&.dig(:color) || @style.default[:color]
+        @text.swap_font(_style&.dig(:text_size) || @style.default[:text_size], _style&.dig(:font) || @style.default[:font])
+      end
+
+      return if self.is_a?(ToolTip)
+
+      if old_width != width || old_height != height
+        (root&.gui_state || @gui_state).request_recalculate
+      else
+        stylize
+      end
     end
 
     def default_events
@@ -116,11 +170,74 @@ module CyberarmEngine
       event(:hover)
       event(:leave)
 
+      event(:focus)
       event(:blur)
 
       event(:changed)
     end
 
+    def enter(_sender)
+      @focus = false unless window.button_down?(Gosu::MsLeft)
+
+      if !@enabled
+        update_styles(:disabled)
+      elsif @focus
+        update_styles(:active)
+      else
+        update_styles(:hover)
+      end
+
+      :handled
+    end
+
+    def left_mouse_button(_sender, _x, _y)
+      @focus = true
+
+      unless @enabled
+        update_styles(:disabled)
+      else
+        update_styles(:active)
+      end
+
+      window.current_state.focus = self
+
+      :handled
+    end
+
+    def released_left_mouse_button(sender, _x, _y)
+      enter(sender)
+
+      :handled
+    end
+
+    def clicked_left_mouse_button(_sender, _x, _y)
+      @block&.call(self) if @enabled && !self.is_a?(Container)
+
+      :handled
+    end
+
+    def leave(_sender)
+      if @enabled
+        update_styles
+      else
+        update_styles(:disabled)
+      end
+
+      :handled
+    end
+
+    def blur(_sender)
+      @focus = false
+
+      if @enabled
+        update_styles
+      else
+        update_styles(:disabled)
+      end
+
+      :handled
+    end
+
     def enabled?
       @enabled
     end
@@ -150,6 +267,7 @@ module CyberarmEngine
       return unless visible?
 
       @style.background_canvas.draw
+      @style.background_nine_slice_canvas.draw
       @style.border_canvas.draw
 
       Gosu.clip_to(@x, @y, width, height) do
@@ -157,6 +275,31 @@ module CyberarmEngine
       end
     end
 
+    def debug_draw
+      return if defined?(GUI_DEBUG_ONLY_ELEMENT) && self.class == GUI_DEBUG_ONLY_ELEMENT
+
+      Gosu.draw_line(
+        x, y, @debug_color,
+        x + outer_width, y, @debug_color,
+        Float::INFINITY
+      )
+      Gosu.draw_line(
+        x + outer_width, y, @debug_color,
+        x + outer_width, y + outer_height, @debug_color,
+        Float::INFINITY
+      )
+      Gosu.draw_line(
+        x + outer_width, y + outer_height, @debug_color,
+        x, y + outer_height, @debug_color,
+        Float::INFINITY
+      )
+      Gosu.draw_line(
+        x, outer_height, @debug_color,
+        x, y, @debug_color,
+        Float::INFINITY
+      )
+    end
+
     def update
     end
 
@@ -226,20 +369,34 @@ module CyberarmEngine
       (@style.border_thickness_top + @style.padding_top) + (@style.padding_bottom + @style.border_thickness_bottom)
     end
 
+    def scroll_width
+      @children.sum(&:width) + noncontent_width
+    end
+
+    def scroll_height
+      @children.sum(&:height) + noncontent_height
+    end
+
+    def max_scroll_width
+      scroll_width - width
+    end
+
+    def max_scroll_height
+      scroll_height - height
+    end
+
     def dimensional_size(size, dimension)
       raise "dimension must be either :width or :height" unless %i[width height].include?(dimension)
 
-      if size && size.is_a?(Numeric)
-        if size.between?(0.0, 1.0)
-          ((@parent.send(:"content_#{dimension}") - send(:"noncontent_#{dimension}")) * size).round
-        else
-          size
-        end
+      if size.is_a?(Numeric) && size.between?(0.0, 1.0)
+        (@parent.send(:"content_#{dimension}") * size).round - send(:"noncontent_#{dimension}").round
+      else
+        size
       end
     end
 
     def background=(_background)
-      @style.background_canvas.background = (_background)
+      @style.background_canvas.background = _background
       update_background
     end
 
@@ -251,10 +408,34 @@ module CyberarmEngine
       @style.background_canvas.height = height
 
       @style.background_canvas.update
-
+      update_background_nine_slice
       @style.border_canvas.update
     end
 
+    def background_nine_slice=(_image_path)
+      @style.background_nine_slice_canvas.image = _image_path
+      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 root
       return self if is_root?
 
@@ -262,11 +443,9 @@ module CyberarmEngine
         @root = parent
 
         loop do
-          if @root.parent.nil?
-            break
-          else
-            @root = @root.parent
-          end
+          break unless @root&.parent
+
+          @root = @root.parent
         end
       end
 
@@ -277,6 +456,12 @@ module CyberarmEngine
       @gui_state != nil
     end
 
+    def focus(_)
+      warn "#{self.class}#focus was not overridden!"
+
+      :handled
+    end
+
     def recalculate
       raise "#{self.class}#recalculate was not overridden!"
     end
@@ -295,5 +480,9 @@ module CyberarmEngine
     def to_s
       "#{self.class} x=#{x} y=#{y} width=#{width} height=#{height} value=#{value.is_a?(String) ? "\"#{value}\"" : value}"
     end
+
+    def inspect
+      to_s
+    end
   end
 end

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

@@ -34,69 +34,6 @@ module CyberarmEngine
         @text.draw
       end
 
-      def enter(_sender)
-        @focus = false unless window.button_down?(Gosu::MsLeft)
-
-        if !@enabled
-          @style.background_canvas.background = @style.disabled[:background]
-          @text.color = @style.disabled[:color]
-        elsif @focus
-          @style.background_canvas.background = @style.active[:background]
-          @text.color = @style.active[:color]
-        else
-          @style.background_canvas.background = @style.hover[:background]
-          @text.color = @style.hover[:color]
-        end
-
-        :handled
-      end
-
-      def left_mouse_button(_sender, _x, _y)
-        @focus = true
-
-        unless @enabled
-          @style.background_canvas.background = @style.disabled[:background]
-          @text.color = @style.disabled[:color]
-        else
-          @style.background_canvas.background = @style.active[:background]
-          @text.color = @style.active[:color]
-        end
-
-        window.current_state.focus = self
-
-        :handled
-      end
-
-      def released_left_mouse_button(sender, _x, _y)
-        enter(sender)
-
-        :handled
-      end
-
-      def clicked_left_mouse_button(_sender, _x, _y)
-        @block.call(self) if @enabled && @block
-
-        :handled
-      end
-
-      def leave(_sender)
-        unless @enabled
-          @style.background_canvas.background = @style.disabled[:background]
-          @text.color = @style.disabled[:color]
-        else
-          @style.background_canvas.background = @style.background
-          @text.color = @style.color
-        end
-
-        :handled
-      end
-
-      def blur(_sender)
-        @focus = false
-
-        :handled
-      end
-
       def recalculate
         unless @enabled
           @style.background_canvas.background = @style.disabled[:background]

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

@@ -5,8 +5,11 @@ module CyberarmEngine
         super(options, block)
         options[:toggled] = options[:checked]
 
+        options[:parent] = self
         @toggle_button = ToggleButton.new(options)
-        @label         = TextBlock.new(text, options)
+
+        options[:parent] = self
+        @label = TextBlock.new(text, options)
 
         @label.subscribe(:holding_left_mouse_button) do |sender, x, y|
           @toggle_button.left_mouse_button(sender, x, y)