fidgit 0.0.5alpha → 0.0.6alpha

data/config/default_schema.yml

@@ -80,7 +80,7 @@
     :padding_left: 4
 
   :FileBrowser: # < Composite
-    :pattern: *.*
+    :pattern: "*.*"
     :show_extension: true
 
   :GridPacker: # < Packer

data/fidgit.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency('gosu', '~> 0.7.28')
-  s.add_dependency('chingu', '~> 0.9rc4')
+  s.add_dependency('gosu', '~> 0.7.32')
+  s.add_dependency('chingu', '~> 0.9rc5')
   s.add_development_dependency('rspec', '~> 2.1.0')
   s.add_development_dependency('texplay', '~> 0.3.5')
 end

data/lib/fidgit/elements/combo_box.rb

@@ -2,6 +2,10 @@
 
 module Fidgit
 class ComboBox < Button
+  extend Forwardable
+
+  def_delegators :@menu, :each
+
   event :changed
 
   def index; @menu.index(@value) end
@@ -46,6 +50,8 @@ class ComboBox < Button
       end
     end
 
+    @@arrow ||= Gosu::Image["combo_arrow.png"]
+
     super('', options)
 
     rect.height = [height, font_size + padding_top + padding_bottom].max
@@ -57,12 +63,19 @@ class ComboBox < Button
 
     # Force text to be updated if the item added has the same value.
     if item.value == @value
-      @text = item.text
+      self.text = item.text
+      self.icon = item.icon
     end
 
     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
@@ -71,17 +84,25 @@ class ComboBox < Button
     nil
   end
 
+  def clear
+    self.text = ""
+    self.icon = nil
+    @menu.clear
+  end
+
+  protected
+  def layout
+    super
+    rect.width + height  # Allow size for the arrow.
+
+    nil
+  end
+
+
   protected
   # Any combo-box passed a block will allow you access to its methods.
   def post_init_block(&block)
-      case block.arity
-        when 1
-          yield self
-        when 0
-          instance_methods_eval &block
-        else
-          raise "block arity must be 0 or 1"
-      end
+    with(&block)
   end
 end
 end

data/lib/fidgit/elements/container.rb

@@ -4,11 +4,9 @@ module Fidgit
   # A container that contains Elements.
   # @abstract
   class Container < Element
-    def size; @children.size; end
-    def each(&block); @children.each &block; end
-    def find(&block); @children.find &block; end
-    def index(value); @children.index value; end
-    def [](index); @children[index]; end
+    extend Forwardable
+
+    def_delegators :@children, :size, :each, :find, :index, :[]
 
     def x=(value)
       each {|c| c.x += value - x }
@@ -91,6 +89,7 @@ module Fidgit
       List.new({parent: self}.merge!(options), &block)
     end
 
+    # Deprecated: use horizontal/vertical/grid
     def pack(arrangement, options = {}, &block)
       klass = case arrangement
         when :horizontal
@@ -106,6 +105,24 @@ module Fidgit
       klass.new({parent: self}.merge!(options), &block)
     end
 
+    public
+    # Pack elements within the block horizontally.
+    def horizontal(options = {}, &block)
+      HorizontalPacker.new({ parent: self }.merge!(options), &block)
+    end
+
+    public
+    # Pack elements within the blockvertically.
+    def vertical(options = {}, &block)
+      VerticalPacker.new({ parent: self }.merge!(options), &block)
+    end
+
+    public
+    # Pack elements within the block in a grid (matrix) formation.
+    def grid(options = {}, &block)
+      GridPacker.new({ parent: self }.merge!(options), &block)
+    end
+
     def radio_button(text, value, options = {}, &block)
       RadioButton.new(text, value, {parent: self}.merge!(options), &block)
     end
@@ -174,14 +191,7 @@ module Fidgit
     protected
     # Any container passed a block will allow you access to its methods.
     def post_init_block(&block)
-      case block.arity
-        when 1
-          yield self
-        when 0
-          instance_methods_eval &block
-        else
-          raise "block arity must be 0 or 1"
-      end
+      with(&block)
     end
   end
 end

data/lib/fidgit/elements/element.rb

@@ -248,6 +248,20 @@ module Fidgit
       @parent.send :add, self if @parent
     end
 
+    public
+    # Evaluate a block, just like it was a constructor block.
+    def with(&block)
+      raise ArgumentError.new("Must pass a block") unless block_given?
+      case block.arity
+        when 1
+          yield self
+        when 0
+          instance_methods_eval &block
+        else
+          raise "block arity must be 0 or 1"
+      end
+    end
+
     protected
     # By default, elements do not accept block arguments.
     def post_init_block(&block)

data/lib/fidgit/elements/menu_pane.rb

