fidgit 0.2.4 → 0.2.5

data/lib/fidgit/elements/color_picker.rb

@@ -1,63 +1,63 @@
-# encoding: utf-8
-
-module Fidgit
-  class ColorPicker < Composite
-    CHANNELS = [:red, :green, :blue]
-    DEFAULT_CHANNEL_NAMES = CHANNELS.map {|c| c.to_s.capitalize }
-
-    INDICATOR_HEIGHT = 25
-
-    event :changed
-
-    def color; @color.dup; end
-
-    def color=(value)
-      @color = value.dup
-      CHANNELS.each do |channel|
-        @sliders[channel].value = @color.send channel
-      end
-
-      publish :changed, @color.dup
-
-      value
-    end
-
-    # @param (see Composite#initialize)
-    # @option (see Composite#initialize)
-    def initialize(options = {}, &block)
-      options = {
-        padding: 0,
-        spacing: 0,
-        channel_names: DEFAULT_CHANNEL_NAMES,
-        color: default(:color),
-        indicator_height: default(:indicator_height),
-      }.merge! options
-
-      @color = options[:color].dup
-      @indicator_height = options[:indicator_height]
-
-      super(options)
-
-      slider_width = width
-      vertical do
-        @sliders = {}
-        CHANNELS.each_with_index do |channel, i|
-          @sliders[channel] = slider(value: @color.send(channel), range: 0..255, width: slider_width,
-                                     tip: options[:channel_names][i]) do |sender, value|
-            @color.send "#{channel}=", value
-            @indicator.background_color = @color
-            publish :changed, @color.dup
-          end
-        end
-
-        @indicator = label '', background_color: @color, width: slider_width, height: @indicator_height
-      end
-    end
-
-    protected
-    # Use block as an event handler.
-    def post_init_block(&block)
-      subscribe :changed, &block
-    end
-  end
+# encoding: utf-8
+
+module Fidgit
+  class ColorPicker < Composite
+    CHANNELS = [:red, :green, :blue]
+    DEFAULT_CHANNEL_NAMES = CHANNELS.map {|c| c.to_s.capitalize }
+
+    INDICATOR_HEIGHT = 25
+
+    event :changed
+
+    def color; @color.dup; end
+
+    def color=(value)
+      @color = value.dup
+      CHANNELS.each do |channel|
+        @sliders[channel].value = @color.send channel
+      end
+
+      publish :changed, @color.dup
+
+      value
+    end
+
+    # @param (see Composite#initialize)
+    # @option (see Composite#initialize)
+    def initialize(options = {}, &block)
+      options = {
+        padding: 0,
+        spacing: 0,
+        channel_names: DEFAULT_CHANNEL_NAMES,
+        color: default(:color),
+        indicator_height: default(:indicator_height),
+      }.merge! options
+
+      @color = options[:color].dup
+      @indicator_height = options[:indicator_height]
+
+      super(options)
+
+      slider_width = width
+      vertical do
+        @sliders = {}
+        CHANNELS.each_with_index do |channel, i|
+          @sliders[channel] = slider(value: @color.send(channel), range: 0..255, width: slider_width,
+                                     tip: options[:channel_names][i]) do |sender, value|
+            @color.send "#{channel}=", value
+            @indicator.background_color = @color
+            publish :changed, @color.dup
+          end
+        end
+
+        @indicator = label '', background_color: @color, width: slider_width, height: @indicator_height
+      end
+    end
+
+    protected
+    # Use block as an event handler.
+    def post_init_block(&block)
+      subscribe :changed, &block
+    end
+  end
 end

data/lib/fidgit/elements/color_well.rb

