fidgit 0.2.2 → 0.2.3

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Fidgit changelog
 ================
 
+v0.2.3
+------
+
+* Exposed #handle accessor for Slider.
+* Made Slider accept being disabled.
+* Made Slider handle show tip.
+
 v0.2.2
 ------
 

data/examples/slider_example.rb

@@ -7,7 +7,7 @@ class ExampleState < Fidgit::GuiState
     vertical do
       horizontal do
         # Discrete values (0..100)
-        slider = slider(width: 100, range: 0..5, value: 3) do |sender, value|
+        slider = slider(width: 100, range: 0..5, value: 3, tip: "Discrete value is") do |sender, value|
           @discrete_label.text = "Discrete slider is at #{value}"
         end
 
@@ -17,12 +17,16 @@ class ExampleState < Fidgit::GuiState
       horizontal do
         # Continuous values (0.0..1.0)
 
-        slider = slider(width: 100, range: 0.0..100.0, value: 77.2) do |sender, value|
+        slider = slider(width: 100, range: 0.0..100.0, value: 77.2, tip: "Continuous value is") do |sender, value|
           @continuous_label.text = "Continuous slider is at #{"%.03f" % value}%"
         end
 
         @continuous_label = label "Continuous slider is at #{"%.03f" % slider.value}%"
       end
+
+      horizontal do
+        slider(width: 100, range: 0.0..100.0, value: 77.2, tip: "Disabled slider value is", enabled: false)
+      end
     end
   end
 end

data/lib/fidgit/elements/button.rb

@@ -34,7 +34,7 @@ module Fidgit
 
     def text=(value)
       if @shortcut
-        super value.sub(/#{@shortcut}/i) {|char| "<c=#{@shortcut_color.to_hex}>#{char}</c>" }
+        super value.sub(/#{Regexp.escape @shortcut}/i) {|char| "<c=#{@shortcut_color.to_hex}>#{char}</c>" }
       else
         super value
       end

data/lib/fidgit/elements/element.rb

@@ -46,6 +46,7 @@ module Fidgit
                 :align_h, :align_v, :parent, :border_thickness, :font
 
     attr_accessor :background_color
+    attr_writer :tip
 
     def x; rect.x; end
     def x=(value); rect.x = value; end

data/lib/fidgit/elements/slider.rb

@@ -27,18 +27,24 @@ module Fidgit
         end
 
         subscribe :update_drag do |sender, x, y|
-          parent.handle_dragged_to x - @drag_start_pos[0], y - @drag_start_pos[1]
+          if parent.enabled?
+            parent.handle_dragged_to x - @drag_start_pos[0], y - @drag_start_pos[1]
+          else
+            publish :end_drag
+          end
         end
 
         subscribe :end_drag do
           @drag_start_pos = nil
         end
       end
+
+      def tip; parent.tip; end
     end
 
     event :changed
 
-    attr_reader :value, :range
+    attr_reader :value, :range, :handle
 
     # @param (see Composite#initialize)
     #
@@ -59,7 +65,7 @@ module Fidgit
       @range = options[:range].dup
       @groove_color = options[:groove_color].dup
       @groove_thickness = options[:groove_thickness]
-      @continuous = @range.min.is_a?(Float) or @range.max.is_a?(Float)
+      @continuous = @range.min.is_a?(Float) || @range.max.is_a?(Float)
 
       super(options)
 

data/lib/fidgit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fidgit
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &23198904 !ruby/object:Gem::Requirement
+  requirement: &26611200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.41
   type: :runtime
   prerelease: false
-  version_requirements: *23198904
+  version_requirements: *26611200
 - !ruby/object:Gem::Dependency
   name: chingu
-  requirement: &23198004 !ruby/object:Gem::Requirement
+  requirement: &26610852 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9rc7
   type: :runtime
   prerelease: false
-  version_requirements: *23198004
+  version_requirements: *26610852
 - !ruby/object:Gem::Dependency
   name: clipboard
-  requirement: &23197164 !ruby/object:Gem::Requirement
+  requirement: &26610312 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.9
   type: :runtime
   prerelease: false
-  version_requirements: *23197164
+  version_requirements: *26610312
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &23196276 !ruby/object:Gem::Requirement
+  requirement: &26609496 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *23196276
+  version_requirements: *26609496
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23195712 !ruby/object:Gem::Requirement
+  requirement: &26609052 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *23195712
+  version_requirements: *26609052
 - !ruby/object:Gem::Dependency
   name: texplay
-  requirement: &23195148 !ruby/object:Gem::Requirement
+  requirement: &26608656 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *23195148
+  version_requirements: *26608656
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &23194884 !ruby/object:Gem::Requirement
+  requirement: &26608308 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23194884
+  version_requirements: *26608308
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &23194524 !ruby/object:Gem::Requirement
+  requirement: &26607852 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23194524
+  version_requirements: *26607852
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &23193828 !ruby/object:Gem::Requirement
+  requirement: &26607420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 4.2.9
   type: :development
   prerelease: false
-  version_requirements: *23193828
+  version_requirements: *26607420
 description: Fidgit is a GUI library built on Gosu/Chingu
 email:
 - bil.bagpuss@gmail.com