green_shoes 1.1.348 → 1.1.354

data/VERSION

@@ -1 +1 @@
-1.1.348
+1.1.354

data/lib/ext/chipmunk.rb

@@ -1,4 +1,8 @@
-require_relative 'chipmunk/chipmunk'
+begin
+  require 'chipmunk'
+rescue LoadError 
+  require_relative 'chipmunk/chipmunk'
+end
 
 module ChipMunk
   def cp_space

data/lib/plugins/video.rb

@@ -105,6 +105,7 @@ class Shoes
       require 'win32api'
       v = Gst::ElementFactory.make 'playbin2'
       v.video_sink = Gst::ElementFactory.make('dshowvideosink')
+      v.video_sink = Gst::ElementFactory.make('directdrawsink') unless v.video_sink
       v.uri = uri
       args[:real], args[:app] = v, self
       Video.new args

data/lib/shoes/app.rb

@@ -31,7 +31,7 @@ class Shoes
     attr_accessor :cslot, :cmask, :top_slot, :contents, :canvas, :app, :mccs, :mrcs, :mmcs, 
       :mhcs, :mlcs, :shcs, :mcs, :win, :swin, :width_pre, :height_pre, :order, :dics, :fronts, :backs, :focusables, :focus_ele
     attr_writer :mouse_button, :mouse_pos
-    attr_reader :link_style, :linkhover_style, :animates, :owner, :textcursors, :textmarkers, :location
+    attr_reader :link_style, :linkhover_style, :animates, :owner, :textcursors, :textmarkers, :location, :pinning_elements
 
     def visit url
       if url =~ /^(http|https):\/\//
@@ -178,7 +178,7 @@ class Shoes
         d = download name, save: tmpname
         img = Gtk::Image.new File.join(DIR, '../static/downloading.png')
         downloading = true
-      elsif name =~ /\.(png|jpg|gif)$/
+      elsif name =~ /\.(png|jpg|gif|PNG|JPG|GIF)$/
         img = Gtk::Image.new name
         downloading = false
       else
@@ -634,7 +634,7 @@ class Shoes
     end
 
     def rgb r, g, b, l=1.0
-      (r < 1 and g < 1 and b < 1) ? [r, g, b, l] : [r/255.0, g/255.0, b/255.0, l]
+      (r <= 1 and g <= 1 and b <= 1) ? [r, g, b, l] : [r/255.0, g/255.0, b/255.0, l]
     end
 
     %w[fill stroke strokewidth].each do |name|
@@ -690,7 +690,7 @@ class Shoes
     end
 
     def background pat, args={}
-      pat = eval(pat) if pat.is_a?(String) and !((File.extname(pat).downcase) =~ /\.[png|jpg|gif]/)
+      pat = eval(pat) if pat.is_a?(String) and !((File.extname(pat).downcase) =~ /\.[png|jpg|gif|PNG|JPG|GIF]/)
       args[:pattern] = pat
       args = basic_attributes args
 
@@ -772,6 +772,24 @@ class Shoes
       @swin.vscrollbar.value = n
     end
 
+    def scrolled?
+      @_scroll_top ||= 0
+      d = scroll_top - @_scroll_top
+      @_scroll_top = scroll_top
+      d.zero? ? false : d
+    end
+
+    def scrolled=(n)
+      @_scroll_top = n
+    end
+
+    def pinning *eles
+      eles.each do |ele|
+        ele.is_a?(Basic) ? (@pinning_elements << ele) : ele.contents.each{|e| (@pinning_elements << e) if e.is_a? Basic}
+      end
+      @pinning_elements.uniq!
+    end
+
     def gutter
       @swin.vscrollbar.size_request.first
     end

data/lib/shoes/helper_methods.rb

@@ -36,8 +36,8 @@ class Shoes
   
   module Mod2
     def init_app_vars
-      @contents, @mccs, @mrcs, @mmcs, @mhcs, @mlcs, @shcs, @mcs, @order, @dics, @animates, @radio_groups, @textcursors, @textmarkers, @fronts, @backs, @focusables = 
-        [], [], [], [], [], [], [], [], [], [], [], {}, {}, {}, [], [], []
+      @contents, @mccs, @mrcs, @mmcs, @mhcs, @mlcs, @shcs, @mcs, @order, @dics, @animates, @radio_groups, @textcursors, @textmarkers, @fronts, @backs, @focusables, @pinning_elements = 
+        [], [], [], [], [], [], [], [], [], [], [], {}, {}, {}, [], [], [], []
       @cmask, @focus_ele, @location = nil, nil, '/'
       @mouse_button, @mouse_pos = 0, [0, 0]
       @fill, @stroke = black, black
@@ -400,7 +400,7 @@ class Shoes
     app.dics.each do |e, d, tmpname|
       args = e.args
       if d.finished?
-	flag = true
+        flag = true
         app.canvas.remove e.real
         img = Gtk::Image.new tmpname
         e.full_width, e.full_height = img.size_request
@@ -417,4 +417,10 @@ class Shoes
     end
     flag
   end
+
+  def self.pinning_control app
+    if d = app.scrolled?
+      app.pinning_elements.each{|e| e.move e.left, e.top + d}
+    end
+  end
 end

data/lib/shoes/main.rb

@@ -96,6 +96,7 @@ class Shoes
           app.width_pre, app.height_pre = app.width, app.height
         end
         show_hide_control app
+        pinning_control app
         set_cursor_type app
       end
       true

data/lib/shoes/style.rb

@@ -21,6 +21,7 @@ class Shoes
 
   class ShapeBase
     def style args
+      args.each{|k, v| send("#{k}=", v) if self.class.method_defined? "#{k}="}
       real.clear
       @args[:nocontrol] = @args[:noorder] = true
       m = self.class.to_s.downcase[7..-1]

data/lib/shoes/text.rb

@@ -10,7 +10,7 @@ class Shoes
       define_method m do |*str|
         color = str.pop
         str = str.join
-        rgb = color[0, 3].map{|e| (e*255.0).to_i}.map{|i| sprintf("%#02X", i)[-2,2]}.join
+        rgb = color[0, 3].map{|e| (e*255.0).to_i}.map{|i| sprintf("%02X", i)[-2,2]}.join
         "<span #{tag}='##{rgb}'>#{str}</span>"
       end
     end

data/samples/sample36.rb

@@ -24,6 +24,7 @@ class Book < Shoes
 
   def incident num
     self.scroll_top = 0
+    self.scrolled = 0
     num = num.to_i
     stack  margin_left: 190 do
       banner "Incident"
@@ -32,7 +33,7 @@ class Book < Shoes
 
     flow do
       flow width: 180, margin_left: 10 do
-        para *table_of_contents, size: 8
+        pinning para( *table_of_contents, size: 8 )
       end
 
       stack width: -180, margin_left: 10 do

data/samples/sample58.rb

@@ -1,10 +1,10 @@
 require 'green_shoes'
 
-Shoes.app width: 300, height: 100, title: 'Teeny-weeny MP3 player' do
+Shoes.app width: 300, height: 100, title: 'Teeny-weeny Audio player' do
   space = ' '
   background gold..cyan, angle: 30
-  song = para 'song.mp3', stroke: firebrick, left: 0, top: 70
-  file = 'https://github.com/ashbb/teeny-weeny_mp3_player/raw/master/samples/song.mp3'
+  song = para 'song.ogg', stroke: firebrick, left: 0, top: 70
+  file = 'http://www.rin-shun.com/shoes/song.ogg'
   v = video file
 
   para link('select'){

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: green_shoes
 version: !ruby/object:Gem::Version
-  version: 1.1.348
+  version: 1.1.354
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-23 00:00:00.000000000 Z
+date: 2012-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
-  requirement: &14175360 !ruby/object:Gem::Requirement
+  requirement: &17359116 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14175360
+  version_requirements: *17359116
 description: Green Shoes is one of colorful Shoes, written in pure Ruby with Ruby/GTK2.
 email: ashbbb@gmail.com
 executables: