rubygoo 0.0.7 → 0.0.8

data/lib/rubygoo/adapters/rubygame_render_adapter.rb

@@ -10,6 +10,11 @@ module Rubygoo
       @screen.draw_box [x1,y1], [x2,y2], convert_color(color)
     end
 
+    def draw_line(x1,y1,x2,y2,color)
+      c = convert_color(color)
+      @screen.draw_line_a [x1, y1], [x2, y2], c
+    end
+
     def draw_circle(cx,cy,radius,color)
       @screen.draw_circle_a [cx,cy],radius,convert_color(color)
     end
@@ -36,8 +41,22 @@ module Rubygoo
       @screen.flip
     end
 
-    def draw_image(img, x, y, color=nil)
-      img.blit @screen, [x,y]
+    def draw_image(img, to_x, to_y, color=nil)
+      img.blit @screen, [to_x,to_y]
+    end
+
+    def draw_partial_image(img, to_x, to_y,
+                   from_x=nil,from_y=nil,from_w=nil,from_h=nil, color=nil)
+      if from_x
+        if from_w
+          from = [from_x,from_y,from_w,from_h]
+        else
+          from = [from_x,from_y]
+        end
+        img.blit @screen, [to_x,to_y], from
+      else
+        img.blit @screen, [to_x,to_y]
+      end
     end
 
     def size_text(text, font_file, font_size)

data/lib/rubygoo/app.rb

@@ -9,7 +9,7 @@ module Rubygoo
     DEFAULT_PARAMS = {:theme=>'default',:x=>10,:y=>10,:data_dir=>File.join(File.dirname(__FILE__),"..","..","themes"),:mouse_cursor => true}
     attr_accessor :theme_name, :theme, :data_dir, :theme_dir, :renderer, :tab_groups, :mouse
 
-    def initialize(opts={})
+    def initialize(opts={}, &block)
       merged_opts = DEFAULT_PARAMS.merge opts
       @widgets = []
       @tab_groups = []
@@ -20,7 +20,6 @@ module Rubygoo
       @theme_name = theme_name
       @theme = load_theme theme_name
       @renderer = merged_opts[:renderer]
-      super merged_opts
 
       # should this go here?
       @mouse_cursor = merged_opts[:mouse_cursor]
@@ -31,6 +30,8 @@ module Rubygoo
         @mouse.added
       end
       @mouse_dragging = false
+
+      super merged_opts, &block
     end
 
     def app()
@@ -160,7 +161,11 @@ module Rubygoo
     def update(time)
       _update(time)
     end
-      
-
   end
 end
+#class Object
+#  p "DEFINING IN OBJECT"
+#  def app(*args, &block)
+#    ::Rubygoo::App.new(*args,&block)
+#  end
+#end

data/lib/rubygoo/button.rb

@@ -1,12 +1,17 @@
 module Rubygoo
   class Button < Widget
     can_fire :pressed
-    def initialize(text, opts={})
-      super opts
 
-      @icon = opts[:icon]
+    attr_reader :text
+    goo_prop :icon_image, :image, :hover_image
+
+    def initialize(new_text, opts={})
+      @icon_image = opts[:icon]
+      @image = opts[:image]
+      @hover_image = opts[:hover_image]
+      @text = new_text
 
-      @text = text
+      super opts
     end
 
     def added()
@@ -21,12 +26,19 @@ module Rubygoo
       @disabled_color = theme_property :disabled_color
 
       @font_file = File.join(@app.theme_dir,font)
-      @rendered_text ||= @app.renderer.render_text @text, @font_file, @font_size, @color
-
-      @w = @rendered_text.width+2*@x_pad
-      @h = @rendered_text.height+2*@y_pad
-      @x = @x - @x_pad
-      @y = @y - @y_pad
+      @rendered_text ||= @app.renderer.render_text @text, @font_file, @font_size, @color if @text and !@text.empty?
+
+      if @image
+        @w = @image.width+2*@padding_left
+        @h = @image.height+2*@padding_top
+        @x = @x - @padding_left
+        @y = @y - @padding_top
+      else
+        @w = @rendered_text.width+2*@padding_left
+        @h = @rendered_text.height+2*@padding_top
+        @x = @x - @padding_left
+        @y = @y - @padding_top
+      end
 
       update_rect
     end
@@ -55,33 +67,42 @@ module Rubygoo
       x2 = @rect[2] + x1
       y2 = @rect[3] + y1
       
-
-      if @focussed
-        adapter.fill x1, y1, x2, y2, @focus_color
-      elsif @bg_color
-        adapter.fill x1, y1, x2, y2, @bg_color
-      end
-      if @border_color
-        adapter.draw_box x1, y1, x2, y2, @border_color
-      end
-
-      if mouse_over? and @hover_color
-        adapter.fill x1, y1, x2, y2, @hover_color
+      img = @image.nil? ? @rendered_text : @image
+      if @image
+        adapter.draw_image @image, @x+@padding_left, @y+@padding_top, @color
+      else
+
+        if @focussed
+          adapter.fill x1, y1, x2, y2, @focus_color
+        elsif @bg_color
+          adapter.fill x1, y1, x2, y2, @bg_color
+        end
+        if @border_color
+          adapter.draw_box x1, y1, x2, y2, @border_color
+        end
+
+        if @disabled_color and !enabled?
+          adapter.fill x1, y1, x2, y2, @disabled_color
+        end
+
+        if @icon_image
+          # TODO center icon
+          ix = x1#+((x2-x1)-@icon.w)
+          iy = y1#+((y2-y1)-@icon.h)
+          adapter.draw_image @icon_image, ix+@padding_left,iy+@padding_top
+        end
+
+        adapter.draw_image @rendered_text, @x+@padding_left, @y+@padding_top, @color
       end
 
-      if @disabled_color and !enabled?
-        adapter.fill x1, y1, x2, y2, @disabled_color
+      if mouse_over? and (@hover_image or @hover_color)
+        if @hover_image
+          adapter.draw_image @hover_image, @x+@padding_left, @y+@padding_top, @color
+        else
+          adapter.fill x1, y1, x2, y2, @hover_color
+        end
       end
 
-      if @icon
-        # 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
-
-      adapter.draw_image @rendered_text, @x+@x_pad, @y+@y_pad, @color
-
     end
   end
 end

data/lib/rubygoo/check_box.rb

@@ -2,17 +2,22 @@ require 'label'
 module Rubygoo
   class CheckBox < Widget
     attr_accessor :checked
+    attr_reader  :label_text
     can_fire :checked
+
     DEFAULT_PARAMS = {:align=>:right}
+    DEFAULT_PARAMS.keys.each do |k|
+      goo_prop k
+    end
+
     def initialize(opts={})
       opts = DEFAULT_PARAMS.merge opts
-      super opts
       @checked = opts[:checked]
 
-      # only supports label on the right
-      # TODO maybe I should do this in added
-      @label_text = opts[:label]
+      @label_text = opts[:label_text]
       @label_alignment = opts[:align]
+
+      super opts
     end
 
     def added()
@@ -23,18 +28,18 @@ module Rubygoo
       @checked_color = theme_property :checked_color
       @hover_color = theme_property :hover_color
 
-      @rect = Rect.new [@x-@x_pad,@y-@y_pad,@w+2*@x_pad,@h+2*@y_pad]
+      @rect = Rect.new [@x-@padding_left,@y-@padding_top,@w+2*@padding_left,@h+2*@padding_top]
       unless @label_text.nil? or @label_text.empty?
         @label = Label.new @label_text, :x=>0,:y=>0, :relative=>@relative, :visible=>false
         @parent.add @label
 
         case @label_alignment
         when :right
-          lx = @x+2*@x_pad+@w
+          lx = @x+2*@padding_left+@w
           ly = @y
         when :left
           ly = @y
-          lx = @x-2*@x_pad-@label.w
+          lx = @x-2*@padding_left-@label.w
         end
         @label.x = lx
         @label.y = ly
@@ -94,7 +99,7 @@ module Rubygoo
       end
 
       if @checked
-        rect = @rect.inflate(-@x_pad,-@y_pad)
+        rect = @rect.inflate(-@padding_left,-@padding_top)
         cx1 = rect[0]
         cy1 = rect[1]
         cx2 = rect[2] + x1
@@ -110,6 +115,13 @@ module Rubygoo
         adapter.draw_box x1, y1, x2, y2, @border_color
       end
     end
+
+    # DSL methods
+    def label_text(new_val=nil)
+      @label_text = new_val if new_val
+      @label_text
+    end
+
   end
 end
 

data/lib/rubygoo/container.rb

@@ -3,12 +3,14 @@ module Rubygoo
     attr_accessor :widgets, :bg_color, :rect, :queued_widgets
 
     def initialize(opts={})
-      super opts
+      @auto_resize = opts[:auto_resize]
       # cannot get this if we don't have an app yet
       @bg_color = theme_property :bg_color if self.app
       @queued_widgets = []
       @widgets = []
       @modal_widgets = []
+
+      super opts
     end
 
     # called when we are added to another container
@@ -36,8 +38,10 @@ module Rubygoo
             end
             w.added
 
-            w.when :resized do |resized_widget|
-              resize resized_widget
+            if @auto_resize
+              w.when :resized do |resized_widget|
+                resize resized_widget
+              end
             end
 
             @widgets << w
@@ -61,6 +65,17 @@ module Rubygoo
       end
     end
 
+    # Remove all our children from the container.
+    def clear()
+      death_widgets = @widgets + @queued_widgets + @modal_widgets
+      @widgets = []
+      @queued_widgets = []
+      @modal_widgets = []
+      death_widgets.each do |w|
+        w.removed
+      end
+    end
+
     # draw ourself and our children
     def _draw(adapter)
       # any container specific code here (border_colors?)
@@ -115,6 +130,14 @@ module Rubygoo
       end
     end
 
+    # called when there is motion w/ the mouse button down
+    def _mouse_dragging(event)
+      mouse_dragging event
+      @widgets.select{|w| w.contains? event.data[:x],event.data[:y] and w.enabled?}.each do |w|
+        w._mouse_dragging event
+      end
+    end
+
     # pass on the key press to our widgets
     def _key_pressed(event)
       key_pressed event
@@ -156,10 +179,22 @@ module Rubygoo
         max_w = w_width if w_width > max_w
         max_h = w_height if w_height > max_h
       end
-      @w = max_w - @x + 2*@x_pad
-      @h = max_h - @y + 2*@y_pad
+      @w = max_w - @x + 2*@padding_left
+      @h = max_h - @y + 2*@padding_top
       update_rect
     end
+
+#    def self.inherited(by_obj)
+#      Widget.inherited(by_obj)
+#    end
+
+    # returns the child widget with the id passed in
+    def get(id)
+      @widgets.each do |w|
+        found_w = w.get(id)
+        return found_w if found_w
+      end
+    end
   end
 end
 

data/lib/rubygoo/icon.rb

@@ -19,8 +19,16 @@ module Rubygoo
       # 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
+      adapter.draw_image @icon, ix+@padding_left,iy+@padding_top
     end
+
+    #DSL methods
+    def icon_image(new_val=nil)
+      @icon = new_val if new_val
+      @icon
+    end
+
   end
+
 end
 

data/lib/rubygoo/label.rb

@@ -1,6 +1,7 @@
 require 'publisher'
 module Rubygoo
   class Label < Widget
+    attr_reader  :text
     def initialize(text, opts={})
       @font_size = opts[:font_size]
       super opts

data/lib/rubygoo/radio_button.rb

@@ -17,11 +17,11 @@ module Rubygoo
       end
 
       if @checked
-        adapter.draw_circle_filled @rect.centerx, @rect.centery, radius-@x_pad, @checked_color
+        adapter.draw_circle_filled @rect.centerx, @rect.centery, radius-@padding_left, @checked_color
       end
 
       if mouse_over? and @hover_color
-        adapter.draw_circle_filled @rect.centerx, @rect.centery, radius-@x_pad, @hover_color
+        adapter.draw_circle_filled @rect.centerx, @rect.centery, radius-@padding_left, @hover_color
       end
 
       if @border_color

data/lib/rubygoo/text_field.rb

@@ -2,6 +2,7 @@ module Rubygoo
   class TextField < Widget
     SPACE = " "
 
+    attr_reader :text
     def initialize(text, opts={})
       super opts
       @text = text
@@ -58,14 +59,14 @@ module Rubygoo
 
     def render()
       if @text.empty?
-        w = [@w,@min_w].max + @x_pad
-        h = [@h,@min_h].max + @y_pad
+        w = [@w,@min_w].max + @padding_left
+        h = [@h,@min_h].max + @padding_top
         @rendered_text = nil
         @rect = Rect.new [@x,@y,w,h]
       else
         @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
+        w = [@rendered_text.width,@min_w].max + @padding_left
+        h = [@rendered_text.height,@min_h].max + @padding_top
         if @max_length
           w = [w,@max_w].min
           h = [h,@max_h].min
@@ -287,9 +288,9 @@ module Rubygoo
         end
 
       when K_DELETE
-        if @select_pos != @caret_pos:
+        if @select_pos != @caret_pos
           delete_selected()
-        elsif @caret_pos < @text.length:
+        elsif @caret_pos < @text.length
           @text = @text.slice(0,@caret_pos) + @text.slice(@caret_pos+1,@text.length-@caret_pos-1)
           @select_pos = @caret_pos
         end

data/lib/rubygoo/widget.rb

@@ -1,9 +1,11 @@
 require 'publisher'
 require 'goo_color'
 require 'rect'
