cyberarm_engine 0.25.0 → 0.30.0

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

@@ -1,72 +1,78 @@
-module CyberarmEngine
-  class Element
-    class Image < Element
-      def initialize(path_or_image, options = {}, block = nil)
-        super(options, block)
-        @path = path_or_image if path_or_image.is_a?(String)
-
-        @image = Gosu::Image.new(path_or_image, retro: @options[:retro], tileable: @options[:tileable]) if @path
-        @image = path_or_image unless @path
-
-        @scale_x = 1
-        @scale_y = 1
-      end
-
-      def render
-        @image.draw(
-          @style.border_thickness_left + @style.padding_left + @x,
-          @style.border_thickness_top + @style.padding_top + @y,
-          @z + 2,
-          @scale_x, @scale_y, @style.color
-        )
-      end
-
-      def clicked_left_mouse_button(_sender, _x, _y)
-        @block.call(self) if @block
-
-        :handled
-      end
-
-      def layout
-        _width = dimensional_size(@style.width, :width)
-        _height = dimensional_size(@style.height, :height)
-
-        if _width && _height
-          @scale_x = _width.to_f / @image.width
-          @scale_y = _height.to_f / @image.height
-        elsif _width
-          @scale_x = _width.to_f / @image.width
-          @scale_y = @scale_x
-        elsif _height
-          @scale_y = _height.to_f / @image.height
-          @scale_x = @scale_y
-        else
-          @scale_x = 1
-          @scale_y = 1
-        end
-
-        @width = _width || (@image.width * @scale_x).floor
-        @height = _height || (@image.height * @scale_y).floor
-
-        update_background
-      end
-
-      def value
-        @image
-      end
-
-      def value=(path_or_image, retro: false, tileable: false)
-        @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
-      end
-
-      def path
-        @path
-      end
-    end
-  end
-end
+module CyberarmEngine
+  class Element
+    class Image < Element
+      def initialize(path_or_image, options = {}, block = nil)
+        super(options, block)
+        @path = path_or_image if path_or_image.is_a?(String)
+
+        @image = Gosu::Image.new(path_or_image, retro: @options[:retro], tileable: @options[:tileable]) if @path
+        @image = path_or_image unless @path
+
+        @scale_x = 1
+        @scale_y = 1
+      end
+
+      def render
+        @image.draw(
+          styled(:margin_left) + styled(:border_thickness_left) + styled(:padding_left) + @x,
+          styled(:margin_top) + styled(:border_thickness_top) + styled(:padding_top) + @y,
+          @z + 2,
+          @scale_x, @scale_y, styled(:color)
+        )
+      end
+
+      def clicked_left_mouse_button(_sender, _x, _y)
+        @block.call(self) if @block
+
+        :handled
+      end
+
+      def layout
+        _width = dimensional_size(@style.width, :width)
+        _height = dimensional_size(@style.height, :height)
+
+        if _width && _height
+          @scale_x = _width.to_f / @image.width
+          @scale_y = _height.to_f / @image.height
+        elsif _width
+          @scale_x = _width.to_f / @image.width
+          @scale_y = @scale_x
+        elsif _height
+          @scale_y = _height.to_f / @image.height
+          @scale_x = @scale_y
+        else
+          @scale_x = 1
+          @scale_y = 1
+        end
+
+        @width = _width || (@image.width * @scale_x).floor
+        @height = _height || (@image.height * @scale_y).floor
+
+        update_background
+      end
+
+      def value
+        @image
+      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
+        @path
+      end
+    end
+  end
+end

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

@@ -1,79 +1,79 @@
-module CyberarmEngine
-  class Element
-    class ListBox < Button
-      attr_accessor :items
-      attr_reader :choose
-
-      def initialize(options = {}, block = nil)
-        @items = options[:items] || []
-        @choose = options[:choose] || @items.first
-
-        super(@choose, options, block)
-
-        @style.background_canvas.background = default(:background)
-
-        @menu = Menu.new(parent: self, theme: @options[:theme])
-
-        self.choose = @choose
-      end
-
-      def render
-        super
-
-        w = @text.textobject.text_width("▼")
-        @text.textobject.draw_text("▼", @x + content_width - w, @y + @style.padding_top, @z, 1, 1, @text.color)
-      end
-
-      def choose=(item)
-        valid = @items.detect { |i| i == item }
-
-        unless valid
-          warn "Invalid value '#{item}' for choose, valid options were: #{@items.map { |i| "#{i.inspect}" }.join(", ")}"
-          item = @items.first
-
-          raise "No items list" unless item
-        end
-
-        @choose = item
-
-        self.value = item.to_s
-
-        recalculate
-      end
-
-      def released_left_mouse_button(_sender, _x, _y)
-        show_menu
-
-        :handled
-      end
-
-      def clicked_left_mouse_button(_sender, _x, _y)
-        # @block&.call(self.value) if @enabled
-
-        :handled
-      end
-
-      def show_menu
-        @menu.clear do
-
-          @menu.style.width = width
-
-          @items.each do |item|
-            # prevent already selected item from appearing in list
-            # NOTE: Remove this? Might be kinda confusing...
-            next if item == self.value
-
-            root.gui_state.menu_item(item, width: 1.0, margin: 0, border_color: 0x00ffffff) do
-              self.choose = item
-              @block&.call(self.value)
-            end
-          end
-        end
-
-        recalculate
-
-        @menu.show
-      end
-    end
-  end
-end
+module CyberarmEngine
+  class Element
+    class ListBox < Button
+      attr_accessor :items
+      attr_reader :choose
+
+      def initialize(options = {}, block = nil)
+        @items = options[:items] || []
+        @choose = options[:choose] || @items.first
+
+        super(@choose, options, block)
+
+        @background_canvas.background = default(:background)
+
+        @menu = Menu.new(parent: self, theme: @options[:theme])
+
+        self.choose = @choose
+      end
+
+      def render
+        super
+
+        w = @text.textobject.text_width("▼")
+        @text.textobject.draw_text("▼", @x + content_width - w, @y + styled(:padding_top), @z, 1, 1, @text.color)
+      end
+
+      def choose=(item)
+        valid = @items.detect { |i| i == item }
+
+        unless valid
+          warn "Invalid value '#{item}' for choose, valid options were: #{@items.map { |i| "#{i.inspect}" }.join(", ")}"
+          item = @items.first
+
+          raise "No items list" unless item
+        end
+
+        @choose = item
+
+        self.value = item.to_s
+
+        recalculate
+      end
+
+      def released_left_mouse_button(_sender, _x, _y)
+        show_menu
+
+        :handled
+      end
+
+      def clicked_left_mouse_button(_sender, _x, _y)
+        # @block&.call(self.value) if @enabled
+
+        :handled
+      end
+
+      def show_menu
+        @menu.clear do
+
+          @menu.style.width = width - (@menu.styled(:border_thickness_left) + @menu.styled(:border_thickness_right))
+
+          @items.each do |item|
+            # prevent already selected item from appearing in list
+            # NOTE: Remove this? Might be kinda confusing...
+            next if item == self.value
+
+            root.gui_state.menu_item(item, width: 1.0, margin: 0, border_color: 0x00ffffff) do
+              self.choose = item
+              @block&.call(self.value)
+            end
+          end
+        end
+
+        recalculate
+
+        @menu.show
+      end
+    end
+  end
+end

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

@@ -1,27 +1,27 @@
-module CyberarmEngine
-  class Element
-    class Menu < Stack
-      def recalculate
-        super
-
-        recalculate_menu
-      end
-
-      def recalculate_menu
-        # FIXME: properly find scrollable parent, if any.
-        parent_scroll_top = parent&.parent ? parent.parent.scroll_top : 0
-
-        @x = @parent.x
-        @y = parent_scroll_top + @parent.y + @parent.height
-
-        @y = (parent_scroll_top + @parent.y) - height if @y + height > window.height
-      end
-
-      def show
-        recalculate
-
-        root.gui_state.show_menu(self)
-      end
-    end
-  end
-end
+module CyberarmEngine
+  class Element
+    class Menu < Stack
+      def recalculate
+        super
+
+        recalculate_menu
+      end
+
+      def recalculate_menu
+        # 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)
+        @y = parent_scroll_top + @parent.y + @parent.height + @parent.styled(:border_thickness_top)
+
+        @y = (parent_scroll_top + @parent.y + @parent.styled(:border_thickness_top)) - height if @y + height > window.height
+      end
+
+      def show
+        recalculate
+
+        root.gui_state.show_menu(self)
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
-module CyberarmEngine
-  class Element
-    class MenuItem < Button
-    end
-  end
-end
+module CyberarmEngine
+  class Element
+    class MenuItem < Button
+    end
+  end
+end

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

