rubygoo 0.0.6 → 0.0.7

data/lib/rubygoo/goo_event.rb

@@ -2,12 +2,16 @@ module Rubygoo
   # all events in the system are converted to these for internal use by our
   # adapter
   class GooEvent
-    attr_accessor :event_type, :data
+    attr_accessor :event_type, :data, :handled
 
     def initialize(event_type, event_data = nil)
       @event_type = event_type
       @data = event_data
     end
 
+    def handled?()
+      @handled
+    end
+
   end
 end

data/lib/rubygoo/icon.rb

@@ -0,0 +1,26 @@
+module Rubygoo
+  # Icon is basically a place holder for images
+  class Icon < Widget
+    def initialize(opts={})
+      @icon = opts[:icon]
+      super opts
+    end
+
+    def added()
+      update_rect
+    end
+
+    def draw(adapter)
+      x1 = @rect[0]
+      y1 = @rect[1]
+      x2 = @rect[2] + x1
+      y2 = @rect[3] + y1
+
+      # TODO center icon
+      ix = x1#+((x2-x1)-@icon.w)
+      iy = y1#+((y2-y1)-@icon.h)
+      adapter.draw_image @icon, ix+@x_pad,iy+@y_pad
+    end
+  end
+end
+

data/lib/rubygoo/label.rb

@@ -2,18 +2,19 @@ require 'publisher'
 module Rubygoo
   class Label < Widget
     def initialize(text, opts={})
+      @font_size = opts[:font_size]
       super opts
       @text = text
     end
 
     def added()
       font = theme_property :font
-      @font_size = theme_property :font_size
+      @font_size ||= theme_property :font_size
       @color = theme_property :color
       @bg_color = theme_property :bg_color
       @focus_color = theme_property :focus_color
       @border_color = theme_property :border_color
-      @font_file = File.join(@app.theme_dir,font)
+      @font_file ||= File.join(@app.theme_dir,font)
 
       set_text @text
     end
@@ -21,7 +22,9 @@ module Rubygoo
     def set_text(text)
       @text = text
       @rendered_text = @app.renderer.render_text @text, @font_file, @font_size, @color
-      @rect = Rect.new [@x,@y,@rendered_text.width+@x_pad,@rendered_text.height+@y_pad]
+      @w = @rendered_text.width
+      @h = @rendered_text.height
+      update_rect
     end
 
     def draw(adapter)

data/lib/rubygoo/radio_button.rb

@@ -20,6 +20,10 @@ module Rubygoo
         adapter.draw_circle_filled @rect.centerx, @rect.centery, radius-@x_pad, @checked_color
       end
 
+      if mouse_over? and @hover_color
+        adapter.draw_circle_filled @rect.centerx, @rect.centery, radius-@x_pad, @hover_color
+      end
+
       if @border_color
         adapter.draw_circle @rect.centerx, @rect.centery, radius, @border_color
       end

data/lib/rubygoo/radio_group.rb

@@ -4,7 +4,6 @@ module Rubygoo
   class RadioGroup < Container
 
     def initialize(opts={})
-      # TODO add label, border
       super opts
     end
 
@@ -24,13 +23,9 @@ module Rubygoo
     end
 
     def update_group_selection(selected_widget)
-      @widgets.each do |w|
-        if w.respond_to? :checked?
-          if w.checked?
-            unless selected_widget == w
-              w.uncheck
-            end
-          end
+      @widgets.select{|w| w.respond_to? :checked? and w.checked?}.each do |w|
+        unless selected_widget == w
+          w.uncheck
         end
       end
     end

data/lib/rubygoo/tab_group.rb

@@ -48,18 +48,18 @@ module Rubygoo
     def focus(w)
       index = @widgets.index w
       if index
-        @widgets[@selected_index].unfocus if @widgets[@selected_index]
+        @widgets[@selected_index]._unfocus if @widgets[@selected_index]
         @selected_index = index
-        @widgets[@selected_index].focus
+        @widgets[@selected_index]._focus
       end
     end
 
     def rotate(dir)
       if @widgets.size > 0
-        @widgets[@selected_index].unfocus if @widgets[@selected_index]
+        @widgets[@selected_index]._unfocus if @widgets[@selected_index]
         @selected_index += dir
         @selected_index %= @widgets.size
-        @widgets[@selected_index].focus
+        @widgets[@selected_index]._focus
       end
     end
 

data/lib/rubygoo/widget.rb

@@ -1,5 +1,4 @@
 require 'publisher'
