fidgit 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Fidgit changelog
 ================
 
+v0.2.1
+------
+
+* Added: Click in ScrollBar gutter to scroll window by height/width of view window.
+* Added: Click and drag to select text in enabled TextArea.
+* Fixed: Color changes on disabling buttons.
+
 v0.2.0
 ------
 

data/config/default_schema.yml

@@ -117,7 +117,7 @@
     :icon_position: :left
 
     :disabled:
-      :color: ?light_gray
+      :color: ?gray
 
   :List:
     :background_color: ?light_gray

data/examples/text_area_example.rb

@@ -6,7 +6,7 @@ class ExampleState < Fidgit::GuiState
 
     Gosu.register_entity(:entity, Gosu::Image["head_icon.png"])
 
-    string = "<c=3333ff>Hello, my name</c> is <c=ff0000>Brian</c> the&entity;&entity;snail<c=00ff00>!\nHi\nHello!</c>"
+    string = "<c=3333ff>Hello, my name</c> is <c=ff0000>Brian</c> the&entity;&entity;snail!"
     horizontal do
       vertical do
         label 'disabled'

data/lib/fidgit/elements/button.rb

@@ -82,17 +82,15 @@ module Fidgit
 
     protected
     def update_colors
-      @background_color = if @mouse_over and enabled?
-        default(:hover, :background_color)
-      else
-        default(:background_color)
+      [:color, :background_color, :border_color].each do |attribute|
+        send :"#{attribute.to_s}=", enabled? ? default(attribute) : default(:disabled, attribute)
       end
 
-      self.color = if enabled?
-        default(:color)
-      else
-        default(:disabled, :color)
-      end
+      self.background_color = if @mouse_over and enabled?
+                                default(:hover, :background_color)
+                              else
+                                default(:background_color)
+                              end
 
       @icon.enabled = enabled? if @icon
 

data/lib/fidgit/elements/scroll_bar.rb

@@ -47,6 +47,10 @@ module Fidgit
       @handle_container = Container.new(parent: self, width: options[:width], height: options[:height]) do
         @handle = Handle.new(parent: self, x: x, y: y, background_color: options[:handle_color])
       end
+
+      subscribe :left_mouse_button do |sender, x, y|
+        clicked_to_move x, y
+      end
     end
   end
 
@@ -81,6 +85,11 @@ module Fidgit
     def handle_dragged_to(x, y)
       @owner.offset_x = @owner.content_width * ((x - self.x) / width.to_f)
     end
+
+    def clicked_to_move(x, y)
+      new_x = x < @handle.x ? @handle.x - @handle.width : @handle.x + @handle.width
+      handle_dragged_to new_x, @handle.y
+    end
   end
 
   class VerticalScrollBar < ScrollBar
@@ -110,5 +119,10 @@ module Fidgit
     def handle_dragged_to(x, y)
       @owner.offset_y = @owner.content_height * ((y - self.y) / height.to_f)
     end
+
+    def clicked_to_move(x, y)
+      new_y = y < @handle.y ? @handle.y - @handle.height : @handle.y + @handle.height
+      handle_dragged_to @handle.x, new_y
+    end
   end
 end

data/lib/fidgit/elements/scroll_window.rb

@@ -2,8 +2,7 @@
 
 module Fidgit
   class ScrollWindow < Composite
-	  def content; @view.content; end
-	
+    def content; @view.content; end
     def offset_x; @view.offset_x; end
     def offset_x=(value); @view.offset_x = value; end
     def offset_y; @view.offset_y; end
@@ -13,9 +12,8 @@ module Fidgit
     def view_height; @view.height; end
     def content_width; @view.content.width; end
     def content_height; @view.content.height; end
