fidgit 0.0.6alpha → 0.1.0

data/README.textile

@@ -49,7 +49,7 @@ class MyGuiState < Fidgit::GuiState
     super
 
     # Create a vertically packed section, centred in the window.
-    pack :vertical, align: :center do
+    vertical align: :center do
       # Create a label with a dark green background.
       my_label = label "Hello world!", background_color: Gosu::Color.rgb(0, 100, 0)
 
@@ -71,7 +71,7 @@ As well as a cursor and tool-tips that are managed by the GuiState for you, ther
 
 Elements are best added by using simple methods (listed below). Most of these method accept a block, some offering access to public methods of the element and others being default event handlers.
 
-The GuiState itself only accepts #pack, but any packer or group accepts any other element method.
+The GuiState itself only accepts #vertical/#horizontal/#grid, but any packer or group accepts any other element method.
 
 h3. GuiState methods
 

data/config/default_schema.yml

@@ -32,6 +32,7 @@
     :background_color: ?dark_gray
     :border_color: ?light_gray
     :border_thickness: 2
+    :shortcut_color: ?red
 
     :disabled:
       :background_color: ?very_dark_gray
@@ -83,7 +84,7 @@
     :pattern: "*.*"
     :show_extension: true
 
-  :GridPacker: # < Packer
+  :Grid: # < Packer
     :cell_background_color: ?none
     :cell_border_color: ?none
     :cell_border_thickness: 0
@@ -94,7 +95,7 @@
     :padding_bottom: 0
     :padding_left: 0
 
-  :HorizontalPacker: # < GridPacker
+  :Horizontal: # < Grid
     :nothing: nil
 
   :HorizontalScrollBar: # < ScrollBar
@@ -112,6 +113,15 @@
   :List::Item:
     :border_thickness: 0
 
+  :MainPacker: # < Packer
+    :border_thickness: 0
+    :padding_top: 0
+    :padding_right: 0
+    :padding_bottom: 0
+    :padding_left: 0
+    :spacing_h: 0
+    :spacing_v: 0
+
   :MenuPane:
     :background_color: ?very_dark_gray
 
@@ -174,7 +184,7 @@
     :background_color: ?very_dark_gray
     :border_color: ?white
 
-  :VerticalPacker: # < GridPacker
+  :Vertical: # < Grid
     :nothing: nil
 
   :VerticalScrollBar: # < ScrollBar

data/examples/align_example.rb

@@ -11,17 +11,17 @@ class ExampleState < Fidgit::GuiState
   def initialize
     super
 
-    pack :vertical, align: :center, background_color: OUTER_BACKGROUND do
+    vertical align: :center, background_color: OUTER_BACKGROUND do
       label "h => align_h, v => align_v", align_h: :center
 
-      pack :grid, num_columns: 4, align: :center, cell_background_color: CELL_BACKGROUND, background_color: ROW_BACKGROUND, align_h: :fill do
+      grid num_columns: 4, align: :center, cell_background_color: CELL_BACKGROUND, background_color: ROW_BACKGROUND do
         label "xxx"
         label "h fill", align_h: :fill
         label "h right", align_h: :right
         label "h center", align_h: :center
 
 
-        pack :vertical do
+        vertical do
           label "xxx"
           label "xxx"
         end
@@ -29,7 +29,7 @@ class ExampleState < Fidgit::GuiState
         label "v center", align_v: :center
         label "v bottom", align_v: :bottom
 
-        pack :vertical, align_h: :center do
+        vertical align_h: :center do
           label "h center"
           label "h center"
         end
@@ -40,7 +40,7 @@ class ExampleState < Fidgit::GuiState
         label ""
         label "bottom right", align_h: :right, align_v: :bottom
         label "bottom center", align_h: :center, align_v: :bottom
-        pack :vertical, align_h: :right do
+        vertical align_h: :right do
           label "h right"
           label "h right"
         end

data/examples/button_and_toggle_button_example.rb

@@ -5,14 +5,14 @@ class ExampleState < Fidgit::GuiState
   def initialize
     super
 
-    pack :vertical do
+    vertical do
       my_label = label "Label", tip: "I'm a label"
 
-      my_button = button("Button", tip: "I'm a button; press me!") do
+      my_button = button("Button", tip: "I'm a button; press me!", shortcut: :auto) do
         my_label.text = "Pressed the button!"
       end
 
-      my_toggle_button = toggle_button("ToggleButton", tip: "I'm a button that toggles") do |sender, value|
+      my_toggle_button = toggle_button("ToggleButton", tip: "I'm a button that toggles", shortcut: :o) do |sender, value|
         my_label.text = "Turned the toggle button #{value ? "on" : "off"}!"
       end
 

data/examples/color_picker_example.rb

@@ -4,7 +4,7 @@ class ExampleState < Fidgit::GuiState
   def initialize
     super
 
-    pack :vertical do
+    vertical do
       my_label = label 'No color picked'
 
       color_picker(width: 100) do |sender, color|

data/examples/color_well_example.rb

@@ -4,11 +4,11 @@ class ExampleState < Fidgit::GuiState
   def initialize
     super
 
-    pack :vertical do
+    vertical do
       my_label = label "No color selected."
 
       group do
-        pack :grid, num_columns: 15, padding: 0, spacing: 4 do
+        grid num_columns: 15, padding: 0, spacing: 4 do
           150.times do
             color_well(color: Gosu::Color.rgb(rand(255), rand(255), rand(255)))
           end

data/examples/combo_box_example.rb

@@ -5,7 +5,7 @@ class ExampleState < Fidgit::GuiState
   def initialize
     super
 
-    pack :vertical do
+    vertical do
       my_label = label "Label", tip: "I'm a label"
 
       combo_box(value: 1, tip: "I'm a combo box; press me and make a selection!") do

data/examples/file_dialog_example.rb

@@ -8,7 +8,7 @@ class ExampleState < Fidgit::GuiState
     super
 
     container.background_color = Gosu::Color.rgb(50, 50, 50)
-    pack :vertical, align: :center do
+    vertical align: :center do
       full_base_directory = ''
       restricted_base_directory = File.expand_path(File.join(__FILE__, '..', '..'))
       directory = File.join(restricted_base_directory, 'media', 'images')

data/examples/grid_packer_example.rb

@@ -8,16 +8,16 @@ class ExampleState < Fidgit::GuiState
   def initialize
     super
 
-    pack :vertical do
+    vertical do
       label "Grid with #{FIXED_NUM} columns"
-      pack :grid, num_columns: FIXED_NUM, border_color: BORDER_COLOR, cell_border_color: Gosu::Color.rgba(0, 255, 0, 255), cell_border_thickness: 1 do
+      grid num_columns: FIXED_NUM, border_color: BORDER_COLOR, cell_border_color: Gosu::Color.rgba(0, 255, 0, 255), cell_border_thickness: 1 do
         NUM_CELLS.times do |i|
           label "Cell #{i}", font_size: rand(15) + 15, border_color: BORDER_COLOR, border_thickness: 1
         end
       end
 
       label "Grid with #{FIXED_NUM} rows"
-      pack :grid, num_rows: FIXED_NUM, border_color: BORDER_COLOR, cell_background_color: Gosu::Color.rgba(0, 100, 100, 255) do
+      grid num_rows: FIXED_NUM, border_color: BORDER_COLOR, cell_background_color: Gosu::Color.rgba(0, 100, 100, 255) do
         NUM_CELLS.times do |i|
           label "Cell #{i}", font_size: rand(15) + 15, border_color: BORDER_COLOR, border_thickness: 1
         end

data/examples/label_example.rb

@@ -5,14 +5,14 @@ class ExampleState < Fidgit::GuiState
   def initialize
     super
 
-    pack :vertical, background_color: Gosu::Color.rgb(255, 0, 0) do
+    vertical background_color: Gosu::Color.rgb(255, 0, 0) do
       label "Hello!", tip: 'A label with text'
       label "Hello!", icon: Gosu::Image["head_icon.png"], tip: 'A label with text & icon'
       label '', icon: Gosu::Image["head_icon.png"], tip: 'A label with just icon'
       label '', background_color: Gosu::Color.rgb(0, 255, 0), tip: 'No text or icon'
     end
 
-    pack :vertical do
+    vertical do
       label ":left justification", width: 400, background_color: Gosu::Color.rgb(0, 100, 0), justify: :left, tip: 'A label with text'
       label ":right justification", width: 400, background_color: Gosu::Color.rgb(0, 100, 0), justify: :right, tip: 'A label with text'
       label ":center justification", width: 400, background_color: Gosu::Color.rgb(0, 100, 0), justify: :center, tip: 'A label with text'

data/examples/list_example.rb

