green_shoes 1.0.322 → 1.0.331

data/VERSION

@@ -1 +1 @@
-1.0.322
+1.0.331

data/lib/shoes/app.rb

@@ -93,7 +93,7 @@ class Shoes
       layout.style = @canvas.style
 
       app.canvas = layout
-      app.top_slot = slot.new app.slot_attributes(app: app, left: args[:left], top: args[:top], width: args[:width], height: args[:height])
+      app.top_slot = slot.new app.slot_attributes(app: app, left: args[:left], top: args[:top], width: args[:width], height: args[:height], swin: swin)
 
       app.instance_eval &blk
 
@@ -259,14 +259,16 @@ class Shoes
       end
     end
 
-    def edit_line args={}
+    def edit_line *attrs
+      args = attrs.last.class == Hash ? attrs.pop : {}
+      txt = attrs.first unless attrs.empty?
       args = basic_attributes args
       args[:width] = 200 if args[:width].zero?
       args[:height] = 28 if args[:height].zero?
       (change_proc = args[:change]; args.delete :change) if args[:change]
       el = Gtk::Entry.new
       el.visibility = false if args[:secret]
-      el.text = args[:text].to_s
+      el.text = txt || args[:text].to_s
       el.set_size_request args[:width], args[:height]
       @canvas.put el, args[:left], args[:top]
       el.show_now
@@ -279,14 +281,16 @@ class Shoes
       end
     end
 
-    def edit_box args={}
+    def edit_box *attrs
+      args = attrs.last.class == Hash ? attrs.pop : {}
+      txt = attrs.first unless attrs.empty?
       args = basic_attributes args
       args[:width] = 200 if args[:width].zero?
       args[:height] = 108 if args[:height].zero?
       (change_proc = args[:change]; args.delete :change) if args[:change]
       tv = Gtk::TextView.new
       tv.wrap_mode = Gtk::TextTag::WRAP_WORD
-      tv.buffer.text = args[:text].to_s
+      tv.buffer.text = txt || args[:text].to_s
       tv.modify_font(Pango::FontDescription.new(args[:font])) if args[:font]
       tv.accepts_tab = args[:accepts_tab]
       args.delete :accepts_tab
@@ -767,6 +771,10 @@ class Shoes
       @swin.vscrollbar.value = n
     end
 
+    def gutter
+      @swin.vscrollbar.size_request.first
+    end
+
     def clipboard
       Gtk::Clipboard.get(Gdk::Selection::CLIPBOARD).wait_for_text
     end

data/lib/shoes/basic.rb

@@ -31,12 +31,13 @@ class Shoes
       [:app, :real].each{|k| args.delete k}
       @args = args
       @hovered = false
+      @cleared = 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
+    attr_reader :args, :shows, :initials, :cleared
     attr_accessor :parent, :hided
 
     def move x, y
@@ -85,14 +86,16 @@ class Shoes
       self
     end
 
-    def clear
+    def clear flag = true
       @app.delete_mouse_events self
+      @cleared = true if flag
       case self
         when Button, EditLine, EditBox, ListBox
           @app.cslot.contents.delete self
+          @app.focusables.delete self
           remove
           @real = nil
-        else 
+        else
           @real.clear if @real
       end
     end

data/lib/shoes/helper_methods.rb

@@ -166,6 +166,7 @@ class Shoes
     slot_height = 0
 
     slot.contents.each do |ele|
+      next if ele.is_a?(Basic) && ele.cleared
       if ele.is_a? ShapeBase
         ele.hide if slot.masked
         next
@@ -178,7 +179,7 @@ class Shoes
       max, flag = ele.positioning x, y, max
       x, y = ele.left + ele.width, ele.top + ele.height
       unless max == tmp
-        slot_height = flag ? [slot_height, y].max : slot_height + max.height
+        slot_height = flag && !slot_height.zero? ? y : slot_height + max.height
       end
     end
     slot_height
@@ -187,6 +188,7 @@ class Shoes
   def self.repaint_all slot
     return if slot.masked
     slot.contents.each do |ele|
+      next if ele.is_a?(Basic) && ele.cleared
       next if ele.is_a? ShapeBase
       ele.is_a?(Basic) ? ele.move2(ele.left + ele.margin_left, ele.top + ele.margin_top) : repaint_all(ele)
     end
@@ -222,7 +224,7 @@ class Shoes
     repaint_textcursors app
     app.canvas.set_size 0, scrollable_height unless(app.prjct or app.trvw)
     n = app.focus_ele ? app.focusables.index(app.focus_ele) : 0
-    app.canvas.focus_chain = (app.focusables[n..-1] + app.focusables[0...n]).map(&:real) if n
+    app.canvas.focus_chain = (app.focusables[n..-1] + app.focusables[0...n]).map(&:real) if n and !app.canvas.is_a?(Gtk::DrawingArea)
     true
   end
 
