fidgit 0.1.0 → 0.1.1

data/lib/fidgit/elements/combo_box.rb

@@ -93,7 +93,7 @@ class ComboBox < Button
   protected
   def layout
     super
-    rect.width + height  # Allow size for the arrow.
+    rect.width += height  # Allow size for the arrow.
 
     nil
   end

data/lib/fidgit/elements/element.rb

@@ -152,6 +152,8 @@ module Fidgit
 
       @enabled = options[:enabled]
 
+      @mouse_over = false
+
       # Alignment and min/max dimensions.
       @align_h = options[:align_h] || Array(options[:align]).last || default(:align_h)
       raise ArgumentError, "Invalid align_h: #{@align_h}" unless VALID_ALIGN_H.include? @align_h
@@ -263,7 +265,7 @@ module Fidgit
         when 1
           yield self
         when 0
-          instance_methods_eval &block
+          instance_methods_eval(&block)
         else
           raise "block arity must be 0 or 1"
       end

data/lib/fidgit/elements/group.rb

@@ -1,7 +1,5 @@
- # encoding: utf-8
-
- module Fidgit
-   class Group < Packer
+module Fidgit
+  class Group < Packer
     attr_reader :selected
 
     event :changed

data/lib/fidgit/elements/label.rb

@@ -67,7 +67,11 @@ module Fidgit
             center_x = (current_x + x + rect.width - padding_right) / 2.0
         end
 
-        font.draw_rel(@text, center_x, y + padding_top, z, rel_x, 0, 1, 1, @color)
+        # 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)
       end
 
       nil
@@ -77,20 +81,20 @@ module Fidgit
     def layout
       if @icon
         if @text.empty?
-          rect.width = [padding_left + @icon.width + padding_right, width].max
-          rect.height = [padding_top + @icon.height + padding_bottom, height].max
+          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, width].max
-          rect.height = [padding_top + [@icon.height, font_size].max + padding_bottom, height].max
+          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, width].max
-          rect.height = [padding_top + padding_bottom, height].max
+          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, width].max
-          rect.height = [padding_top + font_size + padding_bottom, height].max
+          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
 

data/lib/fidgit/elements/menu_pane.rb

@@ -65,6 +65,8 @@ module Fidgit
     event :selected
 
     def index(value); @items.index find(value); end
+    def x=(value); super(value); recalc; end
+    def y=(value); super(value); recalc; end
 
     # @option (see Composite#initialize)
     # @option options [Float] :x (cursor x, if in a GuiState)
@@ -86,6 +88,8 @@ module Fidgit
         }.merge! options
       end
 
+      @items = nil
+
       super(options)
 
       @items = vertical spacing: 0, padding: 0
@@ -133,7 +137,7 @@ module Fidgit
       super
 
       if @items
-        # Ensure the menu can't go over the edge of the screen. If it can't be avoided, align with left edge of screen.
+        # Ensure the menu can't go over the edge of the screen. If it can't be avoided, align with top-left edge of screen.
         rect.x = [[x, $window.width - width - padding_right].min, 0].max
         rect.y = [[y, $window.height - height - padding_bottom].min, 0].max
 
@@ -144,6 +148,8 @@ module Fidgit
         # Ensure that all items are of the same width.
         max_width = @items.each.to_a.map {|c| c.width }.max || 0
         @items.each {|c| c.rect.width = max_width }
+
+        @items.recalc # Move all the items inside the packer to correct ones.
       end
 
       nil

data/lib/fidgit/event.rb

@@ -34,7 +34,7 @@ module Fidgit
       raise ArgumentError, "Expected method or block for event handler" unless !block.nil? ^ !method.nil?
       raise ArgumentError, "#{self.class} does not handle #{event.inspect}" unless events.include? event
 
-      @_event_handlers = Hash.new() { |hash, key| hash[key] = [] } unless @_event_handlers
+      @_event_handlers ||= Hash.new() { |hash, key| hash[key] = [] }
       @_event_handlers[event].push(method ? method : block)
 
       nil
@@ -59,7 +59,7 @@ module Fidgit
         return :handled if send(event, self, *args) == :handled
       end
 
-      if @_event_handlers
+      if defined? @_event_handlers
         @_event_handlers[event].reverse_each do |handler|
           return :handled if handler.call(self, *args) == :handled
         end
@@ -77,8 +77,8 @@ module Fidgit
     def self.included(base)
       class << base
         def events
-          unless @events
-            # Copy the events already set up for your parent.
+          # Copy the events already set up for your parent.
+          unless defined? @events
             @events = if superclass.respond_to? :events
               superclass.events.dup
             else

data/lib/fidgit/states/gui_state.rb

@@ -45,11 +45,14 @@ module Fidgit
     def message(text, options = {}, &block); MessageDialog.new(text, options, &block); end
 
     # (see Container#clear)
-    def clear(*args, &block); @container.clear *args, █ end
+    def clear(*args, &block); @container.clear(*args, &block); end
 
     def initialize
       # The container is where the user puts their content.
       @container = MainPacker.new
+      @menu = nil
+      @last_cursor_pos = [-1, -1]
+      @mouse_over = nil
 
       unless defined? @@draw_pixel
         media_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'media'))

data/lib/fidgit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fidgit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-10 00:00:00.000000000 +01:00
+date: 2011-06-13 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &27888528 !ruby/object:Gem::Requirement
+  requirement: &26059560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.7.32
   type: :runtime
   prerelease: false
-  version_requirements: *27888528
+  version_requirements: *26059560
 - !ruby/object:Gem::Dependency
   name: chingu
-  requirement: &27888228 !ruby/object:Gem::Requirement
+  requirement: &26059164 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9rc5
   type: :runtime
   prerelease: false
-  version_requirements: *27888228
+  version_requirements: *26059164
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &27887940 !ruby/object:Gem::Requirement
+  requirement: &26058780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *27887940
+  version_requirements: *26058780
 - !ruby/object:Gem::Dependency
   name: texplay
-  requirement: &27887640 !ruby/object:Gem::Requirement
+  requirement: &26058396 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *27887640
+  version_requirements: *26058396
 description: Fidgit is a GUI library built on Gosu/Chingu
 email:
 - bil.bagpuss@gmail.com