green_shoes 0.207.0 → 0.214.0

data/VERSION

@@ -1 +1 @@
-0.207.0
+0.214.0

data/lib/shoes/app.rb

@@ -29,7 +29,7 @@ class Shoes
     end
 
     attr_accessor :cslot, :cmask, :top_slot, :contents, :canvas, :app, :mccs, :mrcs, :mmcs, 
-      :mhcs, :mlcs, :shcs, :mcs, :win, :swin, :width_pre, :height_pre, :order, :dics
+      :mhcs, :mlcs, :shcs, :mcs, :win, :swin, :width_pre, :height_pre, :order, :dics, :fronts, :backs
     attr_writer :mouse_button, :mouse_pos
     attr_reader :link_style, :linkhover_style, :animates, :owner, :textcursors
 
@@ -82,7 +82,7 @@ class Shoes
       args[:links] = make_link_index(msg) unless args[:links]
 
       if !(args[:left].zero? and args[:top].zero?) and (args[:width].zero? or args[:height].zero?)
-        args[:nocontrol], args[:width], args[:height] = true, self.width, self.height
+        args[:nocontrol], args[:add_mlcs], args[:width], args[:height] = true, true, self.width, self.height
         layout_control = false
       else
         layout_control = true

data/lib/shoes/basic.rb

@@ -27,6 +27,8 @@ class Shoes
       @args = args
       @hovered = false
       @hidden ? (@hided, @shows = true, false) : (@hided, @shows = false, true)
+      @app.fronts.push self if @front
+      @app.backs.push self if @back
     end
 
     attr_reader :args, :shows, :initials
@@ -85,7 +87,8 @@ class Shoes
           @app.cslot.contents.delete self
           remove
           @real = nil
-        else @real.clear
+        else 
+          @real.clear  if @real
       end
     end
 
@@ -158,7 +161,8 @@ class Shoes
   class TextBlock < Basic
     def initialize args
       super
-      @app.mlcs << self  unless @real
+      @app.mlcs << self  if !@real or @add_mlcs
+      @add_mlcs = false
     end
 
     def text
@@ -166,6 +170,7 @@ class Shoes
     end
     
     def text= s
+      @args[:add_mlcs] = false
       style markup: s  if !@hided or @args[:hidden]
     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 = 
-        [], [], [], [], [], [], [], [], [], [], [], {}, {}
+      @contents, @mccs, @mrcs, @mmcs, @mhcs, @mlcs, @shcs, @mcs, @order, @dics, @animates, @radio_groups, @textcursors, @fronts, @backs = 
+        [], [], [], [], [], [], [], [], [], [], [], {}, {}, [], []
       @cmask = nil
       @mouse_button, @mouse_pos = 0, [0, 0]
       @fill, @stroke = black, black
@@ -161,7 +161,9 @@ class Shoes
   end
 
   def self.repaint_all_by_order app
-    app.order.each do |e|
+    tmp = app.order
+    (app.fronts + app.backs).each{|e| tmp.delete e}
+    (app.backs + tmp + app.fronts).each do |e|
       if e.real and !e.is_a?(Pattern) and !e.hided
         app.canvas.remove e.real
         app.canvas.put e.real, e.left, e.top
@@ -251,7 +253,7 @@ class Shoes
     end
     
     app.mlcs.each do |tb|
-      return false if tb.hided
+      next if tb.hided
       tb.text = tb.text unless tb.real
       tb.real.window.cursor = ARROW if tb.real.window
       if ret = mouse_on_link(tb, app)

data/lib/shoes/ruby.rb

@@ -98,7 +98,7 @@ class Object
   end
 
   def to_s
-    super.gsub('<', '[').gsub('>', ']')
+    super.gsub '<', '&lt;'
   end
 
   def get_win

data/lib/shoes/slot.rb

@@ -76,7 +76,7 @@ class Shoes
     
     def clear &blk
       @contents.each &:clear
-      contents.each{|e| @app.mlcs.delete e}
+      @contents.each{|e| @app.mlcs.delete e; @app.mhcs.delete e}
       if blk
         args = {}
         initials.keys.each{|k| args[k] = instance_variable_get "@#{k}"}

data/static/manual-en.txt

@@ -229,8 +229,6 @@ These instance variables will all end up inside the App object.
  end
 }}}
 
-''Note: para method displays self with [ and ] in Green Shoes.''
-
 ==== Block Redirection ====
 
 The `stack` block is a different story, though.  It doesn't change `self` and
@@ -1168,6 +1166,22 @@ will start without asking the user.
 
 '''Note:''' Green Shoes doesn't support ''video''.
 
+=== :back » true or false ===
+
+For: ''shapes, image, textblocks''.
+
+Comes to the back of the other elements.
+
+{{{
+ Shoes.app do
+   rect 100, 100, 100, 100, fill: green
+   rect 120, 120, 100, 100, fill: yellow
+   para 'hello', left: 150, top: 150, front: true
+   oval 150, 150, 100, 100, fill: red
+   oval 180, 180, 100, 100, fill: gray, back: true
+ end
+}}}
+
 === :bottom » a number ===
 
 For: ''all slots and elements''.
@@ -1308,6 +1322,12 @@ number (size in points) or optionally followed by the unit modifier "px" for
 absolute size. Any one of the options may be absent. If FAMILY-LIST is absent,
 then the default font family (Arial) will be used.
 
+=== :front » true or false ===
+
+For: ''shapes, image, textblocks''.
+
+Comes to the front of the other elements.
+
 === :group » a string ===
 
 For: ''radio''.

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 207
+  - 214
   - 0
-  version: 0.207.0
+  version: 0.214.0
 platform: ruby
 authors: 
 - ashbb
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 +09:00
+date: 2011-04-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency