rubygoo 0.0.5 → 0.0.6

data/lib/rubygoo/text_field.rb

@@ -6,9 +6,9 @@ module Rubygoo
       super opts
       @text = text
 
-      # TODO make widget respect these?
       @max_length = opts[:max_length]
       @min_length = opts[:min_length]
+      @min_length ||= 1
 
       @key_handlers = {}
     end
@@ -40,12 +40,17 @@ module Rubygoo
 
       @font_file = File.join(@app.theme_dir,font)
 
-      if @w == 1
-        # we have the default from widget, we want to set the
-        # default to 6 chars wide and 1 char tall
-        size = @app.renderer.size_text "MMMMMM", @font_file, @font_size
-        @min_w = size[0]
-        @min_h = size[1]
+      # we have the default from widget, we want to set the
+      # default to 6 chars wide and 1 char tall
+      # wow, this is REALLY bad, but I think M is the widest char
+      size = @app.renderer.size_text "M"*@min_length, @font_file, @font_size
+      @min_w = size[0]
+      @min_h = size[1]
+
+      if @max_length
+      size = @app.renderer.size_text "M"*@max_length, @font_file, @font_size
+        @max_w = size[0]
+        @max_h = size[1]
       end
 
       set_text @text
@@ -61,6 +66,10 @@ module Rubygoo
         @rendered_text = @app.renderer.render_text @text, @font_file, @font_size, @color
         w = [@rendered_text.width,@min_w].max + @x_pad
         h = [@rendered_text.height,@min_h].max + @y_pad
+        if @max_length
+          w = [w,@max_w].min
+          h = [h,@max_h].min
+        end
         @rect = Rect.new [@x,@y,w,h]
       end
     end
@@ -80,18 +89,19 @@ module Rubygoo
 
     end
 
-    def draw(screen)
-      screen.fill @fg_color, @rect
-      screen.fill @bg_color, [@rect[0]-2,@rect[1]-2,@rect[2]+4,@rect[3]+4]
+    def draw(adapter)
+      x1 = @rect[0] - 2
+      y1 = @rect[1] - 2
+      x2 = @rect[2] + x1 + 4
+      y2 = @rect[3] + y1 + 4
+
+      adapter.fill x1, y1, x2, y2, @fg_color
+      adapter.fill x1-2, y1-2, x2+2, y2+2, @bg_color
       if @border_color
-        x1 = @rect[0] - 2
-        y1 = @rect[1] - 2
-        x2 = @rect[2] + x1 + 4
-        y2 = @rect[3] + y1 + 4
-        screen.draw_box x1, y1, x2, y2, @border_color
+        adapter.draw_box x1, y1, x2, y2, @border_color
       end
       defaultY = @app.renderer.size_text(@text.slice(0,1),@font_file,@font_size)[1]
-      x,y,w,h = @rect
+
       if @focussed
         caretX = @app.renderer.size_text(@text.slice(0,@caret_pos),@font_file,@font_size)[0]
         unless @select_pos.nil?
@@ -101,19 +111,23 @@ module Rubygoo
           selectX1 = [caretX, selectX].max
           if selectX0 < selectX1
             # TODO cache this height
-            screen.fill(@bg_select_color, [x+1+selectX0, y+1, selectX1-selectX0, defaultY])
+            x = x1+1+selectX0
+            y = y1+1
+            adapter.fill x, y, x+selectX1-selectX0, y+defaultY, @bg_select_color
           end
         end
       end
 
       unless @text.nil? or @text.empty?
         @rendered_text = @app.renderer.render_text @text, @font_file, @font_size, @color
-        screen.draw_image @rendered_text, x+1, y+1, @color
+        adapter.draw_image @rendered_text, x1+1, y1+1, @color
       end
 
       # draw caret        
       if @focussed
-        screen.fill(@fg_select_color, [x+1+caretX, y+1, 1, defaultY])
+        x = x1+1+caretX
+        y = y1+1
+        adapter.fill x, y, x+1, y+defaultY, @fg_select_color
       end
 
       # don't really need this??
@@ -161,18 +175,22 @@ module Rubygoo
     def mouse_down(event)
       x = event.data[:x]
       y = event.data[:y]
-      return 0 unless contains?([x,y])
 
-      #    TODO rework focus and mouse events
-      #    getFocus()
+      self.app.focus self
+
       @caret_pos = find_mouse_position([x,y])
       @select_pos = @caret_pos
-      @dragging = true
       render
     end
 
