cyberarm_engine 0.25.0 → 0.30.0

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

@@ -1,100 +1,99 @@
-module CyberarmEngine
-  class Element
-    class Button < TextBlock
-      def initialize(text_or_image, options = {}, block = nil)
-        @image = nil
-        @scale_x = 1
-        @scale_y = 1
-
-        @image = text_or_image if text_or_image.is_a?(Gosu::Image)
-
-        super(text_or_image, options, block)
-
-        @style.background_canvas.background = @style.background
-      end
-
-      def render
-        if @image
-          draw_image
-        else
-          draw_text
-        end
-      end
-
-      def draw_image
-        @image.draw(
-          @style.border_thickness_left + @style.padding_left + @x,
-          @style.border_thickness_top + @style.padding_top + @y,
-          @z + 2,
-          @scale_x, @scale_y, @text.color
-        )
-      end
-
-      def draw_text
-        @text.draw
-      end
-
-      def layout
-        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
-
-        if @image
-          @width = 0
-          @height = 0
-
-          _width = dimensional_size(@style.image_width, :width)
-          _height = dimensional_size(@style.image_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.floor * @scale_x
-          @height = _height || @image.height.floor * @scale_y
-
-          update_background
-        else
-          super
-        end
-      end
-
-      def value
-        @image || super
-      end
-
-      def value=(value)
-        if value.is_a?(Gosu::Image)
-          @image = value
-        else
-          super
-        end
-
-        old_width = width
-        old_height = height
-
-        if old_width != width || old_height != height
-          root.gui_state.request_recalculate
-        else
-          recalculate
-        end
-
-        publish(:changed, self.value)
-      end
-    end
-  end
-end
+module CyberarmEngine
+  class Element
+    class Button < TextBlock
+      def initialize(text_or_image, options = {}, block = nil)
+        @image = nil
+        @scale_x = 1
+        @scale_y = 1
+
+        @image = text_or_image if text_or_image.is_a?(Gosu::Image)
+
+        super(text_or_image, options, block)
+
+        @background_canvas.background = styled(:background)
+      end
+
+      def render
+        if @image
+          draw_image
+        else
+          draw_text
+        end
+      end
+
+      def draw_image
+        @image.draw(
+          styled(:border_thickness_left) + styled(:margin_left) + styled(:padding_left) + @x,
+          styled(:border_thickness_top) + styled(:margin_top) + styled(:padding_top) + @y,
+          @z + 2,
+          @scale_x, @scale_y, @text.color
+        )
+      end
+
+      def draw_text
+        @text.draw
+      end
+
+      def layout
+        @background_canvas.background = styled(:background)
+        @text.color = styled(:color)
+
+        if @image
+          @width = 0
+          @height = 0
+
+          _width = dimensional_size(styled(:image_width), :width)
+          _height = dimensional_size(styled(:image_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.floor * @scale_x
+          @height = _height || @image.height.floor * @scale_y
+
+          update_background
+        else
+          super
+        end
+      end
+
+      def value
+        @image || super
+      end
+
+      def value=(value)
+        old_value = self.value
+
+        if value.is_a?(Gosu::Image)
+          @image = value
+        else
+          super
+        end
+
+        old_width = width
+        old_height = height
+
+        if old_width != width || old_height != height
+          root.gui_state.request_recalculate
+        else
+          recalculate
+        end
+
+        publish(:changed, self.value) if value != old_value
+
+        self.value
+      end
+    end
+  end
+end

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

@@ -1,54 +1,58 @@
-module CyberarmEngine
-  class Element
-    class CheckBox < Flow
-      def initialize(text, options, block = nil)
-        super(options, block)
-        options[:toggled] = options[:checked]
-
-        options[:parent] = self
-        @toggle_button = ToggleButton.new(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)
-        end
-
-        @label.subscribe(:released_left_mouse_button) do |sender, x, y|
-          @toggle_button.released_left_mouse_button(sender, x, y)
-        end
-
-        @label.subscribe(:clicked_left_mouse_button) do |sender, x, y|
-          @toggle_button.clicked_left_mouse_button(sender, x, y)
-          publish(:changed, @toggle_button.value)
-        end
-
-        @label.subscribe(:enter) do |sender|
-          @toggle_button.enter(sender)
-        end
-
-        @label.subscribe(:leave) do |sender|
-          @toggle_button.leave(sender)
-        end
-
-        add(@toggle_button)
-        add(@label)
-      end
-
-      def text=(text)
-        @label.text = text
-        recalculate
-      end
-
-      def value
-        @toggle_button.value
-      end
-
-      def value=(bool)
-        @toggle_button.value = bool
-        publish(:changed, @toggle_button.value)
-      end
-    end
-  end
-end
+module CyberarmEngine
+  class Element
+    class CheckBox < Flow
+      def initialize(text, options, block = nil)
+        super(options, block)
+        options[:toggled] = options[:checked]
+
+        options[:parent] = self
+        @toggle_button = ToggleButton.new(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)
+        end
+
+        @label.subscribe(:released_left_mouse_button) do |sender, x, y|
+          @toggle_button.released_left_mouse_button(sender, x, y)
+        end
+
+        @label.subscribe(:clicked_left_mouse_button) do |sender, x, y|
+          @toggle_button.clicked_left_mouse_button(sender, x, y)
+          publish(:changed, @toggle_button.value)
+        end
+
+        @label.subscribe(:enter) do |sender|
+          @toggle_button.enter(sender)
+        end
+
+        @label.subscribe(:leave) do |sender|
+          @toggle_button.leave(sender)
+        end
+
+        add(@toggle_button)
+        add(@label)
+      end
+
+      def text=(text)
+        @label.text = text
+        recalculate
+      end
+
+      def value
+        @toggle_button.value
+      end
+
+      def value=(bool)
+        old_value = self.value
+
+        @toggle_button.value = bool
+        publish(:changed, bool) if bool != old_value
+
+        bool
+      end
+    end
+  end
+end