@@ -1,93 +1,95 @@
-module CyberarmEngine
-  class Element
-    class Progress < Element
-      attr_reader :type
-
-      def initialize(options = {}, block = nil)
-        super(options, block)
-
-        @animation_speed = options[:animation_speed] || 3_000
-        @marquee_width = options[:marquee_width] || 0.25
-        @marquee_offset = 0
-        @marquee_animation_time = Gosu.milliseconds
-        @type = options[:type] || :linear
-        @fraction_background = Background.new(background: @style.fraction_background)
-        self.value = options[:fraction] || 0.0
-      end
-
-      def render
-        @fraction_background.draw
-      end
-
-      def layout
-        _width = dimensional_size(@style.width, :width)
-        _height = dimensional_size(@style.height, :height)
-        @width = _width
-        @height = _height
-
-        update_background
-      end
-
-      def update_background
-        super
-
-        @fraction_background.x = (@style.border_thickness_left + @style.padding_left + @x) + @marquee_offset
-        @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 = @style.fraction_background
-      end
-
-      def update
-        super
-
-        return unless @type == :marquee
-
-        marquee_width = @width * @marquee_width
-        range = @width + marquee_width
-
-        @marquee_offset = (@width * (Gosu.milliseconds - @marquee_animation_time) / @animation_speed) - marquee_width
-        @marquee_animation_time = Gosu.milliseconds if @marquee_offset > range
-
-        update_background
-        root.gui_state.request_repaint
-      end
-
-      def type=(type)
-        @type = type
-
-        case type
-        when :linear
-          @marquee_offset = 0
-        when :marquee
-          @marquee_offset = 0
-          @marquee_animation_time = Gosu.milliseconds
-        else
-          raise ArgumentError, "Only types :linear and :marquee are supported"
-        end
-
-        update_background
-      end
-
-      def value
-        @fraction
-      end
-
-      def value=(decimal)
-        raise "value must be number" unless decimal.is_a?(Numeric)
-
-        old_value = @fraction
-
-        @fraction = decimal.clamp(0.0, 1.0)
-        update_background
-
-        root.gui_state.request_repaint if @fraction != old_value
-
-        publish(:changed, @fraction)
-        @fraction
-      end
-    end
-  end
-end
+module CyberarmEngine
+  class Element
+    class Progress < Element
+      attr_reader :type
+
+      def initialize(options = {}, block = nil)
+        super(options, block)
+
+        @animation_speed = options[:animation_speed] || 3_000
+        @marquee_width = options[:marquee_width] || 0.25
+        @marquee_offset = 0
+        @marquee_animation_time = Gosu.milliseconds
+        @type = options[:type] || :linear
+        @fraction_background = Background.new(background: styled(:fraction_background))
+        self.value = options[:fraction] || 0.0
+      end
+
+      def render
+        @fraction_background.draw
+      end
+
+      def layout
+        _width = dimensional_size(@style.width, :width)
+        _height = dimensional_size(@style.height, :height)
+        @width = _width
+        @height = _height
+
+        update_background
+      end
+
+      def update_background
+        super
+
+        @fraction_background.x = (styled(:border_thickness_left) + styled(:padding_left) + @x) + @marquee_offset
+        @fraction_background.y = styled(:border_thickness_top) + styled(: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)
+      end
+
+      def update
+        super
+
+        return unless @type == :marquee
+
+        marquee_width = @width * @marquee_width
+        range = @width + marquee_width
+
+        @marquee_offset = (@width * (Gosu.milliseconds - @marquee_animation_time) / @animation_speed) - marquee_width
+        @marquee_animation_time = Gosu.milliseconds if @marquee_offset > range
+
+        update_background
+        root.gui_state.request_repaint
+      end
+
+      def type=(type)
+        @type = type
+
+        case type
+        when :linear
+          @marquee_offset = 0
+        when :marquee
+          @marquee_offset = 0
+          @marquee_animation_time = Gosu.milliseconds
+        else
+          raise ArgumentError, "Only types :linear and :marquee are supported"
+        end
+
+        update_background
+      end
+
+      def value
+        @fraction
+      end
+
+      def value=(decimal)
+        raise "value must be number" unless decimal.is_a?(Numeric)
+
+        old_value = @fraction
+
+        @fraction = decimal.clamp(0.0, 1.0)
+        update_background
+
+        if @fraction != old_value
+          root.gui_state.request_repaint
+          publish(:changed, @fraction)
+        end
+
+        @fraction
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
-module CyberarmEngine
-  class Element
-    class Radio < Element
-    end
-  end
-end
+module CyberarmEngine
+  class Element
+    class Radio < Element
+    end
+  end
+end