shoes-swt 4.0.0.pre11 → 4.0.0.pre12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c09977e2aa7d8d84bfc7a5c71fc8aaa3ec8c31f88616266febf0e0d9684139f1
-  data.tar.gz: 816a6a60e7d9a29314c2dcc532cfba105d674ff2d0c282defd2c8ef32123f527
+  metadata.gz: 24d59ab2c243194cd08ec8910dc1ac800cf8d4557c7126338e71bed355cecfe6
+  data.tar.gz: 35019496beedf4815a237efb971a9ea0dc128b3155f8378bf6f3680735cdb8d7
 SHA512:
-  metadata.gz: da4721c20e3aaadf9a866435e8230ea1a57eb2849d8990975c3be081c251164a5e4772cd091bc1dba2e50982603a9dd0114dd4edffca112c1c35b3fa74dde0f9
-  data.tar.gz: a686968991a518351c2ef7b51a8e87ddf3c703e98db5f6df553fb9da451ede1b9541eb04582f43195bfde6d96bd60f290f81eb8a2fa376a455c5acfd7938140c
+  metadata.gz: 86ee6a318228b84e51eea1ad73e5c0dbcc40e938f4c42e002a32f5c2e2fc2ae3699fa11226b92069bfdd9dc8d5e5182d60203a9801a39f3a3646b5439ee10032
+  data.tar.gz: a41f3c499268d5d8d35ad26a60cd3bdf3f419c082ca1724302e1a9e42701a93ae03a1505a249a5ad8b110de8f47b5a94d23c846b33cb2e10e0490cb5fffdf370

data/lib/shoes/swt.rb

@@ -59,6 +59,7 @@ class Shoes
       require 'shoes/swt/common/clickable'
       require 'shoes/swt/common/container'
       require 'shoes/swt/common/fill'
+      require 'shoes/swt/common/focus'
       require 'shoes/swt/common/image_handling'
       require 'shoes/swt/common/resource'
       require 'shoes/swt/common/painter'

data/lib/shoes/swt/app.rb

@@ -68,7 +68,7 @@ EOS
         @started = true
         self.fullscreen = true if dsl.start_as_fullscreen?
         flush
-        ::Swt.event_loop { ::Shoes::Swt.main_app.disposed? } if main_app?
+        ::Swt.event_loop { ::Shoes::Swt.apps.all?(&:disposed?) } if main_app?
       end
 
       def quit
@@ -231,14 +231,22 @@ EOS
         @shell.setSize(new_width, new_height)
       end
 
-      def main_window_on_close
+      def on_close
         lambda do |_event|
-          ::Swt.display.dispose
-          ::Shoes::Swt::App.mark_main_app_closed
-          Dir[File.join(Dir.tmpdir, "__shoes4_*.png")].each { |f| File.delete f }
+          # Only do final cleanup if this is the last open window around
+          if finished?
+            ::Swt.display.dispose
+            ::Shoes::Swt::App.mark_main_app_closed
+            Dir[File.join(Dir.tmpdir, "__shoes4_*.png")].each { |f| File.delete f }
+          end
         end
       end
 
+      def finished?
+        # When closing we're done if we're the last undisposed window around
+        ::Shoes::Swt.apps.reject(&:disposed?) == [self]
+      end
+
       def main_window_style
         style  = ::Swt::SWT::CLOSE | ::Swt::SWT::MIN | ::Swt::SWT::V_SCROLL
         style |= ::Swt::SWT::RESIZE | ::Swt::SWT::MAX if @dsl.opts[:resizable]
@@ -282,7 +290,7 @@ EOS
 
       def attach_shell_event_listeners
         @shell.addControlListener ShellControlListener.new(self)
-        @shell.addListener(::Swt::SWT::Close, main_window_on_close) if main_app?
+        @shell.addListener(::Swt::SWT::Close, on_close)
         @shell.addListener(::Swt::SWT::Close, unregister_app)
       end
 

data/lib/shoes/swt/common/focus.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+class Shoes
+  module Swt
+    module Common
+      module Focus
+        def focus
+          @real.set_focus
+        end
+      end
+    end
+  end
+end

data/lib/shoes/swt/input_box.rb

@@ -3,6 +3,7 @@ class Shoes
   module Swt
     # Class is used by edit_box and edit_line
     class InputBox
+      include Common::Focus
       include Common::Remove
       include Common::PainterUpdatesPosition
       include Common::Visibility

data/lib/shoes/swt/list_box.rb

@@ -2,6 +2,7 @@
 class Shoes
   module Swt
     class ListBox
+      include Common::Focus
       include Common::Remove
       include Common::Visibility
       include Common::UpdatePosition

data/lib/shoes/swt/packager.rb

@@ -32,7 +32,7 @@ class Shoes
 
       def run(path)
         if @packages.empty?
-          puts "You must select at least one packaging format.\n\n#{::Shoes::UI::CLI::PackageCommand.help}"
+          puts "You must select at least one packaging format.\n\n#{::Shoes::UI::CLI::PackageCommand.new.help}"
           return
         end
 

data/lib/shoes/swt/redrawing_aspect.rb

@@ -35,8 +35,9 @@ class Shoes
                                                        :mouse_left],
                            ::Shoes::TextBlock      => [:replace] }.freeze
 
-      CHANGED_POSITION = { ::Shoes::Common::Positioning => [:_position, :displace],
-                           ::Shoes::Common::Hover       => [:eval_hover_block] }.freeze
+      CHANGED_POSITION = { ::Shoes::DimensionsDelegations => [:adjust_current_position],
+                           ::Shoes::Common::Positioning   => [:_position, :displace],
+                           ::Shoes::Common::Hover         => [:eval_hover_block] }.freeze
 
       attr_reader :app
 

data/lib/shoes/swt/slot.rb

@@ -49,5 +49,6 @@ class Shoes
 
     class Flow < Slot; end
     class Stack < Slot; end
+    class Widget < Slot; end
   end
 end

data/lib/shoes/swt/swt_button.rb

@@ -2,6 +2,7 @@
 class Shoes
   module Swt
     class SwtButton
+      include Common::Focus
       include Common::Remove
       include Common::Visibility
       include Common::UpdatePosition
@@ -25,10 +26,6 @@ class Shoes
         blk.call @dsl
       end
 
-      def focus
-        @real.set_focus
-      end
-
       def click(blk)
         remove_listeners
         @real.addSelectionListener { eval_block blk }

data/lib/shoes/swt/version.rb

@@ -2,6 +2,6 @@
 
 class Shoes
   module Swt
-    VERSION = "4.0.0.pre11"
+    VERSION = "4.0.0.pre12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoes-swt
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre11
+  version: 4.0.0.pre12
 platform: ruby
 authors:
 - Team Shoes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre11
+        version: 4.0.0.pre12
   name: shoes-core
   prerelease: false
   type: :runtime
@@ -51,13 +51,13 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre11
+        version: 4.0.0.pre12
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre11
+        version: 4.0.0.pre12
   name: shoes-package
   prerelease: false
   type: :runtime
@@ -65,7 +65,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre11
+        version: 4.0.0.pre12
 description: A JRuby and Swt backend for Shoes, the best little GUI toolkit for Ruby.
   Shoes makes building for Mac, Windows, and Linux super simple.
 email:
@@ -96,6 +96,7 @@ files:
 - lib/shoes/swt/common/clickable.rb
 - lib/shoes/swt/common/container.rb
 - lib/shoes/swt/common/fill.rb
+- lib/shoes/swt/common/focus.rb
 - lib/shoes/swt/common/image_handling.rb
 - lib/shoes/swt/common/painter.rb
 - lib/shoes/swt/common/painter_updates_position.rb
@@ -178,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: A JRuby and Swt backend for Shoes, the best little GUI toolkit for Ruby.