cyberarm_engine 0.24.0 → 0.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5af070a65180730f1435091615fa8160c0763fbdc552918c63c93037b41571f0
-  data.tar.gz: f426d50db35a7f6b520a239bda8f9eed39d6e1b77ea77a1a7f9cca1c0b9edb0e
+  metadata.gz: 294097836d861784fb91a7545e332296b77edae06130318a067c7d92a92bb0a4
+  data.tar.gz: 6e345593db98b441f6e02b5dd4d1da4b1f6b7df668d0d8deedcf9422ad1d66ea
 SHA512:
-  metadata.gz: dbe115990e1e9ae8f7c86a2152a16e7ff7dd752cd84029b2e30b41cbce533b9649abea04009bf2c763b033ec64be89c85f60ef8d07040c450ba57e4fb1a1fe95
-  data.tar.gz: 18bf468ce8ccb6547e6f578f668f0cb9774d0833f60f8956ac4e98d68c5de61d4b3c1f3079e12e5032a92f4d3a2335a18ae7b4ac7ab15f7eeccd531ae0c64e0a
+  metadata.gz: 05c353bddf8d57cd9f7dc89c969022c496bde452fff8e732eaa61d0680bfcd6bd88377ecc6d8417d171eff2e999088578e77cad4e0a0a99c9562c1f87c52549f
+  data.tar.gz: b18674b78249fe48a3dc78b23680277125f1662bfbb18eb85182bb5a7fb614deaa5a74c8ebb76439b2728f1f57257a94933db908b8d723146898ab003ca261c2

data/lib/cyberarm_engine/background.rb

@@ -163,7 +163,7 @@ module CyberarmEngine
       elsif background.is_a?(Range)
         set([background.begin, background.begin, background.end, background.end])
       else
-        raise ArgumentError, "background '#{background}' of type '#{background.class}' was not able to be processed"
+        raise ArgumentError, "background '#{background.inspect}' of type '#{background.class}' was not able to be processed"
       end
     end
   end

data/lib/cyberarm_engine/ui/element.rb

@@ -71,8 +71,19 @@ module CyberarmEngine
       root.gui_state.request_repaint
     end
 
-    def safe_style_fetch(*args)
-      @style.hash.dig(@style_event, *args) || @style.hash.dig(:default, *args) || default(*args)
+    def safe_style_fetch(key, fallback_key = nil)
+      # Attempt to return value for requested key
+      v = @style.hash.dig(@style_event, key)
+      return v if v
+
+      # Attempt to return overriding value
+      if fallback_key
+        v = @style.hash.dig(@style_event, fallback_key)
+        return v if v
+      end
+
+      # Fallback to default style
+      @style.hash.dig(:default, key) || default(key)
     end
 
     def set_static_position
@@ -104,10 +115,10 @@ module CyberarmEngine
 
       @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
+      @style.background_nine_slice_left      = safe_style_fetch(:background_nine_slice_left, :background_nine_slice_from_edge)
+      @style.background_nine_slice_top       = safe_style_fetch(:background_nine_slice_top, :background_nine_slice_from_edge)
+      @style.background_nine_slice_right     = safe_style_fetch(:background_nine_slice_right, :background_nine_slice_from_edge)
+      @style.background_nine_slice_bottom    = safe_style_fetch(:background_nine_slice_bottom, :background_nine_slice_from_edge)
     end
 
     def set_background_image
@@ -121,19 +132,19 @@ module CyberarmEngine
     def set_border_thickness
       @style.border_thickness = safe_style_fetch(: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
+      @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
 
     def set_border_color
       @style.border_color = safe_style_fetch(: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_color_left   = safe_style_fetch(:border_color_left, :border_color)
+      @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,
@@ -146,19 +157,19 @@ module CyberarmEngine
     def set_padding
       @style.padding = safe_style_fetch(: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
+      @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)   || @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
+      @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)

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

@@ -236,6 +236,11 @@ module CyberarmEngine
         self.scroll_top = -@scroll_position.y
         @scroll_target_position.y = @scroll_position.y
 
+        # Fixes resized container that is scrolled down from being stuck overscrolled when resized
+        if scroll_height < height
+          @scroll_target_position.y = 0
+        end
+
         # NOTE: Experiment for removing need to explicitly call gui_state#recalculate at least 3 times for layout to layout...
         if old_width != @width || old_height != @height
           if @parent

data/lib/cyberarm_engine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyberarm_engine
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.2
 platform: ruby
 authors:
 - Cyberarm
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-17 00:00:00.000000000 Z
+date: 2024-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Make games quickly and easily with gosu