wads 0.1.1 → 0.2.1

data/lib/wads/textinput.rb

@@ -1,5 +1,7 @@
 require 'gosu'
 
+module Wads
+
 class TextField < Gosu::TextInput
   # Some constants that define our appearance.
   INACTIVE_COLOR  = 0xcc666666
@@ -9,27 +11,33 @@ class TextField < Gosu::TextInput
   PADDING = 5
   
   attr_reader :x, :y
+  attr_accessor :base_z
+  attr_accessor :old_value
   
-  def initialize(window, font, x, y, original_text, default_width)
+  def initialize(x, y, original_text, default_width)
     super()
     
-    @window, @font, @x, @y = window, font, x, y
+    @x = x
+    @y = y
+    @font = WadsConfig.instance.current_theme.font
     @default_width = default_width
+    @base_z = 0
     self.text = original_text
+    @old_value = self.text
   end
   
   def draw
     # Depending on whether this is the currently selected input or not, change the
     # background's color.
-    if @window.text_input == self then
+    if WadsConfig.instance.get_window.text_input == self then
       background_color = ACTIVE_COLOR
     else
       background_color = INACTIVE_COLOR
     end
-    @window.draw_quad(x - PADDING,         y - PADDING,          background_color,
-                      x + width + PADDING, y - PADDING,          background_color,
-                      x - PADDING,         y + height + PADDING, background_color,
-                      x + width + PADDING, y + height + PADDING, background_color, 9)
+    WadsConfig.instance.get_window.draw_quad(x - PADDING,         y - PADDING,          background_color,
+                                             x + width + PADDING, y - PADDING,          background_color,
+                                             x - PADDING,         y + height + PADDING, background_color,
+                                             x + width + PADDING, y + height + PADDING, background_color, @base_z + 9)
     
     # Calculate the position of the caret and the selection start.
     pos_x = x + @font.text_width(self.text[0...self.caret_pos])
@@ -37,19 +45,19 @@ class TextField < Gosu::TextInput
     
     # Draw the selection background, if any; if not, sel_x and pos_x will be
     # the same value, making this quad empty.
-    @window.draw_quad(sel_x, y,          SELECTION_COLOR,
-                      pos_x, y,          SELECTION_COLOR,
-                      sel_x, y + height, SELECTION_COLOR,
-                      pos_x, y + height, SELECTION_COLOR, 50)
+    WadsConfig.instance.get_window.draw_quad(sel_x, y,          SELECTION_COLOR,
+                                             pos_x, y,          SELECTION_COLOR,
+                                             sel_x, y + height, SELECTION_COLOR,
+                                             pos_x, y + height, SELECTION_COLOR, @base_z + 10)
 
     # Draw the caret; again, only if this is the currently selected field.
-    if @window.text_input == self then
-      @window.draw_line(pos_x, y,          CARET_COLOR,
-                        pos_x, y + height, CARET_COLOR, 50)
+    if WadsConfig.instance.get_window.text_input == self then
+      WadsConfig.instance.get_window.draw_line(pos_x, y,          CARET_COLOR,
+                                               pos_x, y + height, CARET_COLOR, @base_z + 10)
     end
 
     # Finally, draw the text itself!
-    @font.draw_text(self.text, x, y, 50)
+    @font.draw_text(self.text, x, y, @base_z + 10)
   end
 
   # This text field grows with the text that's being entered.
@@ -71,6 +79,10 @@ class TextField < Gosu::TextInput
     mouse_x > x - PADDING and mouse_x < x + width + PADDING and
       mouse_y > y - PADDING and mouse_y < y + height + PADDING
   end
+
+  def contains_click(mouse_x, mouse_y)
+    under_point?(mouse_x, mouse_y)
+  end
   
   # Tries to move the caret to the position specifies by mouse_x
   def move_caret(mouse_x)
@@ -84,4 +96,43 @@ class TextField < Gosu::TextInput
     # Default case: user must have clicked the right edge
     self.caret_pos = self.selection_start = self.text.length
   end
+
+  def button_down(id, mouse_x, mouse_y)
+    if id == Gosu::MsLeft
+      move_caret(mouse_x)
+    else 
+      if @old_value == self.text
+        # nothing to do
+      else 
+        @old_value = self.text
+        return WidgetResult.new(false, EVENT_TEXT_INPUT, [self.text])
+      end
+    end
+  end 
+
+  def button_up(id, mouse_x, mouse_y)
+    # empty base implementation
+  end 
+
+  def update(update_count, mouse_x, mouse_y)
+    # empty base implementation
+  end
+
+  def handle_mouse_down mouse_x, mouse_y
+    # empty base implementation
+  end
+
+  def handle_mouse_up mouse_x, mouse_y
+      # empty base implementation
+  end
+
+  def handle_key_press id, mouse_x, mouse_y
+      # empty base implementation
+  end
+
+  def handle_update update_count, mouse_x, mouse_y
+      # empty base implementation
+  end
 end
+
+end # end wads module

data/lib/wads/version.rb

@@ -1,3 +1,3 @@
 module Wads
-    VERSION = "0.1.1"
+    VERSION = "0.2.1"
 end