-require 'css_colors'
 require 'goo_color'
 require 'rect'
 module Rubygoo
@@ -7,11 +6,13 @@ module Rubygoo
     extend Publisher
 
     # fire resized whenever a dimensional variable changes
-    can_fire :clicked, :resized
+    can_fire :resized, :mouse_enter, :mouse_exit, :focus, :unfocus,
+      :key_pressed, :key_released, :mouse_down, :mouse_up, :mouse_drag, 
+      :mouse_dragging, :mouse_motion, :enable, :disable, :hide, :show
 
-    attr_accessor :enabled, :parent, :container, 
+    attr_accessor :enabled, :parent, :container, :opts,
       :x, :y, :w, :h, :app, :x_pad, :y_pad, :focussed,
-      :focus_priority, :relative
+      :focus_priority, :relative, :mouse_over, :visible
 
     DEFAULT_PARAMS = {
       :x => 0,
@@ -21,6 +22,8 @@ module Rubygoo
       :x_pad => 2,
       :y_pad => 2,
       :relative => false,
+      :enabled => true,
+      :visible => true,
     }
     def initialize(opts={})
       merged_opts = DEFAULT_PARAMS.merge opts
@@ -31,6 +34,11 @@ module Rubygoo
       @w = merged_opts[:w]
       @h = merged_opts[:h]
       @relative = merged_opts[:relative]
+      @enabled = merged_opts[:enabled]
+      @visible = merged_opts[:visible]
+
+      @opts = merged_opts
+
       update_rect
     end
 
@@ -38,75 +46,32 @@ module Rubygoo
       @rect = Rect.new [@x,@y,@w,@h]
     end
 
-    # called when the widget is added to a container
-    def added()
-    end
-
-    # called when the widget is removed from a container
-    def removed()
-    end
-
-    def contains?(pos)
-      @rect.collide_point? pos[0], pos[1]
-    end
-
-    def enabled?()
-      @enabled
-    end
-
-    def update(millis)
-    end
-
-    # draw ourself on the screen
-    def draw(screen)
-    end
-
-    # called when there is a mouse click
-    def mouse_down(event)
-    end
-
-    # 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)
+    def contains?(x, y)
+      @rect.collide_point? x, y
     end
 
-    # 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)
+    def mouse_over?()
+      @mouse_over
     end
 
-    # called when a key press is sent to us
-    def key_pressed(event)
-    end
-
-    # called when a key release is sent to us
-    def key_released(event)
-    end
-
-    # called when the widget receives focus
-    def on_focus()
-    end
-
-    def focus()
-      @focussed = true
-      on_focus
-    end
-
-    # called when the widget loses focus
-    def on_unfocus()
+    def _mouse_motion(event) #:nodoc:
+      if contains?(event.data[:x],event.data[:y])
+        unless @mouse_over
+          @mouse_over = true
+          fire :mouse_enter, event
+          mouse_enter event
+        end
+      else
+        if @mouse_over
+          @mouse_over = false
+          fire :mouse_exit, event
+          mouse_exit event
+        end
+      end
+      fire :mouse_motion, event
+      mouse_motion event
     end
 
-    def unfocus()
-      @focussed = false
-      on_unfocus
-    end
-    
     def focussed?()
       @focussed
     end
@@ -121,19 +86,21 @@ module Rubygoo
         if class_theme
           class_prop = class_theme[prop_key]
           if class_prop
+            return nil if class_prop == :none
             prop = class_prop
             break
           end
         end
         parent = parent.superclass
       end
-      if prop_key.to_s.match /color/i
+      if prop_key.to_s.match(/color/i) and prop
         get_color prop
       else
         prop
       end
     end
 
+    # converts theme property to a GooColor
     def get_color(color)
       new_color = nil
       if color.is_a? Array
@@ -141,14 +108,14 @@ module Rubygoo
           new_color = color
         else
           # fill in zeros for all other colors
-          3-color.size.times do
+          (3 - color.size).times do
             color << 0
           end
           # fill in alpha as 255
           color << 255
         end
       elsif color.is_a? Symbol
-        new_color = CSS_COLORS[color]
+        new_color = COLORS[color]
       else
         raise "invalid color"
       end
@@ -156,43 +123,213 @@ 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
-    def update(time)
-    end
-
+    # sets x and fires resized event
     def x=(val)
       @x = val
+      update_rect
       fire :resized, self
     end
+
+    # sets y and fires resized event
     def y=(val)
       @y = val
+      update_rect
       fire :resized, self
     end
+
+    # sets width and fires resized event
     def w=(val)
       @w = val
+      update_rect
       fire :resized, self
     end
+
+    # sets height and fires resized event
     def h=(val)
       @h = val
+      update_rect
       fire :resized, self
     end
+
+    # sets x padding and fires resized event
     def x_pad=(val)
       @x_pad = val
+      update_rect
       fire :resized, self
     end
+
+    # sets y padding and fires resized event
     def y_pad=(val)
       @y_pad = val
+      update_rect
       fire :resized, self
     end
+
+    def enabled?()
+      @enabled
+    end
+
+    # called when the widget is disabled
+    def disable()
+      if enabled?
+        fire :disable
+        @enabled = false
+      end
+    end
+
+    # called when the widget is enabled
+    def enable()
+      unless enabled?
+        fire :enable
+        @enabled = true
+      end
+    end
+
+    def visible?()
+      @visible
+    end
+
+    # called when the widget is hidden
+    def hide()
+      if visible?
+        fire :hide
+        @visible = false
+        disable
+      end
+    end
+
+    # called when the widget is shown
+    def show()
+      unless visible?
+        fire :show
+        @visible = true
+        enable
+      end
+    end
+
+    def _update(time) #:nodoc:
+      update time
+    end
+
+    def _focus() #:nodoc:
+      fire :focus
+      @focussed = true
+      focus
+    end
+
+    def _unfocus() #:nodoc:
+      fire :unfocus
+      @focussed = false
+      unfocus
+    end
+
+    def _mouse_dragging(event) #:nodoc:
+      fire :mouse_dragging, event
+      mouse_dragging event
+    end
+
+    def _mouse_drag(event) #:nodoc:
+      fire :mouse_drag, event
+      mouse_drag event
+    end
+
+    def _mouse_up(event) #:nodoc:
+      fire :mouse_up, event
+      mouse_up event
+    end
+
+    def _mouse_down(event) #:nodoc:
+      fire :mouse_down, event
+      mouse_down event
+    end
+
+    def _key_pressed(event) #:nodoc:
+      fire :key_pressed, event
+      key_pressed event
+    end
+
+    def _key_released(event) #:nodoc:
+      fire :key_released, event
+      key_released event
+    end
+
+    def _draw(screen) #:nodoc:
+      draw screen
+    end
+
+    #
+    # STUFF TO OVER RIDE
+    #
+
+    # does this widget want tabbed focus? Widget do usually
+    def tab_to?()
+      true
+    end
+
+    def modal?()
+      false
+    end
+
+    # called when the widget is added to a container
+    def added()
+    end
+
+    # called when the widget is removed from a container
+    def removed()
+    end
+    
+    # called each update cycle with the amount of time that has
+    # passed.  useful for animations, etc
+    def update(time)
+    end
+
+    # called when there is a mouse motion and a button pressed
+    def mouse_dragging(event)
+    end
+
+    # called when there is a mouse release w/o drag
+    def mouse_up(event)
+    end
+
+    # called when there is a mouse click
+    def mouse_down(event)
+    end
+
+    # called when there is a mouse release at the end of a drag
+    def mouse_drag(event)
+    end
+
+    # called when the mouse first enters a widget
+    def mouse_enter(event)
+    end
+
+    # called when the mouse exits a widget
+    def mouse_exit(event)
+    end
+
+    # called when there is a mouse motion and no button pressed
+    def mouse_motion(event)
+    end
+    
+    # called when a key press is sent to us
+    def key_pressed(event)
+    end
+
+    # called when a key release is sent to us
+    def key_released(event)
+    end
+
+    # draw ourself on the screen
+    def draw(screen)
+    end
+
+    # called when the widget receives focus
+    def focus()
+    end
+
+    # called when the widget loses focus
+    def unfocus()
+    end
+
   end
 end

data/lib/rubygoo.rb

@@ -12,6 +12,7 @@ require 'rubygoo/mouse_cursor'
 require 'rubygoo/tab_group'
 require 'rubygoo/app'
 require 'rubygoo/label'
+require 'rubygoo/icon'
 require 'rubygoo/button'
 require 'rubygoo/check_box'
 require 'rubygoo/radio_button'

data/samples/create_gui.rb

@@ -4,14 +4,28 @@ module CreateGui
 
     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 = Button.new "Click Me!", :x=>70, :y=>80, :x_pad=>20, :y_pad=>20, :icon => icon, :enabled => false
     button.on :pressed do |*opts|
       label.set_text(Time.now.to_s)
     end
 