@@ -5,7 +5,7 @@ class ExampleState < Fidgit::GuiState
   def initialize
     super
 
-    pack :vertical do
+    vertical do
       my_label = label "No clicky"
 
       list do

data/examples/menu_pane_example.rb

@@ -5,15 +5,15 @@ class ExampleState < Fidgit::GuiState
   def initialize
     super
 
-    pack :vertical do
+    vertical do
       my_label = label "Right click to open context menu"
 
       my_label.subscribe :released_right_mouse_button do
         menu do
-          item "Chunky bacon", :CHUNKY_BACON, shortcut: "Ctrl-^-*"
+          item "Chunky bacon", :CHUNKY_BACON, shortcut_text: "Ctrl-^-*"
           separator
-          item "Lentils", :LENTILS, shortcut: "Alt-F15"
-          item "Tepid gruel", :GRUEL, shortcut: "CenterMeta"
+          item "Lentils", :LENTILS, shortcut_text: "Alt-F15"
+          item "Tepid gruel", :GRUEL, shortcut_text: "CenterMeta"
 
           subscribe :selected do |sender, value|
             my_label.text = "I like #{value} more than anything. Mmmm!"

data/examples/message_dialog_example.rb

@@ -5,7 +5,7 @@ class ExampleState < Fidgit::GuiState
   def initialize
     super
 
-    pack :vertical do
+    vertical do
       my_label = label "Why not open a dialog? You know you want to!", tip: "I'm a label"
 
       button("Open an ok message dialog") do

data/examples/radio_button_example.rb

@@ -4,7 +4,7 @@ class ExampleState < Fidgit::GuiState
   def initialize
     super
 
-    pack :vertical do
+    vertical do
       my_label = label "No button selected"
 
       button("Deselect") do
@@ -16,7 +16,7 @@ class ExampleState < Fidgit::GuiState
       end
 
       @group = group do
-        pack :grid, num_columns: 5, padding: 0 do
+        grid num_columns: 5, padding: 0 do
           15.times do |i|
             radio_button "##{i}", i, width: 60
           end

data/examples/readme_example.rb

@@ -17,7 +17,7 @@ class MyGuiState < Fidgit::GuiState
     super
 
     # Create a vertically packed section, centred on the window.
-    pack :vertical, align: :center do
+    vertical align: :center do
       # Create a label with a dark green background.
       my_label = label "Hello world!", background_color: Gosu::Color.rgb(0, 100, 0)
 

data/examples/scroll_window_example.rb

@@ -7,17 +7,17 @@ class ExampleState < Fidgit::GuiState
   def initialize
     super
 
-    pack :vertical do
-      pack :horizontal do
+    vertical do
+      horizontal do
         [
             [20, "All cheer the ascendancy of number "], # Should have both scrollers
             [20, "#"],                                   # Only has v-scroller.
             [4, "#"],                                    # No scrollers.
             [4, "All cheer the ascendancy of number "],  # Only has h-scroller
         ].each do |num_labels, text|
-          pack :vertical do
+          vertical do
             scroll_window(width: WIDTH, height: HEIGHT, background_color: Gosu::Color.rgb(0, 100, 0)) do
-              pack :vertical do
+              vertical do
                 (1..num_labels).each do |i|
                   label "#{text}#{i}!"
                 end
@@ -27,14 +27,14 @@ class ExampleState < Fidgit::GuiState
         end
       end
 
-      pack :horizontal, padding: 0 do
-        pack :vertical do
+      horizontal padding: 0 do
+        vertical do
           scroll_window(width: 300, height: 150) do
             text_area(text: "Hello world! " * 19, width: 284)
           end
         end
 
-        pack :vertical do
+        vertical do
           scroll_window(width: 300, height: 150) do
             %w[One Two Three Four Five Six].each do |name|
               toggle_button(name)

data/examples/slider_example.rb

@@ -4,8 +4,8 @@ class ExampleState < Fidgit::GuiState
   def initialize
     super
 
-    pack :vertical do
-      pack :horizontal do
+    vertical do
+      horizontal do
         # Discrete values (0..100)
         slider = slider(width: 100, range: 0..5, value: 3) do |sender, value|
           @discrete_label.text = "Discrete slider is at #{value}"
@@ -14,7 +14,7 @@ class ExampleState < Fidgit::GuiState
         @discrete_label = label "Discrete slider is at #{slider.value}"
       end
 