-    def mouse_motion(event)
-      return 0 unless @dragging
+    def mouse_dragging(event)
+      x = event.data[:x]
+      y = event.data[:y]
+      @caret_pos = find_mouse_position([x,y])
+      render
+    end
+
+    def mouse_drag(event)
       x = event.data[:x]
       y = event.data[:y]
       @caret_pos = find_mouse_position([x,y])
@@ -180,13 +198,9 @@ module Rubygoo
     end
 
     def mouse_up(event)
-      if not @dragging
-        return 0
-      end
       x = event.data[:x]
       y = event.data[:y]
       @caret_pos = find_mouse_position([x,y])
-      @dragging = false
       render
     end
 
@@ -282,9 +296,13 @@ module Rubygoo
 
       when *KEY2ASCII.keys
         # add regular text to the box
+        return if @text.size == @max_length
         if @caret_pos == @select_pos
-          @text = @text.slice(0,@caret_pos) + event.data[:string] + @text.slice(@caret_pos,@text.length-@caret_pos)
-          @caret_pos += 1
+          event_string = event.data[:string]
+          unless event_string.nil? or event_string == ""
+            @text = @text.slice(0,@caret_pos) + event_string + @text.slice(@caret_pos,@text.length-@caret_pos)
+            @caret_pos += 1
+          end
         else
           positions = [@caret_pos,@select_pos]
           min = positions.min

data/lib/rubygoo/widget.rb

@@ -5,10 +5,13 @@ require 'rect'
 module Rubygoo
   class Widget
     extend Publisher
-    can_fire :clicked
+
+    # fire resized whenever a dimensional variable changes
+    can_fire :clicked, :resized
+
     attr_accessor :enabled, :parent, :container, 
       :x, :y, :w, :h, :app, :x_pad, :y_pad, :focussed,
-      :focus_priority
+      :focus_priority, :relative
 
     DEFAULT_PARAMS = {
       :x => 0,
@@ -17,6 +20,7 @@ module Rubygoo
       :h => 1,
       :x_pad => 2,
       :y_pad => 2,
+      :relative => false,
     }
     def initialize(opts={})
       merged_opts = DEFAULT_PARAMS.merge opts
@@ -26,11 +30,12 @@ module Rubygoo
       @y_pad = merged_opts[:y_pad]
       @w = merged_opts[:w]
       @h = merged_opts[:h]
+      @relative = merged_opts[:relative]
       update_rect
     end
 
     def update_rect()
-      @rect = Rect.new [@x,@y,@w+@x_pad,@h+@y_pad]
+      @rect = Rect.new [@x,@y,@w,@h]
     end
 
     # called when the widget is added to a container
@@ -60,14 +65,22 @@ module Rubygoo
     def mouse_down(event)
     end
 
-    # called when there is a mouse motion
+    # called when there is a mouse motion and no button pressed
     def mouse_motion(event)
     end
+    #
+    # called when there is a mouse motion and a button pressed
+    def mouse_dragging(event)
+    end
 
-    # called when there is a mouse release
+    # called when there is a mouse release w/o drag
     def mouse_up(event)
     end
 
+    # called when there is a mouse release at the end of a drag
+    def mouse_drag(event)
+    end
+
     # called when a key press is sent to us
     def key_pressed(event)
     end
@@ -142,11 +155,44 @@ module Rubygoo
 
       GooColor.new *new_color 
     end
+
+    # does this widget want tabbed focus? Widget do usually
+    def tab_to?()
+      true
+    end
+
+    def modal?()
+      false
+    end
     
-    # called each update cycle with the amount of time that has passed.  useful
-    # for animations, etc
+    # called each update cycle with the amount of time that has
+    # passed.  useful for animations, etc
     def update(time)
     end
 
+    def x=(val)
+      @x = val
+      fire :resized, self
+    end
+    def y=(val)
+      @y = val
+      fire :resized, self
+    end
+    def w=(val)
+      @w = val
+      fire :resized, self
+    end
+    def h=(val)
+      @h = val
+      fire :resized, self
+    end
+    def x_pad=(val)
+      @x_pad = val
+      fire :resized, self
+    end
+    def y_pad=(val)
+      @y_pad = val
+      fire :resized, self
+    end
   end
 end

data/lib/rubygoo.rb

@@ -1,6 +1,7 @@
 $: << File.dirname(__FILE__)
 $: << File.join(File.dirname(__FILE__),"rubygoo")
 $: << File.join(File.dirname(__FILE__),"rubygoo","adapters")