+require 'inflector'
 module Rubygoo
   class Widget
     extend Publisher
+    include Inflector
 
     # fire resized whenever a dimensional variable changes
     can_fire :resized, :mouse_enter, :mouse_exit, :focus, :unfocus,
@@ -11,7 +13,7 @@ module Rubygoo
       :mouse_dragging, :mouse_motion, :enable, :disable, :hide, :show
 
     attr_accessor :enabled, :parent, :container, :opts,
-      :x, :y, :w, :h, :app, :x_pad, :y_pad, :focussed,
+      :x, :y, :w, :h, :app, :padding_left, :padding_top, :focussed, :goo_id,
       :focus_priority, :relative, :mouse_over, :visible
 
     DEFAULT_PARAMS = {
@@ -19,27 +21,60 @@ module Rubygoo
       :y => 0,
       :w => 1,
       :h => 1,
-      :x_pad => 2,
-      :y_pad => 2,
+      :padding_left => 2,
+      :padding_right => 2,
+      :padding_top => 2,
+      :padding_bottom => 2,
       :relative => false,
       :enabled => true,
       :visible => true,
     }
-    def initialize(opts={})
+
+
+    def self.goo_prop(*keys)
+      for k in keys
+        define_method k do |*args|
+          v = args.shift
+          ivar = "@#{k.to_s}"
+          instance_variable_set(ivar,v) if v
+          instance_variable_get(ivar)
+        end
+      end
+    end
+
+    DEFAULT_PARAMS.keys.each do |k|
+      goo_prop k
+    end
+
+    def initialize(opts={}, &block)
       merged_opts = DEFAULT_PARAMS.merge opts
       @x = merged_opts[:x]
       @y = merged_opts[:y]
-      @x_pad = merged_opts[:x_pad]
-      @y_pad = merged_opts[:y_pad]
+      @padding_left = merged_opts[:padding_left]
+      @padding_right = merged_opts[:padding_right]
+      @padding_top = merged_opts[:padding_top]
+      @padding_bottom = merged_opts[:padding_bottom]
       @w = merged_opts[:w]
       @h = merged_opts[:h]
       @relative = merged_opts[:relative]
       @enabled = merged_opts[:enabled]
       @visible = merged_opts[:visible]
+      @goo_id = merged_opts[:id]
 
       @opts = merged_opts
 
       update_rect
+
+      instance_eval &block if block_given?
+    end
+
+    def self.inherited(by_obj)
+      meth = Inflector.underscore(Inflector.demodulize(by_obj)).to_sym
+      if meth == :app
+        Object.class_eval "def goo_app(*args, &block);#{by_obj}.new(*args,&block);end"
+      else
+        Widget.class_eval "def #{meth}(*args, &block);obj=#{by_obj}.new(*args,&block);add(obj) if self.respond_to?(:add);obj;end"
+      end
     end
 
     def update_rect()
@@ -80,19 +115,40 @@ module Rubygoo
     # it will walk up the object hierarchy if needed
     def theme_property(prop_key)
       prop = nil
-      parent = self.class
-      until parent == Object
-        class_theme = app.theme[parent.to_s]
-        if class_theme
-          class_prop = class_theme[prop_key]
-          if class_prop
-            return nil if class_prop == :none
-            prop = class_prop
-            break
+      return @opts[prop_key] if @opts and @opts[prop_key]
+
+
+      # look up based on :id
+      if @goo_id
+        id_theme = app.theme[@goo_id]
+        if id_theme
+          id_prop = id_theme[prop_key]
+          if id_prop
+            return nil if id_prop == :none
+            prop = id_prop
           end
         end
-        parent = parent.superclass
+
       end
+
+      unless prop
+        # look up based on class
+        parent = self.class
+        until parent == Object
+          class_theme = app.theme[parent.to_s]
+          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
+      end
+
+      # replace colors w/ GooColor
       if prop_key.to_s.match(/color/i) and prop
         get_color prop
       else
@@ -152,15 +208,15 @@ module Rubygoo
     end
 
     # sets x padding and fires resized event
-    def x_pad=(val)
-      @x_pad = val
+    def padding_left=(val)
+      @padding_left = val
       update_rect
       fire :resized, self
     end
 
     # sets y padding and fires resized event
-    def y_pad=(val)
-      @y_pad = val
+    def padding_top=(val)
+      @padding_top = val
       update_rect
       fire :resized, self
     end
@@ -331,5 +387,9 @@ module Rubygoo
     def unfocus()
     end
 
+    def get(id)
+      @goo_id == id ? self : nil
+    end
+
   end
 end