-      pack :horizontal do
+      horizontal do
         # Continuous values (0.0..1.0)
 
         slider = slider(width: 100, range: 0.0..100.0, value: 77.2) do |sender, value|

data/examples/splash_example.rb

@@ -4,8 +4,8 @@ require_relative 'helpers/example_window'
 class ExampleState < Fidgit::GuiState
   def initialize
     super
-    pack :vertical do
-      pack :horizontal do
+    vertical do
+      horizontal do
         text = label "Width:"
 
         @width_combo = combo_box(value: [640, 480]) do
@@ -33,7 +33,7 @@ class ExampleAfterState < GuiState
 
     on_input(:esc, :exit)
 
-    pack :vertical do
+    vertical do
       label "Game loaded!", icon: Gosu::Image["head_icon.png"], border_color: Gosu::Color.rgb(255, 255, 255)
     end
   end

data/examples/text_area_example.rb

@@ -4,20 +4,20 @@ class ExampleState < Fidgit::GuiState
   def initialize
     super
 
-    pack :horizontal do
-      pack :vertical do
+    horizontal do
+      vertical do
         label 'editable'
         text_area(width: 200)
       end
 
-      pack :vertical do
+      vertical do
         label 'mirrors to right'
         text_area(width: 200, text: "Hello, my name in brian the snail!") do |sender, text|
           @mirror.text = text
         end
       end
 
-      pack :vertical do
+      vertical do
         label 'not editable'
         @mirror = text_area(width: 200, enabled: false)
       end

data/lib/fidgit/elements/button.rb

@@ -4,18 +4,54 @@ module Fidgit
   class Button < Label
     # @param (see Label#initialize)
     # @option (see Label#initialize)
+    # @option options [Symbol] :shortcut (nil) Adds a shortcut key for this element, that activates it. :auto takes the first letter of the text.
     def initialize(text, options = {}, &block)
       options = {
         color: default(:color),
         background_color: default(:background_color),
         border_color: default(:border_color),
+        shortcut_color: default(:shortcut_color),
+        shortcut: nil,
       }.merge! options
 
+      @shortcut_color = options[:shortcut_color].dup
+
+      @shortcut = if options[:shortcut] == :auto
+                    raise ArgumentError.new("Can't use :auto for :shortcut without text") if text.empty?
+                    text[0].downcase.to_sym
+                  else
+                    options[:shortcut]
+                  end
+
+      raise ArgumentError.new(":shortcut must be a symbol") unless @shortcut.nil? or @shortcut.is_a? Symbol
+
       super(text, options)
 
       update_colors
     end
 
+    def text=(value)
+      if @shortcut
+        super value.sub(/#{@shortcut}/i) {|char| "<c=#{@shortcut_color.to_hex}>#{char}</c>" }
+      else
+        super value
+      end
+    end
+
+    def parent=(value)
+      if @shortcut
+        state = $window.game_state_manager.inside_state || $window.current_game_state
+        if parent
+          raise ArgumentError.new("Repeat of shortcut #{@shortcut.inspect}") if state.input.has_key? @shortcut
+          state.on_input(@shortcut) { activate unless state.focus }
+        else
+          state.input.delete @shortcut
+        end
+      end
+
+      super(value)
+    end
+
     def clicked_left_mouse_button(sender, x, y)
       # TODO: Play click sound?
       nil
@@ -64,5 +100,12 @@ module Fidgit
     def post_init_block(&block)
       subscribe :clicked_left_mouse_button, &block
     end
+
+    public
+    # Activate the button, as though it had been clicked on.
+    # Does not do anything if the button is disabled.
+    def activate
+      publish(:clicked_left_mouse_button, x + width / 2, y + height / 2) if enabled?
+    end
   end
 end

data/lib/fidgit/elements/color_picker.rb

@@ -39,7 +39,7 @@ module Fidgit
       super(options)
 
       slider_width = width
-      pack :vertical do
+      vertical do
         @sliders = {}
         CHANNELS.each_with_index do |channel, i|
           @sliders[channel] = slider(value: @color.send(channel), range: 0..255, width: slider_width,

data/lib/fidgit/elements/container.rb

@@ -6,7 +6,7 @@ module Fidgit
   class Container < Element
     extend Forwardable
 
-    def_delegators :@children, :size, :each, :find, :index, :[]
+    def_delegators :@children, :size, :each, :find, :index, :[], :empty?, :map, :select, :inject
 
     def x=(value)
       each {|c| c.x += value - x }
@@ -89,38 +89,22 @@ 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
-          HorizontalPacker
-        when :vertical
-          VerticalPacker
-        when :grid
-          GridPacker
-        else
-          raise ArgumentError, "packing arrangement must be one of :horizontal, :vertical or :grid"
-      end
-
-      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)
+      Horizontal.new({ parent: self }.merge!(options), &block)
     end
 
     public
     # Pack elements within the blockvertically.
     def vertical(options = {}, &block)
-      VerticalPacker.new({ parent: self }.merge!(options), &block)
+      Vertical.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)
+      Grid.new({ parent: self }.merge!(options), &block)
     end
 
     def radio_button(text, value, options = {}, &block)

