glimmer-dsl-swt 4.21.2.2 → 4.22.0.0

data/docs/reference/GLIMMER_SAMPLES.md

@@ -5,6 +5,7 @@
     - [Hello, Label!](#hello-label)
     - [Hello, Text!](#hello-text)
     - [Hello, Composite!](#hello-composite)
+    - [Hello, Scrolled Composite!](#hello-scrolled-composite)
     - [Hello, Layout!](#hello-layout)
     - [Hello, Shell!](#hello-shell)
     - [Hello, Tab!](#hello-tab)
@@ -178,6 +179,18 @@ Code:
 
 ![Hello Composite](/images/glimmer-hello-composite.png)
 
+#### Hello, Scrolled Composite!
+
+This sample demonstrates the `scrolled_composite` widget, which is used to add scrollbars around content that exceeds the size of the window.
+
+Code:
+
+[samples/hello/hello_scrolled_composite.rb](/samples/hello/hello_scrolled_composite.rb)
+
+![Hello Scrolled Composite](/images/glimmer-hello-scrolled-composite.png)
+
+![Hello Scrolled Composite](/images/glimmer-hello-scrolled-composite-scrolled.png)
+
 #### Hello, Layout!
 
 This sample demonstrates the standard 3 layouts in SWT (though one can write their own for very advanced applications): `fill_layout`, `row_layout`, and `grid_layout`

data/lib/glimmer/data_binding/widget_binding.rb

@@ -49,7 +49,7 @@ module Glimmer
       def call(value)
         SWT::DisplayProxy.instance.auto_exec(override_sync_exec: @sync_exec, override_async_exec: @async_exec) do
           if @widget.respond_to?(:disposed?) && @widget.disposed?
-            deregister_all_observables
+            deregister_all_observables unless @widget.shell_proxy.last_shell_closing?
             return
           end
           # need the rescue false for a scenario with tree items not being equal to model objects raising an exception
@@ -61,7 +61,7 @@ module Glimmer
       
       def evaluate_property
         if @widget.respond_to?(:disposed?) && @widget.disposed?
-          deregister_all_observables
+          deregister_all_observables unless @widget.shell_proxy.last_shell_closing?
           return
         end
         @widget.get_attribute(@property)

data/lib/glimmer/dsl/swt/data_binding_expression.rb

@@ -33,7 +33,7 @@ module Glimmer
       # of a ModelBinding, which is then connected to an anonymous widget observer
       # (aka widget_data_binder as per widget_data_binders array)
       #
-      # Depends on BindCommandHandler
+      # Depends on BindExpression
       class DataBindingExpression < Expression
         def can_interpret?(parent, keyword, *args, &block)
           args.size == 1 and

data/lib/glimmer/dsl/swt/sync_call_expression.rb

@@ -0,0 +1,38 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/swt/exec_expression'
+
+module Glimmer
+  module DSL
+    module SWT
+      # Synchronously executes code block against the SWT Event Loop
+      # to manipulate SWT UI objects on the UI thread safely with
+      # immediate priority when needed.
+      #
+      # Returns the value produced by evaluating the expression.
+      class SyncCallExpression < StaticExpression
+        include ExecExpression
+      end
+    end
+  end
+end

data/lib/glimmer/rake_task/package.rb

@@ -25,6 +25,8 @@ require 'os'
 module Glimmer
   module RakeTask
     module Package
+      JDK_VERSION = '17.0.1'
+      
       class << self
         attr_accessor :jpackage_extra_args
         
@@ -90,10 +92,10 @@ module Glimmer
         def native(native_type=nil, native_extra_args)
           puts "Generating native executable with jpackage..."
           java_version = `jruby -v`
-          if java_version.include?('16.0.2')
-            puts "Java Version 16.0.2 Detected!"
+          if java_version.include?(JDK_VERSION)
+            puts "Java Version #{JDK_VERSION} Detected!"
           else
-            puts "WARNING! Glimmer Packaging Pre-Requisite Java Version 16.0.2 Is Not Found!"
+            puts "WARNING! Glimmer Packaging Pre-Requisite Java Version #{JDK_VERSION} Is Not Found!"
           end
           require 'facets/string/titlecase'
           require 'facets/string/underscore'

data/lib/glimmer/swt/custom/drawable.rb

@@ -109,8 +109,10 @@ module Glimmer
         end
         
         def deregister_shape_painting
-          @paint_listener_proxy&.deregister
-          @resize_listener_proxy&.deregister
+          unless shell_proxy.last_shell_closing?
+            @paint_listener_proxy&.deregister
+            @resize_listener_proxy&.deregister
+          end
         end
         
         def setup_shape_painting

data/lib/glimmer/swt/shell_proxy.rb

@@ -88,7 +88,7 @@ module Glimmer
           end
           on_widget_disposed do
             @last_shell_closing = true if @display.shells.count == 1 && @display.shells.first == @swt_widget
-            clear_shapes
+            clear_shapes unless @last_shell_closing
           end
           @display ||= @swt_widget.getDisplay
         end

data/lib/glimmer/swt/widget_proxy.rb

@@ -175,8 +175,10 @@ module Glimmer
           @keyword = underscored_widget_name.to_s
           if respond_to?(:on_widget_disposed)
             on_widget_disposed {
-              clear_shapes
-              deregister_shape_painting
+              unless shell_proxy.last_shell_closing?
+                clear_shapes
+                deregister_shape_painting
+              end
             }
           end
         end
@@ -199,7 +201,11 @@ module Glimmer
       end
       
       def shell_proxy
-        @swt_widget.shell.get_data('proxy')
+        if @swt_widget.respond_to?(:shell)
+          @swt_widget.shell.get_data('proxy')
+        else
+          @parent_proxy&.shell_proxy
+        end
       end
       
       def extract_args(underscored_widget_name, args)

data/lib/glimmer/ui/custom_widget.rb

@@ -188,8 +188,10 @@ module Glimmer
         auto_exec { execute_hook('after_body') }
         auto_exec do
           @dispose_listener_registration = @body_root.on_widget_disposed do
-            observer_registrations.compact.each(&:deregister)
-            observer_registrations.clear
+            unless @body_root.shell_proxy.last_shell_closing?
+              observer_registrations.compact.each(&:deregister)
+              observer_registrations.clear
+            end
           end
         end
         post_add_content if content.nil?

data/samples/elaborate/battleship/view/cell.rb

@@ -54,10 +54,18 @@ class Battleship
           
           rectangle(0, 0, [:max, -1], [:max, -1])
           oval(:default, :default, 10, 10) {
-            foreground <= [model, :hit, on_read: ->(h) {h == nil ? COLOR_EMPTY : (h ? COLOR_HIT : COLOR_NO_HIT)}]
+            if model.nil?
+              foreground COLOR_EMPTY
+            else
+              foreground <= [model, :hit, on_read: ->(h) {h == nil ? COLOR_EMPTY : (h ? COLOR_HIT : COLOR_NO_HIT)}]
+            end
           }
           oval(:default, :default, 5, 5) {
-            background <= [model, :hit, on_read: ->(h) {h == nil ? COLOR_EMPTY : (h ? COLOR_HIT : COLOR_NO_HIT)}]
+            if model.nil?
+              background COLOR_EMPTY
+            else
+              background <= [model, :hit, on_read: ->(h) {h == nil ? COLOR_EMPTY : (h ? COLOR_HIT : COLOR_NO_HIT)}]
+            end
           }
           
           on_mouse_move do |event|

data/samples/hello/hello_drag_and_drop.rb

@@ -196,7 +196,7 @@ shell {
       }
       
       label {
-        text 'Drop To Insert'
+        text 'Drop To Replace'
       }
       
       spinner {

data/samples/hello/hello_scrolled_composite.rb

@@ -0,0 +1,95 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer-dsl-swt'
+
+include Glimmer
+
+shell {
+  grid_layout {
+    margin_width 0
+    margin_height 0
+  }
+  
+  text 'Hello, Scrolled Composite!'
+  maximum_size 400, 400
+  
+  composite {
+    layout_data {
+      horizontal_alignment :center
+    }
+    
+    row_layout
+    
+    button {
+      text '<<'
+      
+      on_widget_selected do
+        @scrolled_composite.set_origin(0, @scrolled_composite.origin.y)
+      end
+    }
+    
+    button {
+      text '>>'
+      
+      on_widget_selected do
+        @scrolled_composite.set_origin(@inner_composite.size.x, @scrolled_composite.origin.y)
+      end
+    }
+    
+    button {
+      text '^^'
+      
+      on_widget_selected do
+        @scrolled_composite.set_origin(@scrolled_composite.origin.x, 0)
+      end
+    }
+    
+    button {
+      text 'vv'
+      
+      on_widget_selected do
+        @scrolled_composite.set_origin(@scrolled_composite.origin.x, @inner_composite.size.y)
+      end
+    }
+  }
+
+  @scrolled_composite = scrolled_composite {
+    layout_data :fill, :fill, true, true
+    
+    @inner_composite = composite {
+      row_layout(:vertical)
+      
+      background :white
+
+      50.times do |n|
+        label {
+          layout_data {
+            height 20
+          }
+          
+          text "Line #{n+1} has a lot of gibberish in it. In fact, it has so much gibberish that it does not fit the window horizontally, so scrollbars must be used to see all the text."
+          background :white
+        }
+      end
+    }
+  }
+}.open

data/samples/hello/hello_world.rb

@@ -25,6 +25,7 @@ include Glimmer
 
 shell {
   text 'Glimmer'
+
   label {
     text 'Hello, World!'
   }

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.21.2.2
+  version: 4.22.0.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2021-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.4
   name: glimmer
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -466,6 +466,7 @@ files:
 - lib/glimmer/dsl/swt/shell_expression.rb
 - lib/glimmer/dsl/swt/shine_data_binding_expression.rb
 - lib/glimmer/dsl/swt/swt_expression.rb
+- lib/glimmer/dsl/swt/sync_call_expression.rb
 - lib/glimmer/dsl/swt/sync_exec_expression.rb
 - lib/glimmer/dsl/swt/tab_item_expression.rb
 - lib/glimmer/dsl/swt/table_items_data_binding_expression.rb
@@ -667,6 +668,7 @@ files:
 - samples/hello/hello_radio_group.rb
 - samples/hello/hello_sash_form.rb
 - samples/hello/hello_scale.rb
+- samples/hello/hello_scrolled_composite.rb
 - samples/hello/hello_shape.rb
 - samples/hello/hello_shell.rb
 - samples/hello/hello_slider.rb
@@ -709,7 +711,7 @@ post_install_message:
 
   You are ready to use `glimmer` and `girb` commands on Windows and Linux.
 
-  On the Mac, run `glimmer-setup` command to complete setup of Glimmer DSL for SWT, making `glimmer` and `girb` commands ready for use:
+  On the Mac, run `glimmer-setup` command to complete setup of Glimmer DSL for SWT (it will configure a Mac required jruby option globally `-J-XstartOnFirstThread` so that you do not have to add manually), making `glimmer` and `girb` commands ready for use:
 
   glimmer-setup