@@ -394,9 +396,11 @@ class Shoes
   end
 
   def self.download_images_control app
+    flag = false
     app.dics.each do |e, d, tmpname|
       args = e.args
       if d.finished?
+	flag = true
         app.canvas.remove e.real
         img = Gtk::Image.new tmpname
         e.full_width, e.full_height = img.size_request
@@ -411,5 +415,6 @@ class Shoes
         File.delete tmpname
       end
     end
+    flag
   end
 end

data/lib/shoes/main.rb

@@ -87,8 +87,8 @@ class Shoes
 
     Gtk.timeout_add 100 do
       unless app.win.destroyed?
-        download_images_control app
-        if size_allocated? app
+        downloaded = download_images_control app
+        if size_allocated?(app) or downloaded
           call_back_procs app
           app.width_pre, app.height_pre = app.width, app.height
         end

data/lib/shoes/ruby.rb

@@ -151,8 +151,10 @@ class Array
     r + g + b > 0xAA * 3
   end
 
+  alias :_clear :clear
   def clear
-    self.each &:clear
+    self.each{|e| e.clear if e.class.method_defined? :clear}
+    _clear
   end
 
   def clear_all

data/lib/shoes/slot.rb

@@ -51,9 +51,9 @@ class Shoes
     end
 
     def positioning x, y, max
-      @width = (parent.width * @initials[:width]).to_i if @initials[:width].is_a? Float
-      @width = (parent.width + @initials[:width]) if @initials[:width] < 0
-      @width -= (margin_left + margin_right)
+      w = (parent.width * @initials[:width]).to_i if @initials[:width].is_a? Float
+      w = (parent.width + @initials[:width]) if @initials[:width] < 0
+      @width = w - (margin_left + margin_right) if w
       if parent.is_a?(Flow) and x + @width <= parent.left + parent.width
         move3 x + parent.margin_left, max.top + parent.margin_top
         @height = Shoes.contents_alignment self

data/lib/shoes/style.rb

@@ -47,7 +47,7 @@ class Shoes
       args[:font] ||= @args[:font]
       args[:align] ||= @args[:align]
       
-      clear if @real
+      clear false if @real
       @width = (@left + parent.width <= @app.width) ? parent.width : @app.width - @left
       @width = initials[:width] unless initials[:width].zero?
       @height = 20 if @height.zero?

data/samples/sample30.rb

@@ -6,7 +6,7 @@ class Answer < Shoes::Widget
   attr_reader :mark
   def initialize word
     flow do
-      flow(width: 70){para word}
+      para word, width: 70
       @mark = image('./loogink.png', width: 20, height: 20).hide
     end
   end

data/static/manual-en.txt

@@ -2582,7 +2582,7 @@ numbers.
 
 === gutter() » a number ===
 
-The size of the scrollbar area.  When Shoes needs to show a scrollbar, the
+The size of the scrollbar area.  When Green Shoes needs to show a scrollbar, the
 scrollbar may end up covering up some elements that touch the edge of the
 window.  The `gutter` tells you how many pixels to expect the scrollbar to
 cover.
@@ -2590,18 +2590,14 @@ cover.
 This is commonly used to pad elements on the right, like so:
 
 {{{
- #!ruby
- # Not yet available
  Shoes.app do
-   stack :margin_right => 20 + gutter do
+   stack margin_right: 20 + gutter do
      para "Insert fat and ratified ",
        "declaration of independence here..."
    end
  end
 }}}
 
-'''Note:''' Green Shoes doesn't support `gutter` method.
-
 === height() » a number ===
 
 The vertical size of the viewable slot in pixels.  So, if this is a scrolling

data/static/manual-ja.txt

@@ -2506,25 +2506,21 @@ topとleftの座標から差し引くには、負数を利用してください
 
 === gutter() » a number ===
 
-スクロールバーエリアの大きさです。Shoesがスクロールバーを表示する必要があるとき、
+スクロールバーエリアの大きさです。Green Shoesがスクロールバーを表示する必要があるとき、
 スクロールバーがウィンドウの端にふれているいくつかの要素を隠してしまうかもしれません。
 `gutter`はどのくらいのピクセルをスクロールバーが隠すことを期待するかを教えます。
 
 これは一般的には、次のように右側に詰め物の要素として利用します：
 
 {{{
- #!ruby
- # Not yet available
  Shoes.app do
-   stack :margin_right => 20 + gutter do
+   stack margin_right: 20 + gutter do
      para "Insert fat and ratified ",
        "declaration of independence here..."
    end
  end
 }}}
 
-'''注意:''' Green Shoesは`gutter`メソッドをサポートしていません。
-
 === height() » a number ===
 
 スロットの目に見えるピクセルでの垂直の大きさです。そして、スクロールするスロットの場合は、

metadata

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