data/lib/fidgit/elements/element.rb

@@ -67,7 +67,14 @@ module Fidgit
     def drag?(button); false; end
 
     def enabled?; @enabled; end
-    def enabled=(value); @enabled = value; end
+
+    def enabled=(value)
+      if @mouse_over and enabled? and not value
+        $window.current_game_state.unset_mouse_over
+      end
+
+      @enabled = value
+    end
 
     def font; @font ||= Gosu::Font[@font_name, @font_size]; end
 

data/lib/fidgit/elements/file_browser.rb

@@ -50,8 +50,8 @@ module Fidgit
 
       super options
 
-      pack :vertical do
-        @nav_buttons = pack :horizontal, padding: 0, spacing: 2
+      vertical do
+        @nav_buttons = horizontal padding: 0, spacing: 2
 
         @scroll_window = scroll_window(height: 250, width: options[:width]) do
           @files_list = list(width: options[:width]) do
@@ -74,7 +74,7 @@ module Fidgit
 
         create_nav_buttons
 
-        pack :horizontal, align: :center, padding: 0 do
+        horizontal align: :center, padding: 0 do
           @action_button = button(options[:"#{type}_text"]) do
             publish :selected, @type, file_path
           end

data/lib/fidgit/elements/{grid_packer.rb → grid.rb}

@@ -3,7 +3,7 @@
 module Fidgit
   # A vertically aligned element packing container.
 
-  class GridPacker < Packer
+  class Grid < Packer
     # @return [Integer]
     attr_reader :num_rows
     # @return [Integer]
@@ -72,8 +72,8 @@ module Fidgit
     protected
     # Repack all the elements into their positions.
     def repack
-      @widths = Array.new(@num_columns, 0)
-      @heights = Array.new(@num_rows, 0)
+      @widths = Array.new(@rows.empty? ? 0 : @rows[0].size, 0)
+      @heights = Array.new(@rows.size, 0)
 
       filled_columns = []
       filled_rows = []
@@ -82,35 +82,39 @@ module Fidgit
       @rows.each_with_index do |row, row_num|
         row.each_with_index do |element, column_num|
           fills = (element.align_h == :fill)
-          @widths[column_num] = [fills ? 0 : element.outer_width, @widths[column_num] || 0].max
+          @widths[column_num] = [fills ? 0 : element.outer_width, @widths[column_num]].max
           filled_columns.push fills
 
           fills = (element.align_v == :fill)
-          @heights[row_num] = [fills ? 0 : element.outer_height, @heights[row_num] || 0].max
+          @heights[row_num] = [fills ? 0 : element.outer_height, @heights[row_num]].max
           filled_rows.push fills
         end
       end
 
       # Expand the size of each filled column to make the minimum size required.
-      num_filled_columns = filled_columns.select {|value| value }.count
-      if num_filled_columns > 0
+      unless @widths.empty?
+        num_filled_columns = filled_columns.select {|value| value }.count
         total_width = @widths.inject(0, :+) + (padding_left + padding_right) + ((@num_columns - 1) * spacing_h)
-        if total_width < min_width
-          extra_width = total_width / num_filled_columns
-          filled_columns.each_with_index do |filled, i|
-            @widths[i] += extra_width if filled
+        extra_width = min_width - total_width
+        if extra_width > 0
+          if num_filled_columns > 0
+            @widths[filled_columns.index true] += extra_width
+          else
+            @widths[-1] += extra_width
           end
         end
       end
 
       # Expand the size of each filled row to make the minimum size required.
-      num_filled_rows = filled_rows.select {|value| value }.count
-      if num_filled_rows > 0
+      unless @heights.empty?
+        num_filled_rows = filled_rows.select {|value| value }.count
         total_height = @heights.inject(0, :+) + (padding_left + padding_right) + ((@num_rows - 1) * spacing_v)
-        if total_height < min_height
-          extra_height = total_height / num_filled_rows
-          filled_rows.each_with_index do |filled, i|
-            @heights[i] += extra_height if filled
+        extra_height = min_height - total_height
+        if extra_height > 0
+          if num_filled_rows > 0
+            @heights[filled_rows.index true] += extra_height
+          else
+            @heights[-1] += extra_height
           end
         end
       end
@@ -127,7 +131,7 @@ module Fidgit
             when :fill
               if element.width < @widths[column_num]
                 element.width = @widths[column_num]
-                element.send :repack if element.is_a? GridPacker
+                element.send :repack if element.is_a? Grid
               end
             when :center
               element.x += (@widths[column_num] - element.width) / 2
@@ -144,7 +148,7 @@ module Fidgit
             when :fill
               if element.height < @heights[row_num]
                 element.height = @heights[row_num]
-                element.send :repack if element.is_a? GridPacker
+                element.send :repack if element.is_a? Grid
               end
             when :center
               element.y += (@heights[row_num] - element.height) / 2

data/lib/fidgit/elements/group.rb

@@ -10,7 +10,7 @@
 
     # @example
     #   group do
-    #     pack :horizontal do
+    #     horizontal do
     #       radio_button 1, text: '1', checked: true
     #       radio_button 2, text: '2'
     #       subscribe :changed do |sender, value|
@@ -43,7 +43,7 @@
 
     # @example
     #   @my_group = group do
-    #     pack :horizontal do
+    #     horizontal do
     #       radio_button(1, text: '1', checked: true)
     #       radio_button(2, text: '2')
     #     end

data/lib/fidgit/elements/{horizontal_packer.rb → horizontal.rb}

@@ -2,7 +2,7 @@
 
 module Fidgit
   # A vertically aligned element packing container.
-  class HorizontalPacker < GridPacker
+  class Horizontal < Grid
     def initialize(options = {})
       options[:num_rows] = 1
 

data/lib/fidgit/elements/label.rb

@@ -41,6 +41,8 @@ module Fidgit
       @justify = options[:justify]
 
       super(options)
+
+      self.text = text # Forces stuff that manipulates text to work.
     end
 
     def draw_foreground

data/lib/fidgit/elements/list.rb

@@ -23,7 +23,7 @@ module Fidgit
           publish :changed, value
         end
 
-        @items = pack :vertical, spacing: 0
+        @items = vertical spacing: 0
       end
     end
 

data/lib/fidgit/elements/main_packer.rb

@@ -0,0 +1,26 @@
+require_relative "vertical"
+
+module Fidgit
+  # Main container that can contains a single "proper" packing element.
+  class MainPacker < Vertical
+    def initialize(options = {})
+      options = {
+          width: $window.width,
+          height: $window.height,
+      }.merge! options
+
+      super options
+    end
+
+    def width; $window.width; end
+    def height; $window.height; end
+    def width=(value); ; end
+    def height=(value); ; end
+
+    def add(element)
+      raise "MainPacker can only contain one packing element" unless empty?
+      raise "MainPacker can only contain packing elements" unless element.is_a? Packer
+      super(element)
+    end
+  end
+end

data/lib/fidgit/elements/menu_pane.rb

@@ -4,31 +4,30 @@ module Fidgit
   class MenuPane < Composite
     # An item within the menu.
     class Item < Button
-      attr_reader :value, :shortcut
+      attr_reader :value, :shortcut_text
 
       # @param (see Button#initialize)
       #
       # @option (see Button#initialize)
       # @param [any] value Value if the user picks this item
-      # @option options [Boolean] :enabled (true)
-      # @option options [String] :shortcut ('')
+      # @option options [String] :shortcut_text ('')
       def initialize(text, value, options = {})
         options = {
           enabled: true,
           border_color: default(:border_color),
+          shortcut_text: '',
         }.merge! options
 
         @value = value
-        @enabled = [true, false].include?(options[:enabled]) ? options[:enabled] : true
-        @shortcut = options[:shortcut] || ''
+        @shortcut_text = options[:shortcut_text]
 
         super(text, options)
       end
 
       def draw_foreground
         super
