fidgit 0.2.4 → 0.2.5

data/lib/fidgit/elements/group.rb

@@ -1,64 +1,64 @@
-module Fidgit
-  class Group < Packer
-    attr_reader :selected
-
-    event :changed
-
-    def value; @selected ? @selected.value : nil; end
-
-    # @example
-    #   group do
-    #     horizontal do
-    #       radio_button 1, text: '1', checked: true
-    #       radio_button 2, text: '2'
-    #       subscribe :changed do |sender, value|
-    #         puts value
-    #       end
-    #     end
-    #   end
-    #
-    # @param (see Packer#initialize)
-    #
-    # @option (see Packer#initialize)
-    def initialize(options = {}, &block)
-      super(options)
-
-      @selected = nil
-      @buttons = []
-    end
-
-    def add_button(button)
-      @buttons.push button
-      self.value = button.value if button.checked?
-      nil
-    end
-
-    def remove_button(button)
-      self.value = nil if button == @selected
-      @buttons.delete button
-      nil
-    end
-
-    # @example
-    #   @my_group = group do
-    #     horizontal do
-    #       radio_button(1, text: '1', checked: true)
-    #       radio_button(2, text: '2')
-    #     end
-    #    end
-    #
-    #   # later
-    #   @my_group.value = 2
-    def value=(value)
-      if value != self.value
-        button = @buttons.find { |b| b.value == value }
-        @selected.uncheck if @selected and @selected.checked?
-        @selected = button
-        @selected.check if @selected and not @selected.checked?
-        publish :changed, self.value
-      end
-
-      value
-    end
-  end
-end
+module Fidgit
+  class Group < Packer
+    attr_reader :selected
+
+    event :changed
+
+    def value; @selected ? @selected.value : nil; end
+
+    # @example
+    #   group do
+    #     horizontal do
+    #       radio_button 1, text: '1', checked: true
+    #       radio_button 2, text: '2'
+    #       subscribe :changed do |sender, value|
+    #         puts value
+    #       end
+    #     end
+    #   end
+    #
+    # @param (see Packer#initialize)
+    #
+    # @option (see Packer#initialize)
+    def initialize(options = {}, &block)
+      super(options)
+
+      @selected = nil
+      @buttons = []
+    end
+
+    def add_button(button)
+      @buttons.push button
+      self.value = button.value if button.checked?
+      nil
+    end
+
+    def remove_button(button)
+      self.value = nil if button == @selected
+      @buttons.delete button
+      nil
+    end
+
+    # @example
+    #   @my_group = group do
+    #     horizontal do
+    #       radio_button(1, text: '1', checked: true)
+    #       radio_button(2, text: '2')
+    #     end
+    #    end
+    #
+    #   # later
+    #   @my_group.value = 2
+    def value=(value)
+      if value != self.value
+        button = @buttons.find { |b| b.value == value }
+        @selected.uncheck if @selected and @selected.checked?
+        @selected = button
+        @selected.check if @selected and not @selected.checked?
+        publish :changed, self.value
+      end
+
+      value
+    end
+  end
+end

data/lib/fidgit/elements/horizontal.rb

@@ -1,12 +1,12 @@
-# encoding: utf-8
-
-module Fidgit
-  # A vertically aligned element packing container.
-  class Horizontal < Grid
-    def initialize(options = {})
-      options[:num_rows] = 1
-
-      super options
-    end
-  end
+# encoding: utf-8
+
+module Fidgit
+  # A vertically aligned element packing container.
+  class Horizontal < Grid
+    def initialize(options = {})
+      options[:num_rows] = 1
+
+      super options
+    end
+  end
 end

data/lib/fidgit/elements/image_frame.rb

