cyberarm_engine 0.18.0 → 0.19.0

data/lib/cyberarm_engine/ui/element.rb

@@ -36,7 +36,8 @@ 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
 
@@ -54,6 +55,7 @@ module CyberarmEngine
       set_margin
 
       set_background
+      set_background_nine_slice
 
       set_border_thickness
       set_border_color
@@ -74,6 +76,21 @@ module CyberarmEngine
       @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
       @style.border_thickness = safe_style_fetch(:border_thickness)
 
@@ -118,6 +135,9 @@ module CyberarmEngine
     end
 
     def update_styles(event = :default)
+      old_width = width
+      old_height = height
+
       _style = @style.send(event)
       @style_event = event
 
@@ -126,7 +146,13 @@ module CyberarmEngine
         @text.swap_font(_style&.dig(:text_size) || @style.default[:text_size], _style&.dig(:font) || @style.default[:font])
       end
 
-      (root&.gui_state || @gui_state).request_recalculate
+      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
@@ -241,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
@@ -343,11 +370,11 @@ module CyberarmEngine
     end
 
     def scroll_width
-      @children.sum { |c| c.width } + noncontent_width
+      @children.sum(&:width) + noncontent_width
     end
 
     def scroll_height
-      @children.sum { |c| c.height } + noncontent_height
+      @children.sum(&:height) + noncontent_height
     end
 
     def max_scroll_width
@@ -361,12 +388,10 @@ module CyberarmEngine
     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
 
@@ -383,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?
 

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

@@ -75,6 +75,8 @@ module CyberarmEngine
       end
 
       def hit_element?(x, y)
+        return unless hit?(x, y)
+
         @children.reverse_each do |child|
           next unless child.visible?
 

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

@@ -8,7 +8,10 @@ module CyberarmEngine
           text, font: @options[:font], z: @z, color: @options[:color],
                 size: @options[:text_size], shadow: @options[:text_shadow],
                 shadow_size: @options[:text_shadow_size],
-                shadow_color: @options[:text_shadow_color]
+                shadow_color: @options[:text_shadow_color],
+                border: @options[:text_border],
+                border_size: @options[:text_border_size],
+                border_color: @options[:text_border_color]
         )
 
         @raw_text = text
@@ -19,6 +22,12 @@ module CyberarmEngine
       end
 
       def recalculate
+        unless @enabled
+          @text.color = @style.disabled[:color]
+        else
+          @text.color = @style.color
+        end
+
         @width  = 0
         @height = 0
 

data/lib/cyberarm_engine/ui/event.rb

@@ -15,12 +15,19 @@ module CyberarmEngine
 
       return unless enabled?
 
-      return :handled if respond_to?(event) && (send(event, self, *args) == :handled)
+      was_handled = false
+
+      was_handled = true if respond_to?(event) && (send(event, self, *args) == :handled)
 
       @event_handler[event].reverse_each do |handler|
-        return :handled if handler.call(self, *args) == :handled
+        if handler.call(self, *args) == :handled
+          was_handled = true
+          break
+        end
       end
 
+      return :handled if was_handled
+
       parent.publish(event, *args) if parent
       nil
     end

data/lib/cyberarm_engine/ui/gui_state.rb

@@ -103,7 +103,7 @@ module CyberarmEngine
       if Vector.new(window.mouse_x, window.mouse_y) == @last_mouse_pos
         if @mouse_over && (Gosu.milliseconds - @mouse_moved_at) > tool_tip_delay
           @tip.value = @mouse_over.tip if @mouse_over
-          @tip.x = window.mouse_x - @tip.width / 2
+          @tip.x = window.mouse_x
           @tip.x = 0 if @tip.x < 0
           @tip.x = window.width - @tip.width if @tip.x + @tip.width > window.width
           @tip.y = window.mouse_y - (@tip.height + 5)

data/lib/cyberarm_engine/ui/theme.rb

@@ -115,10 +115,14 @@ module CyberarmEngine
         text_size: 28,
         text_wrap: :word_wrap, # :word_wrap, :break_word, :none
         text_shadow: false,
+        text_border: false,
         text_align: :left,
         font: "Arial",
         margin: 0,
-        padding: 2
+        padding: 2,
+        disabled: {
+          color: Gosu::Color.rgb(175, 175, 175),
+        }
       },
 
       Banner: { # < TextBlock

data/lib/cyberarm_engine/version.rb

@@ -1,4 +1,4 @@
 module CyberarmEngine
   NAME    = "InDev".freeze
-  VERSION = "0.18.0".freeze
+  VERSION = "0.19.0".freeze
 end

data/lib/cyberarm_engine.rb

@@ -23,12 +23,18 @@ require_relative "cyberarm_engine/vector"
 require_relative "cyberarm_engine/transform"
 require_relative "cyberarm_engine/ray"
 require_relative "cyberarm_engine/background"
+require_relative "cyberarm_engine/background_nine_slice"
 require_relative "cyberarm_engine/animator"
 
 require_relative "cyberarm_engine/text"
 require_relative "cyberarm_engine/timer"
 require_relative "cyberarm_engine/config_file"
 
+require_relative "cyberarm_engine/console"
+require_relative "cyberarm_engine/console/command"
+require_relative "cyberarm_engine/console/subcommand"
+require_relative "cyberarm_engine/console/commands/help_command"
+
 require_relative "cyberarm_engine/ui/dsl"
 
 require_relative "cyberarm_engine/ui/theme"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyberarm_engine
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Cyberarm
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -137,6 +137,10 @@ files:
 - lib/cyberarm_engine/cache/download_manager.rb
 - lib/cyberarm_engine/common.rb
 - lib/cyberarm_engine/config_file.rb
+- lib/cyberarm_engine/console.rb
+- lib/cyberarm_engine/console/command.rb
+- lib/cyberarm_engine/console/commands/help_command.rb
+- lib/cyberarm_engine/console/subcommand.rb
 - lib/cyberarm_engine/game_object.rb
 - lib/cyberarm_engine/game_state.rb
 - lib/cyberarm_engine/model.rb