-        unless @shortcut.empty?
-          font.draw_rel("#{@shortcut}", rect.right - padding_right, y + ((height - font_size) / 2).floor, z, 1, 0, 1, 1, color)
+        unless @shortcut_text.empty?
+          font.draw_rel("#{@shortcut_text}", rect.right - padding_right, y + ((height - font_size) / 2).floor, z, 1, 0, 1, 1, color)
         end
 
         nil
@@ -37,7 +36,7 @@ module Fidgit
       protected
       def layout
         super
-        rect.width += font.text_width("  #{@shortcut}") unless @shortcut.empty?
+        rect.width += font.text_width("  #{@shortcut_text}") unless @shortcut_text.empty?
         nil
       end
     end
@@ -89,7 +88,7 @@ module Fidgit
 
       super(options)
 
-      @items = pack :vertical, spacing: 0, padding: 0
+      @items = vertical spacing: 0, padding: 0
 
       if options[:show] and state.is_a? GuiState
         show

data/lib/fidgit/elements/scroll_area.rb

@@ -3,7 +3,7 @@
 module Fidgit
   # A basic scrolling area. It is not managed in any way (use ScrollWindow for that).
   class ScrollArea < Container
-    # @return [VerticalPacker] The content shown within this ScrollArea
+    # @return [Vertical] The content shown within this ScrollArea
     attr_reader :content
 
     def offset_x; x - @content.x; end
@@ -31,7 +31,7 @@ module Fidgit
 
       super(options)
 
-      @content = VerticalPacker.new(parent: self, padding: 0)
+      @content = Vertical.new(parent: self, padding: 0)
 
       self.offset_x = options[:offset_x] || options[:offset]
       self.offset_y = options[:offset_y] || options[:offset]

data/lib/fidgit/elements/scroll_window.rb

@@ -24,7 +24,7 @@ module Fidgit
 
       super(options)
 
-      @grid = pack :grid, num_columns: 2, padding: 0, spacing: 0 do
+      @grid = grid num_columns: 2, padding: 0, spacing: 0 do
         @view = scroll_area(owner: self, width: options[:width], height: options[:height])
         @spacer = label '', padding: 0, width: 0, height: 0
       end

data/lib/fidgit/elements/toggle_button.rb

@@ -48,12 +48,12 @@ module Fidgit
     protected
     def update_status
       if @value
-        @text = @text_on.dup
+        self.text = @text_on.dup
         @icon = @icon_on ? @icon_on.dup : nil
         @tip = @tip_on.dup
         @border_color = @border_color_on.dup
       else
-        @text = @text_off.dup
+        self.text = @text_off.dup
         @icon = @icon_off ? @icon_off.dup : nil
         @tip = @tip_off.dup
         @border_color = @border_color_off.dup

data/lib/fidgit/elements/{vertical_packer.rb → vertical.rb}

@@ -2,7 +2,7 @@
 
 module Fidgit
   # A vertically aligned element packing container.
-  class VerticalPacker < GridPacker
+  class Vertical < Grid
     def initialize(options = {})
       options[:num_columns] = 1
 

data/lib/fidgit/gosu_ext/color.rb

@@ -77,6 +77,13 @@ module Gosu
       [red / 255.0, green / 255.0, blue / 255.0,  alpha / 255.0]
     end
 
+    # Convert to a 6-digit hexadecimal value, appropriate for passing to the Gosu +<c>+ tag. The alpha channel is ignored.
+    #
+    # @return [String] RGB hexadecimal string, such as "AABB00"
+    def to_hex
+      "%02x%02x%02x" % [red, green, blue]
+    end
+
     # Show the Color as <RGBA [0, 0, 0, 0]> or, if opaque, <RGB [0, 0, 0]> (Gosu default is '(ARGB:0/0/0/0)')
     def to_s
       if opaque?

data/lib/fidgit/gosu_ext/gosu_module.rb

@@ -0,0 +1,25 @@
+module Gosu
+  class << self
+    alias_method :register_entity_fidgit, :register_entity
+
+    protected
+    def init_entities
+      @entities = {}
+    end
+
+    public
+    def register_entity(name, image)
+      name = name.to_sym
+      register_entity_fidgit(name, image)
+      @entities[name] = image
+      nil
+    end
+
+    public
+    def entity(name)
+      @entities[name.to_sym]
+    end
+  end
+
+  init_entities
+end

data/lib/fidgit/states/file_dialog.rb

@@ -10,7 +10,7 @@ module Fidgit
 
       super(options)
 
-      pack :vertical, align: :center, padding: 0 do |packer|
+      vertical align: :center, padding: 0 do |packer|
         FileBrowser.new(type, { parent: packer }.merge!(options)) do |sender, result, file_name|
           hide
           block.call result, file_name if block

data/lib/fidgit/states/gui_state.rb

@@ -44,15 +44,12 @@ module Fidgit
     # (see MessageDialog#initialize)
     def message(text, options = {}, &block); MessageDialog.new(text, options, &block); end
 
-    # (see Container#pack)
-    def pack(*args, &block); @container.pack *args, █ end
-
     # (see Container#clear)
     def clear(*args, &block); @container.clear *args, █ end
 
     def initialize
       # The container is where the user puts their content.
-      @container = VerticalPacker.new(padding: 0, width: $window.width, height: $window.height)
+      @container = MainPacker.new
 
       unless defined? @@draw_pixel
         media_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'media'))
@@ -164,11 +161,19 @@ module Fidgit
     end
 
     def finalize
+      unset_mouse_over
+
       @tool_tip = nil
 
       nil
     end
 
+    # Called by active elements when they are disabled.
+    def unset_mouse_over
+      @mouse_over.publish :leave if @mouse_over
+      @mouse_over = nil
+    end
+
     # Set the menu pane to be displayed.
     #
     # @param [MenuPane] menu Menu to display.

data/lib/fidgit/states/message_dialog.rb

@@ -42,10 +42,10 @@ module Fidgit
       # Dialog is forced to the centre.
       options[:align_h] = options[:align_v] = :center
 
-      pack :vertical, options do
+      vertical options do
         text_area(text: message, enabled: false, width: options[:width] - padding_left - padding_right)
 
-        pack :horizontal, align_h: :center do
+        horizontal align_h: :center do
           @type.to_s.split('_').each do |type|
             button(options[:"#{type}_text"]) do
               hide

data/lib/fidgit/version.rb

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

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: fidgit
 version: !ruby/object:Gem::Version
-  version: 0.0.6alpha
-  prerelease: 5
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Bil Bas (Spooner)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-06 00:00:00.000000000 +01:00
+date: 2011-06-10 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &26037252 !ruby/object:Gem::Requirement
+  requirement: &27888528 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.7.32
   type: :runtime
   prerelease: false
-  version_requirements: *26037252
+  version_requirements: *27888528
 - !ruby/object:Gem::Dependency
   name: chingu
-  requirement: &26036940 !ruby/object:Gem::Requirement
+  requirement: &27888228 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9rc5
   type: :runtime
   prerelease: false
-  version_requirements: *26036940
+  version_requirements: *27888228
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26036652 !ruby/object:Gem::Requirement
+  requirement: &27887940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *26036652
+  version_requirements: *27887940
 - !ruby/object:Gem::Dependency
   name: texplay
-  requirement: &26036364 !ruby/object:Gem::Requirement
+  requirement: &27887640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *26036364
+  version_requirements: *27887640
 description: Fidgit is a GUI library built on Gosu/Chingu
 email:
 - bil.bagpuss@gmail.com
@@ -103,11 +103,12 @@ files:
 - lib/fidgit/elements/container.rb
 - lib/fidgit/elements/element.rb
 - lib/fidgit/elements/file_browser.rb
-- lib/fidgit/elements/grid_packer.rb
+- lib/fidgit/elements/grid.rb
 - lib/fidgit/elements/group.rb
-- lib/fidgit/elements/horizontal_packer.rb
+- lib/fidgit/elements/horizontal.rb
 - lib/fidgit/elements/label.rb
 - lib/fidgit/elements/list.rb
+- lib/fidgit/elements/main_packer.rb
 - lib/fidgit/elements/menu_pane.rb
 - lib/fidgit/elements/packer.rb
 - lib/fidgit/elements/radio_button.rb
@@ -118,9 +119,10 @@ files:
 - lib/fidgit/elements/text_area.rb
 - lib/fidgit/elements/toggle_button.rb
 - lib/fidgit/elements/tool_tip.rb
-- lib/fidgit/elements/vertical_packer.rb
+- lib/fidgit/elements/vertical.rb
 - lib/fidgit/event.rb
 - lib/fidgit/gosu_ext/color.rb
+- lib/fidgit/gosu_ext/gosu_module.rb
 - lib/fidgit/history.rb
 - lib/fidgit/redirector.rb
 - lib/fidgit/schema.rb
@@ -166,9 +168,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: fidgit
 rubygems_version: 1.5.2