+require 'rubygems'
 require 'rubygoo/goo_event'
 require 'rubygoo/goo_color'
 require 'rubygoo/adapters/adapter_factory'
@@ -8,9 +9,12 @@ require 'yaml'
 require 'rubygoo/widget'
 require 'rubygoo/container'
 require 'rubygoo/mouse_cursor'
+require 'rubygoo/tab_group'
 require 'rubygoo/app'
 require 'rubygoo/label'
 require 'rubygoo/button'
 require 'rubygoo/check_box'
+require 'rubygoo/radio_button'
+require 'rubygoo/radio_group'
 require 'rubygoo/text_field'
 require 'rubygoo/dialog'

data/samples/create_gui.rb

@@ -0,0 +1,67 @@
+module CreateGui
+  def create_gui(renderer, icon)
+    app = App.new :renderer => renderer
+
+    label = Label.new "click the button to set the time", :x=>20, :y=>30
+
+    button = Button.new "Click Me!", :x=>70, :y=>80, :x_pad=>20, :y_pad=>20, :icon => icon
+    button.on :pressed do |*opts|
+      label.set_text(Time.now.to_s)
+    end
+
+    check = CheckBox.new :x=>370, :y=>70, :w=>20, :h=>20
+    check.on :checked do
+      label.set_text("CHECKED [#{check.checked?}]")
+    end
+
+    text_field = TextField.new "initial text", :x => 70, :y => 170, :max_length => 20, :min_length => 6
+
+    text_field.on_key K_RETURN, K_KP_ENTER do |evt|
+      puts "BOO-YAH"
+    end
+
+    modal_button = Button.new "Modal dialogs", :x=>270, :y=>280, :x_pad=>20, :y_pad=>20
+    modal_button.on :pressed do |*opts|
+      # TODO make some of this stuff relative and/or make Dialog's
+      # constructor take a layout to use
+      modal = Dialog.new :modal => app, :x=>60, :y=>110, :w=>250, :h=>250
+
+      modal.add Label.new("Message Here", :x=>20, :y=>70, :x_pad=>20, :y_pad=>20, :relative=>true)
+      resize_me = Button.new "resize", :relative=>true, :x=>170, :y=>180
+      resize_me.on :pressed do |*opts|
+        modal.resize opts.first
+      end
+
+      ok_butt = Button.new("OK", :x=>70, :y=>180, :x_pad=>20, :y_pad=>20,:relative=>true)
+      ok_butt.on :pressed do |*opts|
+        app.remove_modal(modal)
+      end
+      modal.add ok_butt, resize_me
+
+      modal.show
+    end
+
+    grp = RadioGroup.new :x=>10, :y=>380, :x_pad=>20, :y_pad=>20, :w=> 500, :h=>80
+    grp_label = Label.new "RadioGroups are fun!", :x=>40, :y=>10, :w=>20, :h=>20, :relative=>true
+    grp_radio_one = RadioButton.new :x=>40, :y=>40, :w=>20, :h=>20, :relative=>true
+    grp_radio_two = RadioButton.new :x=>90, :y=>40, :w=>20, :h=>20, :relative=>true
+    grp_radio_three = RadioButton.new :x=>140, :y=>40, :w=>20, :h=>20, :relative=>true
+
+    grp.add grp_label, grp_radio_one, grp_radio_two, grp_radio_three
+
+    # implicit tab ordering based on order of addition, can
+    # specify if you want on widget creation
+
+    # can add many or one at a time
+    app.add text_field, label, button, modal_button, grp
+    app.add check
+
+  #  pulldown = Pulldown.new {:x=>70, :y=>80}
+  #  pulldown.on :changed do |*opts|
+  #    label.set_text(opts.first)
+  #  end
+  #
+  #  app.add pulldown
+    app
+  end
+end

data/samples/gosu_app.rb

@@ -1,98 +1,45 @@
 require 'rubygems'
 $: << './lib'
+$: << File.dirname(__FILE__)
 require 'rubygoo'
-
 require 'gosu'
 include Gosu
 include Rubygoo
 
+require 'create_gui'
 class RubygooWindow < Window
+  include CreateGui
   def initialize()
 
     super(640, 480, false)
 
-    # TODO, how can I do this cleaner?
+    # TODO, how can I do this more cleanly?
     %w{a b c d e f g h i j k l m n o p q r s t u v w x y z}.each do |letter|
       eval "::Kb#{letter.upcase} = #{self.char_to_button_id(letter)}"
     end
+
     # how do I get rid of this?
     require 'gosu_app_adapter'
     factory = AdapterFactory.new
     @render_adapter = factory.renderer_for :gosu, self
-    app = create_gui(@render_adapter)
+    icon = Image.new self, File.dirname(__FILE__) + "/icon.png"
+    app = create_gui(@render_adapter,icon)
     @app_adapter = factory.app_for :gosu, app, self
     self.caption = "Gosu Tutorial Game"
 
   end
 
-  def create_gui(renderer)
-    app = App.new :renderer => renderer
-
-    label = Label.new "click the button to set the time", :x=>20, :y=>30
-
-    button = Button.new "Click Me!", :x=>70, :y=>80, :x_pad=>20, :y_pad=>20
-    button.on :pressed do |*opts|
-      label.set_text(Time.now.to_s)
-    end
-
-    check = CheckBox.new :x=>370, :y=>70, :w=>20, :h=>20
-    check.on :checked do
-      label.set_text("CHECKED [#{check.checked?}]")
-    end
-
-    text_field = TextField.new "initial text", :x => 70, :y => 170
-
-    text_field.on_key K_RETURN, K_KP_ENTER do |evt|
-      puts "BOO-YAH"
-    end
-
-    modal_button = Button.new "Modal dialogs", :x=>270, :y=>280, :x_pad=>20, :y_pad=>20
-    modal_button.on :pressed do |*opts|
-      msg = "I AM MODAL"
-      # TODO make some of this stuff relative and/or make Dialog's
-      # constructor take a layout to use
-      modal = Dialog.new :modal => app, :x=>10, :y=>110, :w=>250, :h=>250
-
-      modal.add Label.new("Message Here", :x=>70, :y=>180, :x_pad=>20, :y_pad=>20)
-      ok_butt = Button.new("OK", :x=>90, :y=>280, :x_pad=>20, :y_pad=>20)
-      ok_butt.on :pressed do |*opts|
-        # TODO not sure about this yet
-        app.remove(modal)
-      end
-      modal.add ok_butt
-
-      modal.show
-    end
-
-    # implicit tab ordering based on order of addition, can
-    # specify if you want on widget creation
-
-    # can add many or one at a time
-    app.add text_field, label, button, modal_button
-    app.add check
-
-    #  pulldown = Pulldown.new {:x=>70, :y=>80}
-    #  pulldown.on :changed do |*opts|
-    #    label.set_text(opts.first)
-    #  end
-    #
-    #  app.add pulldown
-    app
-  end
-
   def update
     @app_adapter.update Gosu::milliseconds 
   end
 
   def draw
-    # possibly need to set something like GosuRenderer vs
-    # RubygameRenderer that each know how to draw a textbox in
-    # its own way?
     @app_adapter.draw @render_adapter
   end
 
   # in gosu this captures mouse and keyboard events
   def button_down(id)
+    close if id == Gosu::Button::KbEscape
     @app_adapter.button_down id
   end
 

data/samples/rubygame_app.rb

@@ -1,64 +1,12 @@
 require 'rubygems'
 $: << './lib'
+$: << File.dirname(__FILE__)
 require 'rubygoo'
 require 'rubygame'
+require 'create_gui'
 include Rubygame
 include Rubygoo
-
-def create_gui(renderer)
-  app = App.new :renderer => renderer
-
-  label = Label.new "click the button to set the time", :x=>20, :y=>30
-
-  button = Button.new "Click Me!", :x=>70, :y=>80, :x_pad=>20, :y_pad=>20
-  button.on :pressed do |*opts|
-    label.set_text(Time.now.to_s)
-  end
-
-  check = CheckBox.new :x=>370, :y=>70, :w=>20, :h=>20
-  check.on :checked do
-    label.set_text("CHECKED [#{check.checked?}]")
-  end
-
-  text_field = TextField.new "initial text", :x => 70, :y => 170
-
-  text_field.on_key K_RETURN, K_KP_ENTER do |evt|
-    puts "BOO-YAH"
-  end
-
-  modal_button = Button.new "Modal dialogs", :x=>270, :y=>280, :x_pad=>20, :y_pad=>20
-  modal_button.on :pressed do |*opts|
-    msg = "I AM MODAL"
-    # TODO make some of this stuff relative and/or make Dialog's
-    # constructor take a layout to use
-    modal = Dialog.new :modal => app, :x=>10, :y=>110, :w=>250, :h=>250
-
-    modal.add Label.new("Message Here", :x=>70, :y=>180, :x_pad=>20, :y_pad=>20)
-    ok_butt = Button.new("OK", :x=>90, :y=>280, :x_pad=>20, :y_pad=>20)
-    ok_butt.on :pressed do |*opts|
-      # TODO not sure about this yet
-      app.remove(modal)
-    end
-    modal.add ok_butt
-
-    modal.show
-  end
-
-  # implicit tab ordering based on order of addition, can
-  # specify if you want on widget creation
-
-  # can add many or one at a time
-  app.add text_field, label, button, modal_button
-  app.add check
-
-#  pulldown = Pulldown.new {:x=>70, :y=>80}
-#  pulldown.on :changed do |*opts|
-#    label.set_text(opts.first)
-#  end
-#
-#  app.add pulldown
-  app
-end
+include CreateGui
 
 if $0 == __FILE__
 
@@ -67,7 +15,8 @@ if $0 == __FILE__
 
   factory = AdapterFactory.new
   render_adapter = factory.renderer_for :rubygame, screen
-  app = create_gui(render_adapter)
+  icon = Surface.load File.dirname(__FILE__) + "/icon.png"
+  app = create_gui(render_adapter,icon)
   app_adapter = factory.app_for :rubygame, app
   
   # rubygame standard stuff below here

data/test/app_spec.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__)+"/test_setup.rb"
+
+describe App do
+
+  describe "basic app behavior" do
+    before :each do
+#      @widget = Map.new
+    end
+
+    it "should merge in defaults for any options not given" do
+      @app = App.new
+      for k,v in App::DEFAULT_PARAMS.dup.delete(:theme)
+        @app.instance_variable_get("@#{k}").should == v
+      end
+
+      theme_dir = File.join(App::DEFAULT_PARAMS[:data_dir], 
+                            App::DEFAULT_PARAMS[:theme])
+      exp_theme = YAML::load_file(File.join(theme_dir,"config.yml"))
+      @app.theme.should == exp_theme
+    end
+
+  end
+
+end

data/test/test_rubygoo.rb

@@ -0,0 +1 @@
+# TODO change this to include/run all specs in this directory

data/test/test_setup.rb

@@ -0,0 +1,4 @@
+$: << File.dirname(__FILE__) + "/../lib"
+$: << File.dirname(__FILE__) + "/../lib/rubygoo"
+require 'rubygoo'
+include Rubygoo

data/test/widget_spec.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__)+"/test_setup.rb"
+
+describe Widget do
+
+  describe "basic widget behavior" do
+    before :each do
+#      @widget = Map.new
+    end
+
+    it "should merge in defaults for any options not given" do
+      @widget = Widget.new
+      for k,v in Widget::DEFAULT_PARAMS
+        @widget.instance_variable_get("@#{k}").should == v
+      end
+    end
+
+  end
+
+end

data/themes/default/config.yml

@@ -1,6 +1,8 @@
 --- 
 Rubygoo::App: 
   :bg_color: :Black
+Rubygoo::Container: 
+  :bg_color: :DarkGray
 Rubygoo::Widget: 
   :font: Vera.ttf
   :font_size: 20

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubygoo
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Shawn Anderson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-13 00:00:00 -07:00
+date: 2008-11-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -40,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.2
     version: 
 description: GUI library for use with Gosu or Rubygame
 email: boss@topfunky.com
@@ -85,11 +95,20 @@ files:
 - lib/rubygoo/goo_event.rb
 - lib/rubygoo/label.rb
 - lib/rubygoo/mouse_cursor.rb
+- lib/rubygoo/radio_button.rb
+- lib/rubygoo/radio_group.rb
 - lib/rubygoo/rect.rb
+- lib/rubygoo/tab_group.rb
 - lib/rubygoo/text_field.rb
 - lib/rubygoo/widget.rb
+- samples/create_gui.rb
 - samples/gosu_app.rb
+- samples/icon.png
 - samples/rubygame_app.rb
+- test/app_spec.rb
+- test/test_rubygoo.rb
+- test/test_setup.rb
+- test/widget_spec.rb
 - themes/default/Vera.ttf
 - themes/default/config.yml
 has_rdoc: true
@@ -119,5 +138,6 @@ rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Beautiful graphs for one or multiple datasets.
-test_files: []
-
+test_files: 
+- test/test_rubygoo.rb
+- test/test_setup.rb