-	
-	def width=(value); super(value); end
-	def height=(value); super(value); end
+    def width=(value); super(value); end
+    def height=(value); super(value); end
 
     def initialize(options = {})
       options = {

data/lib/fidgit/elements/text_area.rb

@@ -19,10 +19,16 @@ module Fidgit
     # @return [String] Text, but stripped of tags.
     attr_reader :stripped_text
 
+    event :begin_drag
+    event :update_drag
+    event :end_drag
+
     event :changed
     event :focus
     event :blur
 
+    def drag?(button); button == :left; end
+
     # Is the area editable? This will always be false if the Element is disabled.
     def editable?
       enabled? and @editable
@@ -161,6 +167,21 @@ module Fidgit
 
       subscribe :left_mouse_button, method(:click_in_text)
       subscribe :right_mouse_button, method(:click_in_text)
+
+      # Handle dragging.
+      subscribe :begin_drag do |sender, x, y|
+        # Store position of the handle when it starts to drag.
+        @drag_start_pos = [x - self.x, y - self.y]
+      end
+
+      subscribe :update_drag do |sender, x, y|
+        index = text_index_at_position(x, y)
+        self.caret_position = [index, @stripped_text.length].min if index
+      end
+
+      subscribe :end_drag do
+        @drag_start_pos = nil
+      end
     end
 
     # @return [nil]
@@ -168,14 +189,8 @@ module Fidgit
       publish :focus unless focused?
 
       # Move caret to position the user clicks on.
-      mouse_x, mouse_y = x - (self.x + padding_left), y - (self.y + padding_top)
-      @char_widths.each_with_index do |width, i|
-        char_x, char_y = @caret_positions[i]
-        if mouse_x.between?(char_x, char_x + width) and mouse_y.between?(char_y, char_y + font.height)
-          self.caret_position = @text_input.selection_start = i
-          break
-        end
-      end
+      index = text_index_at_position x, y
+      self.caret_position = @text_input.selection_start = [index, @stripped_text.length].min if index
 
       nil
     end
@@ -246,6 +261,21 @@ module Fidgit
       end
     end
 
+    protected
+    # Index of character in reference to the displayable text.
+    def text_index_at_position(x, y)
+      # Move caret to position the user clicks on.
+      mouse_x, mouse_y = x - (self.x + padding_left), y - (self.y + padding_top)
+      @char_widths.each.with_index do |width, i|
+        char_x, char_y = @caret_positions[i]
+        if mouse_x.between?(char_x, char_x + width) and mouse_y.between?(char_y, char_y + font.height)
+          return i
+        end
+      end
+
+      nil # Didn't find a character at that position.
+    end
+
     # y position of the
     protected
     def y_at_line(lines_number)

data/lib/fidgit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fidgit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &24620268 !ruby/object:Gem::Requirement
+  requirement: &28344852 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.41
   type: :runtime
   prerelease: false
-  version_requirements: *24620268
+  version_requirements: *28344852
 - !ruby/object:Gem::Dependency
   name: chingu
-  requirement: &24619380 !ruby/object:Gem::Requirement
+  requirement: &28344576 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9rc7
   type: :runtime
   prerelease: false
-  version_requirements: *24619380
+  version_requirements: *28344576
 - !ruby/object:Gem::Dependency
   name: clipboard
-  requirement: &22646484 !ruby/object:Gem::Requirement
+  requirement: &28344300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.9
   type: :runtime
   prerelease: false
-  version_requirements: *22646484
+  version_requirements: *28344300
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &22644636 !ruby/object:Gem::Requirement
+  requirement: &28344024 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *22644636
+  version_requirements: *28344024
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22640532 !ruby/object:Gem::Requirement
+  requirement: &28343748 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *22640532
+  version_requirements: *28343748
 - !ruby/object:Gem::Dependency
   name: texplay
-  requirement: &22639572 !ruby/object:Gem::Requirement
+  requirement: &28343472 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *22639572
+  version_requirements: *28343472
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &22638696 !ruby/object:Gem::Requirement
+  requirement: &28343244 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22638696
+  version_requirements: *28343244
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &22654308 !ruby/object:Gem::Requirement
+  requirement: &28342968 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22654308
+  version_requirements: *28342968
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &22653528 !ruby/object:Gem::Requirement
+  requirement: &28342668 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 4.2.9
   type: :development
   prerelease: false
-  version_requirements: *22653528
+  version_requirements: *28342668
 description: Fidgit is a GUI library built on Gosu/Chingu
 email:
 - bil.bagpuss@gmail.com