@@ -57,11 +57,15 @@ module Fidgit
       end
     end
 
+    # -------------------
+
+    extend Forwardable
+
+    def_delegators :@items, :each, :clear, :size, :[]
+
     event :selected
 
     def index(value); @items.index find(value); end
-    def size; @items.size; end
-    def [](index); @items[index]; end
 
     # @option (see Composite#initialize)
     # @option options [Float] :x (cursor x, if in a GuiState)

data/lib/fidgit/elements/scroll_area.rb

@@ -62,14 +62,7 @@ module Fidgit
 
     protected
     def post_init_block(&block)
-      case block.arity
-        when 1
-          yield @content
-        when 0
-          @content.instance_methods_eval &block
-        else
-          raise "block arity must be 0 or 1"
-      end
+      with(&block)
     end
   end
 end

data/lib/fidgit/elements/scroll_window.rb

@@ -79,14 +79,7 @@ module Fidgit
 
     protected
     def post_init_block(&block)
-      case block.arity
-        when 1
-          yield @view.content
-        when 0
-          @view.content.instance_methods_eval &block
-        else
-          raise "block arity must be 0 or 1"
-      end
+      @view.content.with(&block)
     end
   end
 end

data/lib/fidgit/elements/text_area.rb

@@ -251,7 +251,7 @@ module Fidgit
       word_width = 0
 
       text.each_char do |char|
-        char_width = font.text_width(char)
+        char_width = (char == "\n") ? 0 : font.text_width(char)
 
         overall_width = line_width + (line_width == 0 ? 0 : space_width) + word_width + char_width
         if overall_width > max_width and not (char == ' ' and not word.empty?)

data/lib/fidgit/states/gui_state.rb

@@ -5,6 +5,10 @@ module Fidgit
     # A 1x1 white pixel used for drawing.
     PIXEL_IMAGE = 'pixel.png'
 
+    extend Forwardable
+
+    def_delegators :@container, :horizontal, :vertical, :grid
+
     # The Container that contains all the elements for this GuiState.
     # @return [Packer]
     attr_reader :container

data/lib/fidgit/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Fidgit
-  VERSION = '0.0.5alpha'
+  VERSION = '0.0.6alpha'
 end

data/spec/fidgit/history_spec.rb

@@ -121,23 +121,23 @@ module Fidgit
         $x.should == 7
       end
     end
+  end
+  
+  # Abstract class, so doesn't really do anything.
+  describe History::Action do
+    before :each do
+      @object = described_class.new
+    end
 
-    # Abstract class, so doesn't really do anything.
-    describe History::Action do
-      before :each do
-        @object = described_class.new
-      end
-
-      describe "do()" do
-        it "should raise an error" do
-          lambda { @object.do }.should raise_error NotImplementedError
-        end
+    describe "do()" do
+      it "should raise an error" do
+        lambda { @object.do }.should raise_error NotImplementedError
       end
+    end
 
-      describe "undo()" do
-        it "should raise an error" do
-          lambda { @object.undo }.should raise_error NotImplementedError
-        end
+    describe "undo()" do
+      it "should raise an error" do
+        lambda { @object.undo }.should raise_error NotImplementedError
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fidgit
 version: !ruby/object:Gem::Version
-  version: 0.0.5alpha
+  version: 0.0.6alpha
   prerelease: 5
 platform: ruby
 authors:
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-25 00:00:00.000000000 +00:00
+date: 2011-06-06 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &26622144 !ruby/object:Gem::Requirement
+  requirement: &26037252 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.28
+        version: 0.7.32
   type: :runtime
   prerelease: false
-  version_requirements: *26622144
+  version_requirements: *26037252
 - !ruby/object:Gem::Dependency
   name: chingu
-  requirement: &26621748 !ruby/object:Gem::Requirement
+  requirement: &26036940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9rc4
+        version: 0.9rc5
   type: :runtime
   prerelease: false
-  version_requirements: *26621748
+  version_requirements: *26036940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26621364 !ruby/object:Gem::Requirement
+  requirement: &26036652 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *26621364
+  version_requirements: *26036652
 - !ruby/object:Gem::Dependency
   name: texplay
-  requirement: &26621016 !ruby/object:Gem::Requirement
+  requirement: &26036364 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *26621016
+  version_requirements: *26036364
 description: Fidgit is a GUI library built on Gosu/Chingu
 email:
 - bil.bagpuss@gmail.com
@@ -134,6 +134,7 @@ files:
 - lib/fidgit/version.rb
 - lib/fidgit/window.rb
 - media/images/arrow.png
+- media/images/combo_arrow.png
 - media/images/file_directory.png
 - media/images/file_file.png
 - media/images/pixel.png