@@ -1,65 +1,65 @@
-module Fidgit
-  # A wrapper around a Gosu::Image to show it in the GUI.
-  class ImageFrame < Element
-    ENABLED_COLOR = Gosu::Color::WHITE
-    DISABLED_COLOR = Gosu::Color.rgb(150, 150, 150)
-
-    attr_reader :image, :factor_x, :factor_y
-
-    def thumbnail?; @thumbnail; end
-
-    # @param (see Element#initialize)
-    # @param [Gosu::Image] image Gosu image to display.
-    #
-    # @option (see Element#initialize)
-    # @option options [Boolean] :thumbnail (false) Is the image expanded to be square?
-    def initialize(image, options = {})
-      options = {
-          thumbnail: false,
-          factor: 1,
-      }.merge! options
-
-      @thumbnail = options[:thumbnail]
-      @factor_x = options[:factor_x] || options[:factor]
-      @factor_y = options[:factor_y] || options[:factor]
-
-      super(options)
-
-      self.image = image
-    end
-
-    def image=(image)
-      @image = image
-
-      recalc
-
-      image
-    end
-
-
-    def draw_foreground
-      @image.draw(x + padding_left, y + padding_top, z, factor_x, factor_y, enabled? ? ENABLED_COLOR : DISABLED_COLOR) if @image
-    end
-
-    protected
-    def layout
-      if @image
-        if @thumbnail
-          size = [@image.width, @image.height].max
-          rect.width = size * @factor_x
-          rect.height = size * @factor_y
-        else
-          rect.width = @image.width * @factor_x
-          rect.height = @image.height * @factor_y
-        end
-      else
-        rect.width = rect.height = 0
-      end
-
-      rect.width += padding_left + padding_right
-      rect.height += padding_top + padding_bottom
-
-      nil
-    end
-  end
+module Fidgit
+  # A wrapper around a Gosu::Image to show it in the GUI.
+  class ImageFrame < Element
+    ENABLED_COLOR = Gosu::Color::WHITE
+    DISABLED_COLOR = Gosu::Color.rgb(150, 150, 150)
+
+    attr_reader :image, :factor_x, :factor_y
+
+    def thumbnail?; @thumbnail; end
+
+    # @param (see Element#initialize)
+    # @param [Gosu::Image] image Gosu image to display.
+    #
+    # @option (see Element#initialize)
+    # @option options [Boolean] :thumbnail (false) Is the image expanded to be square?
+    def initialize(image, options = {})
+      options = {
+          thumbnail: false,
+          factor: 1,
+      }.merge! options
+
+      @thumbnail = options[:thumbnail]
+      @factor_x = options[:factor_x] || options[:factor]
+      @factor_y = options[:factor_y] || options[:factor]
+
+      super(options)
+
+      self.image = image
+    end
+
+    def image=(image)
+      @image = image
+
+      recalc
+
+      image
+    end
+
+
+    def draw_foreground
+      @image.draw(x + padding_left, y + padding_top, z, factor_x, factor_y, enabled? ? ENABLED_COLOR : DISABLED_COLOR) if @image
+    end
+
+    protected
+    def layout
+      if @image
+        if @thumbnail
+          size = [@image.width, @image.height].max
+          rect.width = size * @factor_x
+          rect.height = size * @factor_y
+        else
+          rect.width = @image.width * @factor_x
+          rect.height = @image.height * @factor_y
+        end
+      else
+        rect.width = rect.height = 0
+      end
+
+      rect.width += padding_left + padding_right
+      rect.height += padding_top + padding_bottom
+
+      nil
+    end
+  end
 end

data/lib/fidgit/elements/label.rb

