green_shoes 1.0.331 → 1.0.337

data/VERSION

@@ -1 +1 @@
-1.0.331
+1.0.337

data/lib/green_shoes.rb

@@ -32,6 +32,7 @@ module Shoes
     strikethrough: :strikethrough, strikecolor: :strikethrough_color, underline: :underline, undercolor: :underline_color}
   WRAP = {word: Pango::WRAP_WORD, char: Pango::WRAP_CHAR, trim: Pango::ELLIPSIZE_END}
   FONT_SIZE = {"xx-small" => 0.57, "x-small" => 0.64, "small" => 0.83, "medium" => 1.0, "large" => 1.2, "x-large" => 1.43, "xx-large" => 1.73}
+  COLORS = {}
 end
 
 class Object

data/lib/shoes/app.rb

@@ -458,7 +458,7 @@ class Shoes
       if pat = (args[:fill] or fill)
         gp = gradient pat, args[:width], args[:height], args[:angle]
         context.set_source gp
-        context.rounded_rectangle mx, -my, args[:width], args[:height], args[:curve]
+        context.rounded_rectangle sw/2.0+mx, sw/2.0-my, args[:width]-sw, args[:height]-sw, args[:curve]
         context.fill
       end
       
@@ -690,6 +690,7 @@ class Shoes
     end
 
     def background pat, args={}
+      pat = eval(pat) if pat.is_a? String
       args[:pattern] = pat
       args = basic_attributes args
 
@@ -785,9 +786,7 @@ class Shoes
 
     def close
       win.destroy
-      Gtk.main_quit
       Shoes.APPS.delete app
-      exit if Shoes.APPS.empty?
     end
 
     def window args={}, &blk

data/lib/shoes/basic.rb

@@ -153,9 +153,9 @@ class Shoes
     def path=(name)
       @path = name
       @real.clear
-      args = {width: @width, height: @height}
+      args = {width: @width, height: @height, noorder: true}
       args.merge!({hidden: true}) if @hided
-      @real = @app.image(name, args).move(@left, @top).real
+      @real = @app.image(name, args).move(@left, @top).real.tap{@app.flush}
     end
 
     def rotate angle

data/lib/shoes/colors.rb

@@ -145,6 +145,5 @@ class Shoes
   App.class_eval do
     colors.each{|color| define_method(color[0]){[color[1]/255.0, color[2]/255.0, color[3]/255.0]}}
   end
-  App::COLORS = {}
-  colors.each{|c, r, g, b| App::COLORS[c] = [r, g, b]}
+  colors.each{|c, r, g, b| COLORS[c] = [r, g, b]}
 end

data/lib/shoes/help.rb

@@ -463,7 +463,7 @@ class Manual < Shoes
   PNUMS = mk_page_numbers DOCS
   PEND = PNUMS.length
   TOC, TOC_LIST = [], []
-  COLORS = Shoes::App::COLORS
+  COLORS = Shoes::COLORS
 end
 
 Shoes.app title: 'The Green Shoes Manual', width: 720, height: 640

data/lib/shoes/main.rb

@@ -1,5 +1,4 @@
 class Shoes
-  @apps = []
   $urls = {}
   APPS = []
 
@@ -16,7 +15,7 @@ class Shoes
     [:projector, :treeview].each{|x| args.delete x}
 
     app = App.new args
-    @apps.push app
+    @main_app ||= app
 
     app.top_slot = Flow.new app.slot_attributes(app: app, left: 0, top: 0)
 
@@ -40,8 +39,12 @@ class Shoes
     end
 
     win.signal_connect "destroy" do
-      app.close
-    end if @apps.size == 1
+      if @main_app == app
+        APPS.length > 1 ? (APPS.delete app; @main_app = APPS.first) : exit
+      else
+        APPS.delete app
+      end
+    end
 
     win.signal_connect "button_press_event" do |w, e|
       app.mouse_button = e.button
@@ -72,7 +75,7 @@ class Shoes
     swin = Gtk::ScrolledWindow.new
     swin.set_policy Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC 
     swin.vadjustment.step_increment = 10  
-    swin.add app.canvas
+    projector ? swin.add_with_viewport(app.canvas) : swin.add(app.canvas) 
     win.add swin
     app.canvas.style = style
     app.win, app.swin = win, swin
@@ -101,8 +104,8 @@ class Shoes
     call_back_procs app
     
     win.show_all
-    @apps.pop
-    Gtk.main if @apps.empty?
+
+    Gtk.main if @main_app == app
     app
   end
 end

data/lib/shoes/ruby.rb

@@ -104,7 +104,7 @@ class Object
   end
 
   def exit
-    Shoes.APPS.length.times {|i| timer(0.01*i){Gtk.main_quit}}
+    Gtk.main_quit
     File.delete Shoes::TMP_PNG_FILE if File.exist? Shoes::TMP_PNG_FILE
   end
 

data/samples/sample41.rb

@@ -2,7 +2,8 @@ require '../lib/green_shoes'
 
 Shoes.app do
   button 'open 3D Projector' do
-    Shoes.app projector: './akatsukiface.png', title: 'JAXA Venus Probe, Akatsuki (PLANET-C)'
+    Shoes.app projector: File.join(DIR, '../samples/akatsukiface.png'), 
+      title: 'JAXA Venus Probe, Akatsuki (PLANET-C)'
   end
 end
 

metadata

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