fidgit 0.1.5 → 0.1.6

data/README.textile

@@ -99,6 +99,7 @@ Elements can be placed inside a packer or group.
 
 * _button(text, ...)_ - Button with text and/or icon (Block handles :clicked_left_mouse_button event).
 * _color_picker(...)_ - Red, green and blue sliders and colour indicator (Block handles :changed event).
+* _image_frame(image, ...)_ - Wrapper around a Gosu::Image to embed it in the GUI.
 * _label(text, ...)_ - Label with text and, optionally, an icon (No block accepted).
 * _slider(...)_ - Horizontal slider with handle (Block handles :changed event).
 * _text_area(...)_ - An multi-line element, containing editable text (Block handles :changed event).

data/config/default_schema.yml

@@ -33,6 +33,10 @@
     :border_color: ?light_gray
     :border_thickness: 2
     :shortcut_color: ?red
+    :padding_top: 2
+    :padding_right: 4
+    :padding_bottom: 2
+    :padding_left: 4
 
     :disabled:
       :background_color: ?very_dark_gray
@@ -63,7 +67,7 @@
     :padding_left: 0
 
   :Container: # < Element
-    :nothing: nil
+    {}
 
   :Element:
     :align_h: :left
@@ -73,13 +77,14 @@
     :border_color: ?none
     :border_thickness: 0
     :color: ?white
-    :font_size: 30
+    :font_height: 30
     :font_name: :default
     :padding_top: 2
     :padding_right: 4
     :padding_bottom: 2
     :padding_left: 4
 
+
   :FileBrowser: # < Composite
     :pattern: "*.*"
     :show_extension: true
@@ -96,13 +101,21 @@
     :padding_left: 0
 
   :Horizontal: # < Grid
-    :nothing: nil
+    {}
 
   :HorizontalScrollBar: # < ScrollBar
     :height: ?scroll_bar_thickness
 
+  :ImageFrame: # <Element
+    :padding_top: 0
+    :padding_right: 0
+    :padding_bottom: 0
+    :padding_left: 0
+
   :Label: # < Element
     :justify: :left
+    :icon_position: :left
+
     :disabled:
       :color: ?light_gray
 
@@ -142,7 +155,7 @@
       :border_color: ?blue
 
   :ScrollArea: # < Composite
-    :nothing: nil
+    {}
 
   :ScrollBar: # < Composite
     :background_color: ?none
@@ -176,16 +189,28 @@
     :focused:
       :border_color: ?green
 
+  :TextLine: # < Element
+    :justify: :left
+    :padding_top: 0
+    :padding_right: 0
+    :padding_bottom: 0
+    :padding_left: 0
+
   :ToggleButton: # < Button
     :toggled:
       :border_color: ?red
 
   :ToolTip: # < Label
     :background_color: ?very_dark_gray
+    :font_height: 20
     :border_color: ?white
+    :padding_top: 2
+    :padding_right: 4
+    :padding_bottom: 2
+    :padding_left: 4
 
   :Vertical: # < Grid
-    :nothing: nil
+    {}
 
   :VerticalScrollBar: # < ScrollBar
     :width: ?scroll_bar_thickness

data/examples/align_example.rb

@@ -1,7 +1,7 @@
 require_relative 'helpers/example_window'
 
 # Change font and labels in the schema.
-Fidgit::Element.schema.merge_elements!(Element: { font_size: 24 }, Label: { background_color: "?dark_blue" })
+Fidgit::Element.schema.merge_elements!(Element: { font_height: 24 }, Label: { background_color: "?dark_blue" })
 
 class ExampleState < Fidgit::GuiState
   ROW_BACKGROUND = Gosu::Color.rgb(0, 100, 0)

data/examples/button_and_toggle_button_example.rb

@@ -8,17 +8,28 @@ class ExampleState < Fidgit::GuiState
     vertical do
       my_label = label "Label", tip: "I'm a label"
 
-      my_button = button("Button", tip: "I'm a button; press me!", shortcut: :auto) do
+      buttons = []
+
+      # A plain button, with some text on it.
+      buttons << 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", shortcut: :o) do |sender, value|
+      # Buttons with icons in each possible positions.
+      [:left, :right, :top, :bottom].each do |position|
+        buttons << button("Icon at #{position}", icon: Gosu::Image["head_icon.png"], icon_position: position, icon_options: { factor: 2 }, tip: "I'm a button; press me!", shortcut: :auto) do
+          my_label.text = "Pressed the button (icon to #{position})!"
+        end
+      end
+
+      # A toggling button.
+      buttons << 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
 
+      # A toggle-button that controls whether all the other buttons are enabled.
       toggle_button("Enable other two buttons", value: true) do |sender, value|
-        my_button.enabled = value
-        my_toggle_button.enabled = value
+        buttons.each {|button| button.enabled = value }
       end
     end
   end

data/examples/file_dialog_example.rb

@@ -1,7 +1,7 @@
 require_relative 'helpers/example_window'
 
 
-Fidgit::Element.schema.merge_elements!(Element: { font_size: 15 })
+Fidgit::Element.schema.merge_elements!(Element: { font_height: 15 })
 
 class ExampleState < Fidgit::GuiState
   def initialize

data/examples/grid_packer_example.rb

@@ -12,14 +12,14 @@ class ExampleState < Fidgit::GuiState
       label "Grid with #{FIXED_NUM} columns"
       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
+          label "Cell #{i}", font_height: rand(15) + 15, border_color: BORDER_COLOR, border_thickness: 1
         end
       end
 
       label "Grid with #{FIXED_NUM} rows"
       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
+          label "Cell #{i}", font_height: rand(15) + 15, border_color: BORDER_COLOR, border_thickness: 1
         end
       end
     end

data/lib/fidgit/elements/button.rb

@@ -27,6 +27,8 @@ module Fidgit
 
       super(text, options)
 
+      self.text = text # Force shortcut to be written out properly.
+
       update_colors
     end
 
@@ -86,12 +88,14 @@ module Fidgit
         default(:background_color)
       end
 
-      @color = if enabled?
+      self.color = if enabled?
         default(:color)
       else
         default(:disabled, :color)
       end
 
+      @icon.enabled = enabled? if @icon
+
       nil
     end
 

data/lib/fidgit/elements/combo_box.rb

@@ -4,6 +4,8 @@ module Fidgit
 class ComboBox < Button
   extend Forwardable
 
+  ARROW_IMAGE = "combo_arrow.png"
+
   def_delegators :@menu, :each
 
   event :changed
@@ -50,12 +52,12 @@ class ComboBox < Button
       end
     end
 
-    @@arrow ||= Gosu::Image["combo_arrow.png"]
+    @@arrow ||= Gosu::Image[ARROW_IMAGE]
 
     super('', options)
 
-    rect.height = [height, font_size + padding_top + padding_bottom].max
-    rect.width = [width, font_size * 4 + padding_left + padding_right].max
+    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)
@@ -67,6 +69,8 @@ class ComboBox < Button
       self.icon = item.icon
     end
 
+    recalc
+
     item
   end
 
@@ -93,7 +97,9 @@ class ComboBox < Button
   protected
   def layout
     super
-    rect.width += height  # Allow size for the arrow.
+
+    # Max width of all items + allow size for the arrow.
+    rect.width = [@menu.width + height, min_width].max
 
     nil
   end

data/lib/fidgit/elements/container.rb

@@ -80,6 +80,11 @@ module Fidgit
       Group.new({parent: self}.merge!(options), &block)
     end
 
+    # Create an icon.
+    def image_frame(image, options = {}, &block)
+      ImageFrame.new(image, {parent: self}.merge!(options), &block)
+    end
+
     # Create a label within the container.
     def label(text, options = {})
       Label.new(text, {parent: self}.merge!(options))
@@ -165,7 +170,7 @@ module Fidgit
 
     protected
     def draw_foreground
-      each { |c| c.draw }
+      @children.each {|c| c.draw }
 
       font.draw self.class.name, x, y, z if Fidgit.debug_mode?
 
@@ -177,5 +182,28 @@ module Fidgit
     def post_init_block(&block)
       with(&block)
     end
+
+    public
+    def to_s
+      "#{super} [#{@children.size} #{@children.size == 1 ? 'child' : 'children'}]"
+    end
+
+    public
+    def write_tree(indent = "", index = 0)
+      puts self
+
+      indent = indent + "  "
+
+      @children.each.with_index do |element, i|
+          print "#{indent}#{i}: "
+
+          case element
+            when Container
+              element.write_tree(indent)
+            else
+              puts element
+          end
+      end
+    end
   end
 end

data/lib/fidgit/elements/element.rb

@@ -37,7 +37,8 @@ module Fidgit
     VALID_ALIGN_H = [:left, :center, :right, :fill]
     VALID_ALIGN_V = [:top, :center, :bottom, :fill]
 
-    attr_reader :z, :tip, :font_size, :padding_top, :padding_right, :padding_bottom, :padding_left, :align_h, :align_v, :parent, :border_thickness
+    attr_reader :z, :tip, :padding_top, :padding_right, :padding_bottom, :padding_left,
+                :align_h, :align_v, :parent, :border_thickness, :font
 
     attr_accessor :background_color
 
@@ -76,8 +77,6 @@ module Fidgit
       @enabled = value
     end
 
-    def font; @font ||= Gosu::Font[@font_name, @font_size]; end
-
     def rect; @rect; end; protected :rect
 
     def self.schema; @@schema ||= Schema.new(YAML.load(File.read(DEFAULT_SCHEMA_FILE)));; end
@@ -116,7 +115,7 @@ module Fidgit
     #
     # @option options [String] :tip ('') Tool-tip text
     # @option options [String, :default] :font_name (:default, which resolves as the default Gosu font)
-    # @option options [String] :font_size (30)
+    # @option options [String] :font_height (30)
     #
     # @option options [Gosu::Color] :background_color (transparent)
     # @option options [Gosu::Color] :border_color (transparent)
@@ -143,7 +142,7 @@ module Fidgit
         z: 0,
         tip: '',
         font_name: default(:font_name),
-        font_size: default(:font_size),
+        font_height: default(:font_height),
         background_color: default(:background_color),
         border_color: default(:border_color),
         border_thickness: default(:border_thickness),
@@ -181,13 +180,13 @@ module Fidgit
 
       @z = options[:z]
       @tip = options[:tip].dup
-      @font_name = if options[:font_name].nil? or options[:font_name] == :default
+      font_name = if options[:font_name].nil? or options[:font_name] == :default
                      Gosu::default_font_name
                    else
                      options[:font_name].dup
                    end
 
-      @font_size = options[:font_size]
+      @font = Gosu::Font[font_name, options[:font_height]]
 
       @rect = Chingu::Rect.new(options[:x], options[:y], options[:width] || 0, options[:height] || 0)
     end
@@ -276,5 +275,10 @@ module Fidgit
     def post_init_block(&block)
       raise ArgumentError, "does not accept a block"
     end
+
+    public
+    def to_s
+      "#{self.class} (#{x}, #{y}) #{width}x#{height}"
+    end
   end
 end

data/lib/fidgit/elements/file_browser.rb

@@ -70,7 +70,7 @@ module Fidgit
           end
         end
 
-        @file_name_text = text_area(text: options[:file_name], max_height: font_size * 1.5, width: options[:width], border_thickness: 1)
+        @file_name_text = text_area(text: options[:file_name], max_height: font.height * 1.5, width: options[:width], border_thickness: 1)
 
         create_nav_buttons
 

data/lib/fidgit/elements/grid.rb

@@ -4,8 +4,12 @@ module Fidgit
   # A vertically aligned element packing container.
 
   class Grid < Packer
+    # @return [Symbol]
+    attr_reader :type
+
     # @return [Integer]
     attr_reader :num_rows
+
     # @return [Integer]
     attr_reader :num_columns
 
@@ -82,11 +86,11 @@ 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]].max
+          @widths[column_num] = [fills ? element.min_width : 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]].max
+          @heights[row_num] = [fills ? element.min_width : element.outer_height, @heights[row_num]].max
           filled_rows.push fills
         end
       end

data/lib/fidgit/elements/image_frame.rb

@@ -0,0 +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
+end

data/lib/fidgit/elements/label.rb

@@ -1,29 +1,58 @@
 # encoding: utf-8
 
 module Fidgit
-  class Label < Element
-    attr_accessor :color, :background_color, :border_color
-    attr_reader :text, :icon
+  class Label < Composite
+    ICON_POSITIONS = [:top, :bottom, :left, :right]
 
-    VALID_JUSTIFICATION = [:left, :right, :center]
+    attr_reader :icon_position
 
-    def text=(value)
-      @text = value
-      recalc
-      nil
+    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=(value)
-      @icon = value
-      recalc
-      nil
+    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 [Fidgit::Thumbnail, Gosu::Image, nil] :icon (nil)
+    # @option options [Gosu::Image, nil] :icon (nil)
     # @option options [:left, :right, :center] :justify (:left) Text justification.
     def initialize(text, options = {})
       options = {
@@ -31,74 +60,26 @@ module Fidgit
         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
 
-      @text = text.dup
-      @icon = options[:icon]
-      @color = options[:color].dup
-
-      raise "Justification must be one of #{VALID_JUSTIFICATION.inspect}" unless VALID_JUSTIFICATION.include? options[:justify]
-      @justify = options[:justify]
-
       super(options)
 
-      self.text = text # Forces stuff that manipulates text to work.
-    end
-
-    def draw_foreground
-      current_x = x + padding_left
-      if @icon
-        @icon.draw(current_x, y + padding_top, z)
-        current_x += @icon.width + padding_left
-      end
-
-      unless @text.empty?
-        case @justify
-          when :left
-            rel_x = 0.0
-            center_x = current_x
-
-          when :right
-            rel_x = 1.0
-            center_x = x + rect.width - padding_right
-
-          when :center
-            rel_x = 0.5
-            center_x = (current_x + x + rect.width - padding_right) / 2.0
-        end
-
-        # Make text centered alongside the icon
-        # TODO: Probably should have this as an option.
-        center_y = y + padding_top + ((y + height - padding_bottom) - (y + padding_top)) / 2.0
-
-        font.draw_rel(@text, center_x, center_y, z, rel_x, 0.5, 1, 1, @color)
+      # 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
 
-      nil
-    end
-
-    protected
-    def layout
-      if @icon
-        if @text.empty?
-          rect.width = [padding_left + @icon.width + padding_right, min_width].max
-          rect.height = [padding_top + @icon.height + padding_bottom, min_height].max
-        else
-          # Todo: Use padding_h inside here? Probably by making this a Composite.
-          rect.width = [padding_left + @icon.width + [padding_left + padding_right].max + font.text_width(@text) + padding_right, min_width].max
-          rect.height = [padding_top + [@icon.height, font_size].max + padding_bottom, min_height].max
-        end
-      else
-        if @text.empty?
-          rect.width = [padding_left + padding_right, min_width].max
-          rect.height = [padding_top + padding_bottom, min_height].max
-        else
-          rect.width = [padding_left + font.text_width(@text) + padding_right, min_width].max
-          rect.height = [padding_top + font_size + padding_bottom, min_height].max
-        end
-      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]
 
-      nil
+      self.icon_position = options[:icon_position]
     end
   end
 end

data/lib/fidgit/elements/main_packer.rb

@@ -18,7 +18,6 @@ module Fidgit
     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

data/lib/fidgit/elements/menu_pane.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Fidgit
   class MenuPane < Composite
     # An item within the menu.
@@ -26,8 +24,9 @@ module Fidgit
 
       def draw_foreground
         super
+
         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)
+          font.draw_rel("#{@shortcut_text}", rect.right - padding_right, y + ((height - font.height) / 2).floor, z, 1, 0, 1, 1, color)
         end
 
         nil
@@ -36,7 +35,10 @@ module Fidgit
       protected
       def layout
         super
-        rect.width += font.text_width("  #{@shortcut_text}") unless @shortcut_text.empty?
+
+        # Ignore layout request when asked before TextLine has been created.
+        rect.width += font.text_width("  #{@shortcut_text}") unless @shortcut_text.empty? or @text.nil?
+
         nil
       end
     end
@@ -56,8 +58,6 @@ module Fidgit
       end
     end
 
-    # -------------------
-
     extend Forwardable
 
     def_delegators :@items, :each, :clear, :size, :[]
@@ -110,8 +110,11 @@ module Fidgit
     end
 
     def item(text, value, options = {}, &block)
-      options[:z] = z
-      item = Item.new(text, value, { parent: @items }.merge!(options), &block)
+      options = options.merge({
+         parent: @items,
+         z: z,
+      })
+      item = Item.new(text, value, options, &block)
 
       item.subscribe :left_mouse_button, method(:item_selected)
       item.subscribe :right_mouse_button, method(:item_selected)
@@ -146,7 +149,7 @@ module Fidgit
         @items.y = y + padding_top
 
         # Ensure that all items are of the same width.
-        max_width = @items.each.to_a.map {|c| c.width }.max || 0
+        max_width = @items.map(&:width).max || 0
         @items.each {|c| c.rect.width = max_width }
 
         @items.recalc # Move all the items inside the packer to correct ones.

data/lib/fidgit/elements/text_area.rb

@@ -136,14 +136,14 @@ module Fidgit
 
       super(options)
 
-      min_height = padding_left + padding_right + font_size
+      min_height = padding_left + padding_right + font.height
       if options[:height]
         @max_height = @min_height = [options[:height], min_height].max
       else
         @max_height = [options[:max_height], min_height].max
         @min_height = options[:min_height] ? [options[:min_height], min_height].max : min_height
       end
-      rect.height = [padding_left + padding_right + font_size, @min_height].max
+      rect.height = [padding_left + padding_right + font.height, @min_height].max
 
       subscribe :left_mouse_button, method(:click_in_text)
       subscribe :right_mouse_button, method(:click_in_text)
@@ -157,7 +157,7 @@ module Fidgit
       mouse_x, mouse_y = x - (self.x + padding_left), y - (self.y + padding_top)
       @char_widths.each_with_index do |width, i|
         char_x, char_y = @caret_positions[i]
-        if mouse_x.between?(char_x, char_x + width) and mouse_y.between?(char_y, char_y + font_size)
+        if mouse_x.between?(char_x, char_x + width) and mouse_y.between?(char_y, char_y + font.height)
           self.caret_position = @text_input.selection_start = i
           break
         end
@@ -210,7 +210,7 @@ module Fidgit
         char_x, char_y = @caret_positions[pos]
         char_width = @char_widths[pos]
         left, top = x + padding_left + char_x, y + padding_top + char_y
-        draw_rect left, top, char_width, font_size, z, @selection_color
+        draw_rect left, top, char_width, font.height, z, @selection_color
       end
 
       # Draw text.
@@ -222,14 +222,14 @@ module Fidgit
       if focused? and ((Gosu::milliseconds / @caret_period) % 2 == 0)
         caret_x, caret_y = @caret_positions[caret_position]
         left, top = x + padding_left + caret_x, y + padding_top + caret_y
-        draw_rect left, top, 1, font_size, z, @caret_color
+        draw_rect left, top, 1, font.height, z, @caret_color
       end
     end
 
     # y position of the
     protected
     def y_at_line(lines_number)
-      lines_number * (font_size + line_spacing)
+      lines_number * (font.height + line_spacing)
     end
 
     protected

data/lib/fidgit/elements/text_line.rb

@@ -0,0 +1,92 @@
+module Fidgit
+  # Used internally by the label.
+  class TextLine < Element
+    VALID_JUSTIFICATION = [:left, :right, :center]
+
+    attr_reader :color, :justify
+
+    def color=(color)
+      raise ArgumentError.new("Text must be a Gosu::Color") unless color.is_a? Gosu::Color
+
+      @color = color.dup
+
+      color
+    end
+
+    def text; @text.dup; end
+
+    def text=(text)
+      raise ArgumentError.new("Text must be a String") unless text.respond_to? :to_s
+
+      @text = text.to_s.dup
+
+      recalc
+      text
+    end
+
+    def justify=(justify)
+      raise ArgumentError.new("Justify must be one of #{VALID_JUSTIFICATION.inspect}") unless VALID_JUSTIFICATION.include? justify
+      @justify = justify
+    end
+
+    # @param (see Element#initialize)
+    # @param [String] text The string to display in the line of text.
+    #
+    # @option (see Element#initialize)
+    # @option options [:left, :right, :center] :justify (:left) Text justification.
+    def initialize(text, options = {})
+      options = {
+          color: default(:color),
+          justify: default(:justify),
+      }.merge! options
+
+      super(options)
+
+      self.justify = options[:justify]
+      self.color = options[:color]
+      self.text = text
+    end
+
+    def draw_foreground
+      case @justify
+        when :left
+          rel_x = 0.0
+          draw_x = x + padding_left
+
+        when :right
+          rel_x = 1.0
+          draw_x = x + rect.width - padding_right
+
+        when :center
+          rel_x = 0.5
+          draw_x = (x + padding_left) + (rect.width - padding_right - padding_left) / 2.0
+      end
+
+      font.draw_rel(@text, draw_x, y + padding_top, z, rel_x, 0, 1, 1, color)
+    end
+
+    def min_width
+      if @text.empty?
+        [padding_left + padding_right, super].max
+      else
+        [padding_left + font.text_width(@text) + padding_right, super].max
+      end
+    end
+
+    protected
+    def layout
+      rect.width = [min_width, max_width].min
+
+      if @text.empty?
+        rect.height = [[padding_top + padding_bottom, min_height].max, max_height].min
+      else
+        rect.height = [[padding_top + font.height + padding_bottom, min_height].max, max_height].min
+      end
+    end
+
+    public
+    def to_s
+      "#{super} '#{@text}'"
+    end
+  end
+end

data/lib/fidgit/elements/tool_tip.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module Fidgit
-  class ToolTip < Label
+  class ToolTip < TextLine
     def x=(value); super(value); recalc; value; end
     def y=(value); super(value); recalc; value; end
     def hit?(x, y); false; end

data/lib/fidgit/states/gui_state.rb

@@ -143,6 +143,14 @@ module Fidgit
       super
     end
 
+    def write_tree
+      puts "=== #{self.class} ==="
+      indent = "  "
+      @container.write_tree(indent)
+      @menu.write_tree(indent) if @menu
+      @tool_tip.write_tree(indent) if @tool_tip
+    end
+
     def draw
       @container.draw
       @menu.draw if @menu

data/lib/fidgit/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Fidgit
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/spec/fidgit/elements/image_frame_spec.rb

@@ -0,0 +1,69 @@
+require_relative 'helpers/helper'
+require_relative 'helpers/tex_play_helper'
+
+require 'fidgit'
+
+def check_thumbnail_is_square
+  {square: [10, 10], tall: [5, 12], wide: [6, 5]}.each_pair do |type, dimensions|
+    context "with a #{type} image" do
+      it "should be square and just large enough to contain the image" do
+        subject = described_class.new(Gosu::Image.create(*dimensions), thumbnail: true)
+        subject.width.should equal dimensions.max
+        subject.height.should equal dimensions.max
+      end
+    end
+  end
+end
+
+def check_image_dimensions
+  {square: [10, 10], tall: [5, 12], wide: [6, 5]}.each_pair do |type, dimensions|
+    context "with a #{type} image" do
+      it "should be just large enough to contain the image" do
+        subject = described_class.new(Gosu::Image.create(*dimensions))
+        subject.width.should equal dimensions.first
+        subject.height.should equal dimensions.last
+      end
+    end
+  end
+end
+
+module Fidgit
+  describe ImageFrame do
+    before :all do
+      $window = Chingu::Window.new(100, 100, false) unless $window
+    end
+
+    before :each do
+      @image = Gosu::Image.create(10, 10)
+    end
+
+    subject { described_class.new(@image) }
+
+    describe '#image' do
+      it "should have the image set" do
+        subject.image.should be @image
+      end
+    end
+
+    describe '#width and #height' do
+      check_image_dimensions
+    end
+
+    describe "Thumbnails" do
+      subject { described_class.new(@image, thumbnail: true) }
+
+      describe '#image=' do
+        it "should update the height and width" do
+          image = Gosu::Image.create(8, 2)
+          subject.image = image
+          subject.height.should equal 8
+          subject.width.should equal 8
+        end
+      end
+
+      describe '#width and #height' do
+        check_thumbnail_is_square
+      end
+    end
+  end
+end

data/spec/fidgit/elements/label_spec.rb

@@ -2,21 +2,9 @@ require_relative "helpers/helper"
 
 include Fidgit
 
-
-
 describe Label do
-  before :each do
-    Chingu::Window.new(10, 10, false)
-  end
-
-  after :each do
-    $window.close
-  end
-
-  describe "#intialize" do
-    it "should not accept a block" do
-      ->{ Label.new( "Hello world!") { } }.should raise_error ArgumentError
-    end
+  before :all do
+    $window = Chingu::Window.new(100, 100, false) unless $window
   end
 
   context "with default parameters" do
@@ -42,7 +30,7 @@ describe Label do
       subject.should be_enabled
     end
 
-    it "should not have an icon" do
+    it "should not have an image" do
       subject.icon.should be_nil
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fidgit
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-15 00:00:00.000000000Z
+date: 2011-06-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &23136600 !ruby/object:Gem::Requirement
+  requirement: &22487064 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.32
   type: :runtime
   prerelease: false
-  version_requirements: *23136600
+  version_requirements: *22487064
 - !ruby/object:Gem::Dependency
   name: chingu
-  requirement: &23136228 !ruby/object:Gem::Requirement
+  requirement: &22486788 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9rc5
   type: :runtime
   prerelease: false
-  version_requirements: *23136228
+  version_requirements: *22486788
 - !ruby/object:Gem::Dependency
   name: clipboard
-  requirement: &23135832 !ruby/object:Gem::Requirement
+  requirement: &22486512 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.8
   type: :runtime
   prerelease: false
-  version_requirements: *23135832
+  version_requirements: *22486512
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &23135436 !ruby/object:Gem::Requirement
+  requirement: &22486236 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *23135436
+  version_requirements: *22486236
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23135088 !ruby/object:Gem::Requirement
+  requirement: &22485960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *23135088
+  version_requirements: *22485960
 - !ruby/object:Gem::Dependency
   name: texplay
-  requirement: &23134752 !ruby/object:Gem::Requirement
+  requirement: &22485684 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *23134752
+  version_requirements: *22485684
 description: Fidgit is a GUI library built on Gosu/Chingu
 email:
 - bil.bagpuss@gmail.com
@@ -126,6 +126,7 @@ files:
 - lib/fidgit/elements/grid.rb
 - lib/fidgit/elements/group.rb
 - lib/fidgit/elements/horizontal.rb
+- lib/fidgit/elements/image_frame.rb
 - lib/fidgit/elements/label.rb
 - lib/fidgit/elements/list.rb
 - lib/fidgit/elements/main_packer.rb
@@ -137,6 +138,7 @@ files:
 - lib/fidgit/elements/scroll_window.rb
 - lib/fidgit/elements/slider.rb
 - lib/fidgit/elements/text_area.rb
+- lib/fidgit/elements/text_line.rb
 - lib/fidgit/elements/toggle_button.rb
 - lib/fidgit/elements/tool_tip.rb
 - lib/fidgit/elements/vertical.rb
@@ -152,7 +154,6 @@ files:
 - lib/fidgit/states/file_dialog.rb
 - lib/fidgit/states/gui_state.rb
 - lib/fidgit/states/message_dialog.rb
-- lib/fidgit/thumbnail.rb
 - lib/fidgit/version.rb
 - lib/fidgit/window.rb
 - media/images/arrow.png
@@ -161,17 +162,17 @@ files:
 - media/images/file_file.png
 - media/images/pixel.png
 - spec/fidgit/elements/helpers/helper.rb
+- spec/fidgit/elements/helpers/tex_play_helper.rb
+- spec/fidgit/elements/image_frame_spec.rb
 - spec/fidgit/elements/label_spec.rb
 - spec/fidgit/event_spec.rb
 - spec/fidgit/gosu_ext/color_spec.rb
 - spec/fidgit/gosu_ext/helpers/helper.rb
 - spec/fidgit/helpers/helper.rb
-- spec/fidgit/helpers/tex_play_helper.rb
 - spec/fidgit/history_spec.rb
 - spec/fidgit/redirector_spec.rb
 - spec/fidgit/schema_spec.rb
 - spec/fidgit/schema_test.yml
-- spec/fidgit/thumbnail_spec.rb
 homepage: http://github.com/Spooner/fidgit/
 licenses: []
 post_install_message: 

data/lib/fidgit/thumbnail.rb

@@ -1,29 +0,0 @@
-# encoding: utf-8
-
-module Fidgit
-  # Wrapper for Gosu::Image that always pads the image out to being square.
-  class Thumbnail
-    DEFAULT_COLOR = Gosu::Color.rgb(255, 255, 255)
-
-    attr_reader :image, :height, :width
-
-    def image=(value)
-      @image = value
-      @height = [@image.width, @image.height].max
-      @width = [@image.width, @image.height].max
-
-      value
-    end
-
-    def initialize(image)
-      raise ArgumentError, "image must be a Gosu::Image" unless image.is_a? Gosu::Image
-      self.image = image
-    end
-
-    def draw(x, y, z_order, scale_x = 1, scale_y = 1, color = DEFAULT_COLOR, mode = :default)
-      @image.draw x + (@width - @image.width) * scale_x / 2, y + (@height - @image.height) * scale_y / 2, z_order, scale_x, scale_y, color, mode
-
-      nil
-    end
-  end
-end

data/spec/fidgit/thumbnail_spec.rb

@@ -1,50 +0,0 @@
-require_relative 'helpers/helper'
-require_relative 'helpers/tex_play_helper'
-
-require 'fidgit'
-
-def check_thumbnail_is_square(dimension)
-  {square: [10, 10], tall: [5, 12], wide: [6, 5]}.each_pair do |type, dimensions|
-    context "with a #{type} image" do
-      it "should be square and just large enough to contain the image" do
-        subject = described_class.new(Image.create(*dimensions))
-        subject.width.should equal dimensions.max
-        subject.height.should equal dimensions.max
-      end
-    end
-  end
-end
-
-module Fidgit
-  describe Thumbnail do
-    before :all do
-      $window = Chingu::Window.new(100, 100, false)
-      @image = Image.create(10, 10)
-    end
-
-    subject { Thumbnail.new(@image) }
-
-    describe '#image' do
-      it "should have the image set" do
-        subject.image.should be @image
-      end
-    end
-
-    describe '#image=' do
-      it "should update the height and width" do
-        image = Image.create(8, 2)
-        subject.image = image
-        subject.height.should equal 8
-        subject.width.should equal 8
-      end
-    end
-
-    describe '#width' do
-      check_thumbnail_is_square :width
-    end
-
-    describe '#height' do
-      check_thumbnail_is_square :height
-    end
-  end
-end