@@ -1,39 +1,39 @@
-# encoding: utf-8
-
-module Fidgit
-  class ColorWell < RadioButton
-    alias_method :color, :value
-
-    # @param (see RadioButton#initialize)
-    # @option (see RadioButton#initialize)
-    def initialize(options = {}, &block)
-      options = {
-        width: default(:width),
-        height: default(:height),
-        color: default(:color),
-        outline_color: default(:outline_color),
-        checked_border_color: default(:checked, :border_color),
-      }.merge! options
-
-      @outline_color = options[:outline_color].dup
-
-      super('', (options[:color] || options[:value]).dup, options)
-    end
-
-    protected
-    def draw_background
-      super
-
-      draw_frame x + 2, y + 2, width - 4, height - 4, 1, z, @outline_color
-
-      nil
-    end
-
-    protected
-    def draw_foreground
-      draw_rect x + 3, y + 3, width - 6, height - 6, z, value
-
-      nil
-    end
-  end
+# encoding: utf-8
+
+module Fidgit
+  class ColorWell < RadioButton
+    alias_method :color, :value
+
+    # @param (see RadioButton#initialize)
+    # @option (see RadioButton#initialize)
+    def initialize(options = {}, &block)
+      options = {
+        width: default(:width),
+        height: default(:height),
+        color: default(:color),
+        outline_color: default(:outline_color),
+        checked_border_color: default(:checked, :border_color),
+      }.merge! options
+
+      @outline_color = options[:outline_color].dup
+
+      super('', (options[:color] || options[:value]).dup, options)
+    end
+
+    protected
+    def draw_background
+      super
+
+      draw_frame x + 2, y + 2, width - 4, height - 4, 1, z, @outline_color
+
+      nil
+    end
+
+    protected
+    def draw_foreground
+      draw_rect x + 3, y + 3, width - 6, height - 6, z, value
+
+      nil
+    end
+  end
 end

data/lib/fidgit/elements/combo_box.rb

@@ -1,114 +1,114 @@
-# encoding: utf-8
-
-module Fidgit
-class ComboBox < Button
-  extend Forwardable
-
-  ARROW_IMAGE = "combo_arrow.png"
-
-  def_delegators :@menu, :each
-
-  event :changed
-
-  def index; @menu.index(@value) end
-  def value; @value; end
-  
-  def value=(value)
-    if @value != value
-      @value = value
-      item = @menu.find(@value)
-      self.text = item.text
-      self.icon = item.icon
-      publish :changed, @value
-    end
-
-    value
-  end
-
-  def index=(index)
-    if index.between?(0, @menu.size - 1)
-      self.value = @menu[index].value
-    end
-
-    index
-  end
-
-  # @param (see Button#initialize)
-  # @option (see Button#initialize)
-  # @option options [] :value
-  def initialize(options = {}, &block)
-    options = {
-      background_color: default(:background_color),
-      border_color: default(:border_color),
-    }.merge! options
-
-    @value = options[:value]
-    
-    @hover_index = 0
-
-    @menu = MenuPane.new(show: false) do
-      subscribe :selected do |widget, value|
-        self.value = value
-      end
-    end
-
-    @@arrow ||= Gosu::Image[ARROW_IMAGE]
-
-    super('', options)
-
-    rect.height = [height, font.height + padding_top + padding_bottom].max
-    rect.width = [width, font.height * 4 + padding_left + padding_right].max
-  end
-
-  def item(text, value, options = {}, &block)
-    item = @menu.item(text, value, options, &block)
-
-    # Force text to be updated if the item added has the same value.
-    if item.value == @value
-      self.text = item.text
-      self.icon = item.icon
-    end
-
-    recalc
-
-    item
-  end
-
-  def draw
-    super
-    size = height / @@arrow.width.to_f
-    @@arrow.draw x + width - height, y, z, size, size
-  end
-
-  def clicked_left_mouse_button(sender, x, y)
-    @menu.x = self.x
-    @menu.y = self.y + height + border_thickness
-    $window.game_state_manager.current_game_state.show_menu @menu
-
-    nil
-  end
-
-  def clear
-    self.text = ""
-    self.icon = nil
-    @menu.clear
-  end
-
-  protected
-  def layout
-    super
-
-    # Max width of all items + allow size for the arrow.
-    rect.width = [@menu.width + height, min_width].max
-
-    nil
-  end
-
-
-  protected
-  # Any combo-box passed a block will allow you access to its methods.
-  def post_init_block(&block)
-    with(&block)
-  end
-end
+# encoding: utf-8
+
+module Fidgit
+class ComboBox < Button
+  extend Forwardable
+
+  ARROW_IMAGE = "combo_arrow.png"
+
+  def_delegators :@menu, :each
+
+  event :changed
+
+  def index; @menu.index(@value) end
+  def value; @value; end
+  
+  def value=(value)
+    if @value != value
+      @value = value
+      item = @menu.find(@value)
+      self.text = item.text
+      self.icon = item.icon
+      publish :changed, @value
+    end
+
+    value
+  end
+
+  def index=(index)
+    if index.between?(0, @menu.size - 1)
+      self.value = @menu[index].value
+    end
+
+    index
+  end
+
+  # @param (see Button#initialize)
+  # @option (see Button#initialize)
+  # @option options [] :value
+  def initialize(options = {}, &block)
+    options = {
+      background_color: default(:background_color),
+      border_color: default(:border_color),
+    }.merge! options
+
+    @value = options[:value]
+    
+    @hover_index = 0
+
+    @menu = MenuPane.new(show: false) do
+      subscribe :selected do |widget, value|
+        self.value = value
+      end
+    end
+
+    @@arrow ||= Gosu::Image[ARROW_IMAGE]
+
+    super('', options)
+
+    rect.height = [height, font.height + padding_top + padding_bottom].max
+    rect.width = [width, font.height * 4 + padding_left + padding_right].max
+  end
+
+  def item(text, value, options = {}, &block)
+    item = @menu.item(text, value, options, &block)
+
+    # Force text to be updated if the item added has the same value.
+    if item.value == @value
+      self.text = item.text
+      self.icon = item.icon
+    end
+
+    recalc
+
+    item
+  end
+
+  def draw
+    super
+    size = height / @@arrow.width.to_f
+    @@arrow.draw x + width - height, y, z, size, size
+  end
+
+  def clicked_left_mouse_button(sender, x, y)
+    @menu.x = self.x
+    @menu.y = self.y + height + border_thickness
+    $window.game_state_manager.current_game_state.show_menu @menu
+
+    nil
+  end
+
+  def clear
+    self.text = ""
+    self.icon = nil
+    @menu.clear
+  end
+
+  protected
+  def layout
+    super
+
+    # Max width of all items + allow size for the arrow.
+    rect.width = [@menu.width + height, min_width].max
+
+    nil
+  end
+
+
+  protected
+  # Any combo-box passed a block will allow you access to its methods.
+  def post_init_block(&block)
+    with(&block)
+  end
+end
 end

data/lib/fidgit/elements/composite.rb

@@ -1,17 +1,17 @@
-# encoding: utf-8
-
-module Fidgit
-  # A composite element, made up of other elements (but manages them internally).
-  class Composite < Packer
-    DEBUG_BORDER_COLOR = Gosu::Color.rgba(0, 255, 0, 100) # Color to draw an outline in when debugging layout.
-
-    # @param (see Element#initialize)
-    #
-    # @option (see Element#initialize)
-    def initialize(options = {})
-      options[:border_color] = DEBUG_BORDER_COLOR if Fidgit.debug_mode?
-
-      super(options)
-    end
-  end
+# encoding: utf-8
+
+module Fidgit
+  # A composite element, made up of other elements (but manages them internally).
+  class Composite < Packer
+    DEBUG_BORDER_COLOR = Gosu::Color.rgba(0, 255, 0, 100) # Color to draw an outline in when debugging layout.
+
+    # @param (see Element#initialize)
+    #
+    # @option (see Element#initialize)
+    def initialize(options = {})
+      options[:border_color] = DEBUG_BORDER_COLOR if Fidgit.debug_mode?
+
+      super(options)
+    end
+  end
 end