-    check = CheckBox.new :x=>370, :y=>70, :w=>20, :h=>20
+    icon_widget = Icon.new :x => 280, :y => 80, :icon => icon
+
+    check = CheckBox.new :x=>370, :y=>70, :w=>20, :h=>20, :label=> "Check me out!"
+    check.on :mouse_enter do
+      puts "ENTERING #{self.class}"
+    end
+    check.on :mouse_exit do
+      puts "EXITING #{self.class}"
+    end
+
     check.on :checked do
       label.set_text("CHECKED [#{check.checked?}]")
+      if check.checked?
+        button.enable
+      else
+        button.disable
+      end
     end
 
     text_field = TextField.new "initial text", :x => 70, :y => 170, :max_length => 20, :min_length => 6
@@ -20,7 +34,7 @@ module CreateGui
       puts "BOO-YAH"
     end
 
-    modal_button = Button.new "Modal dialogs", :x=>270, :y=>280, :x_pad=>20, :y_pad=>20
+    modal_button = Button.new "Modal dialogs", :x=>270, :y=>240, :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
@@ -34,11 +48,11 @@ module CreateGui
 
       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)
+        modal.close
       end
       modal.add ok_butt, resize_me
 
-      modal.show
+      modal.display
     end
 
     grp = RadioGroup.new :x=>10, :y=>380, :x_pad=>20, :y_pad=>20, :w=> 500, :h=>80
@@ -49,11 +63,20 @@ module CreateGui
 
     grp.add grp_label, grp_radio_one, grp_radio_two, grp_radio_three
 
+    hide_button = Button.new "Hide the radios!", :x=>170, :y=>330, :x_pad=>10, :y_pad=>10
+    hide_button.on :pressed do |*opts|
+      if grp.visible?
+        grp.hide
+      else
+        grp.show
+      end
+    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, grp
+    app.add text_field, label, button, modal_button, grp, hide_button, icon_widget
     app.add check
 
   #  pulldown = Pulldown.new {:x=>70, :y=>80}

data/samples/gosu_app.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+#require 'unprof'
 $: << './lib'
 $: << File.dirname(__FILE__)
 require 'rubygoo'

data/samples/rubygame_app.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+#require 'unprof'
 $: << './lib'
 $: << File.dirname(__FILE__)
 require 'rubygoo'
@@ -26,7 +27,7 @@ if $0 == __FILE__
     JoyHatEvent, JoyUpEvent, ResizeEvent 
   ]
   clock = Clock.new
-  clock.target_framerate = 20
+  clock.target_framerate = 40
 
   catch(:rubygame_quit) do
     loop do

data/themes/default/config.yml

@@ -1,25 +1,31 @@
 --- 
-Rubygoo::App: 
-  :bg_color: :Black
+Rubygoo::App: # look at Rubygoo::CssColors for list
+  :bg_color: :Snow
 Rubygoo::Container: 
-  :bg_color: :DarkGray
-Rubygoo::Widget: 
+  :bg_color: :Silver
+Rubygoo::Widget: # fonts should live in the theme's dir
   :font: Vera.ttf
   :font_size: 20
-  :color: :Black
-  :focus_color: :FireBrick
-  :bg_color: :Gray
-  :border_color: :FireBrick
+  :color: :Tomato
+  :focus_color: :LightSlateGray
+  :bg_color: :WhiteSmoke
+  :disabled_color: :WhiteSmoke
+  :border_color: :DarkSlateBlue
+  :hover_color: # can specify a color by r,g,b,a as well
+   - 55
+   - 55
+   - 55
+   - 150
 Rubygoo::Button: 
-  :bg_color: :DimGray
+  :bg_color: :LightGray
 Rubygoo::CheckBox:
-  :checked_color: :FireBrick
+  :checked_color: :LightSlateGray
 Rubygoo::TextField:
-  :fg_color: :FireBrick
-  :bg_color: :Gray
-  :bg_select_color: :FireBrick
+  :fg_color: :Black
+  :bg_color: :Silver
+  :bg_select_color: :DarkSlateBlue
   :fg_select_color: :Snow
-  :border_color: :Black
+  :border_color: :DarkSlateBlue
 Rubygoo::MouseCursor:
-  :color: :Snow
+  :color: :DarkSlateGray
   :mouse_cursor: cursor.png