@@ -1,85 +1,85 @@
-# encoding: utf-8
-
-module Fidgit
-  class Label < Composite
-    ICON_POSITIONS = [:top, :bottom, :left, :right]
-
-    attr_reader :icon_position
-
-    attr_accessor :background_color, :border_color
-
-    def_delegators :@text, :text, :color, :font, :color=, :text=
-
-    def icon; @icon ? @icon.image : nil; end
-
-    def hit_element(x, y)
-      # The sub-elements should never get events.
-      hit?(x, y) ? self : nil
-    end
-
-    def icon=(icon)
-      raise ArgumentError.new("Icon must be a Gosu::Image") unless icon.is_a? Gosu::Image or icon.nil?
-
-      @contents.remove(@icon) if @icon.image
-      @icon.image = icon
-      position = [:left, :top].include?(icon_position) ? 0 : 1
-      @contents.insert(position, @icon) if @icon.image
-
-      icon
-    end
-
-    # Set the position of the icon, respective to the text.
-    def icon_position=(position)
-      raise ArgumentError.new("icon_position must be one of #{ICON_POSITIONS}") unless ICON_POSITIONS.include? position
-
-      @icon_position = position
-
-      case @icon_position
-        when :top, :bottom
-          @contents.instance_variable_set :@type, :fixed_columns
-          @contents.instance_variable_set :@num_columns, 1
-        when :left, :right
-          @contents.instance_variable_set :@type, :fixed_rows
-          @contents.instance_variable_set :@num_rows, 1
-      end
-
-      self.icon = @icon.image if @icon.image # Force the icon into the correct position.
-
-      position
-    end
-
-    # @param (see Element#initialize)
-    # @param [String] text The string to display in the label.
-    #
-    # @option (see Element#initialize)
-    # @option options [Gosu::Image, nil] :icon (nil)
-    # @option options [:left, :right, :center] :justify (:left) Text justification.
-    def initialize(text, options = {})
-      options = {
-        color: default(:color),
-        justify: default(:justify),
-        background_color: default(:background_color),
-        border_color: default(:border_color),
-        icon_options: {},
-        font_name: default(:font_name),
-        font_height: default(:font_height),
-        icon_position: default(:icon_position),
-      }.merge! options
-
-      super(options)
-
-      # Bit of a fudge since font info is managed circularly here!
-      # By using a grid, we'll be able to turn it around easily (in theory).
-      @contents = grid num_rows: 1, padding: 0, spacing_h: spacing_h, spacing_v: spacing_v, width: options[:width], height: options[:height], z: z do |contents|
-        @text = TextLine.new(text, parent: contents, justify: options[:justify], color: options[:color], padding: 0, z: z,
-                               font_name: options[:font_name], font_height: options[:font_height], align_h: :fill, align_v: :center)
-      end
-
-      # Create an image frame, but don't show it unless there is an image in it.
-      @icon = ImageFrame.new(nil, options[:icon_options].merge(z: z, align: :center))
-      @icon.image = options[:icon]
-
-      self.icon_position = options[:icon_position]
-    end
-  end
+# encoding: utf-8
+
+module Fidgit
+  class Label < Composite
+    ICON_POSITIONS = [:top, :bottom, :left, :right]
+
+    attr_reader :icon_position
+
+    attr_accessor :background_color, :border_color
+
+    def_delegators :@text, :text, :color, :font, :color=, :text=
+
+    def icon; @icon ? @icon.image : nil; end
+
+    def hit_element(x, y)
+      # The sub-elements should never get events.
+      hit?(x, y) ? self : nil
+    end
+
+    def icon=(icon)
+      raise ArgumentError.new("Icon must be a Gosu::Image") unless icon.is_a? Gosu::Image or icon.nil?
+
+      @contents.remove(@icon) if @icon.image
+      @icon.image = icon
+      position = [:left, :top].include?(icon_position) ? 0 : 1
+      @contents.insert(position, @icon) if @icon.image
+
+      icon
+    end
+
+    # Set the position of the icon, respective to the text.
+    def icon_position=(position)
+      raise ArgumentError.new("icon_position must be one of #{ICON_POSITIONS}") unless ICON_POSITIONS.include? position
+
+      @icon_position = position
+
+      case @icon_position
+        when :top, :bottom
+          @contents.instance_variable_set :@type, :fixed_columns
+          @contents.instance_variable_set :@num_columns, 1
+        when :left, :right
+          @contents.instance_variable_set :@type, :fixed_rows
+          @contents.instance_variable_set :@num_rows, 1
+      end
+
+      self.icon = @icon.image if @icon.image # Force the icon into the correct position.
+
+      position
+    end
+
+    # @param (see Element#initialize)
+    # @param [String] text The string to display in the label.
+    #
+    # @option (see Element#initialize)
+    # @option options [Gosu::Image, nil] :icon (nil)
+    # @option options [:left, :right, :center] :justify (:left) Text justification.
+    def initialize(text, options = {})
+      options = {
+        color: default(:color),
+        justify: default(:justify),
+        background_color: default(:background_color),
+        border_color: default(:border_color),
+        icon_options: {},
+        font_name: default(:font_name),
+        font_height: default(:font_height),
+        icon_position: default(:icon_position),
+      }.merge! options
+
+      super(options)
+
+      # Bit of a fudge since font info is managed circularly here!
+      # By using a grid, we'll be able to turn it around easily (in theory).
+      @contents = grid num_rows: 1, padding: 0, spacing_h: spacing_h, spacing_v: spacing_v, width: options[:width], height: options[:height], z: z do |contents|
+        @text = TextLine.new(text, parent: contents, justify: options[:justify], color: options[:color], padding: 0, z: z,
+                               font_name: options[:font_name], font_height: options[:font_height], align_h: :fill, align_v: :center)
+      end
+
+      # Create an image frame, but don't show it unless there is an image in it.
+      @icon = ImageFrame.new(nil, options[:icon_options].merge(z: z, align: :center))
+      @icon.image = options[:icon]
+
+      self.icon_position = options[:icon_position]
+    end
+  end
 end