glimmer-dsl-swt 4.20.4.3 → 4.20.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13212fd4b8a440d635d5172b493b979d12a1ec1da94e7ea50c5c55521e4ae80c
-  data.tar.gz: d7c3004d04d20b0c14e8f6f72ac4be6368844e0ecb892962c021414291e3a0d8
+  metadata.gz: 4d7ca988f6d990ae7520a2b6319c538a793f7499a23713e97ce02f32e3db2bec
+  data.tar.gz: a50dfa303380c6415d6a286f351a55931a4b1e09d73d7cc3e4602b52a00c179d
 SHA512:
-  metadata.gz: 6420272e89fe681bd64d68b4db5dc25ac19a52efd20e00e3a72b840ead51dcb3755396bd1b9e72a6e36b96719348c609c275e2827805809e7ecefdc00727d327
-  data.tar.gz: 40b0acce99bf96c49f5499034271faf126c40b5e8870ff62c9b22bf8f6501448cd7256cf583c30d2928e06572ee02862cae1445feac71427b29ef7d829a09f6c
+  metadata.gz: a8739fded7624fc8a007850dfa84fabeba144ffd3830fb83284e6abd733be75d8500da1be339d4827f30e14d702a4472f271198d90101d30573696f6a6dfdb14
+  data.tar.gz: c95d53ca9b574ec413b1630c2b415deb2fa3e65a091bc3d5d40b391b3c6083db5e74158c3f9d3572523682c4a02e75afee465ffef2e83f96cbc3bbc7e671698a

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+### 4.20.6.0
+
+- Canvas Animation DSL: support parallel animations per canvas (running along canvas static shapes too)
+
+### 4.20.5.2
+
+- Identify trimmed Canvas Shape DSL attribute `fill_rule` styles without `fill_` prefix
+- Identify trimmed Canvas Shape DSL attribute `line_cap` styles without `cap_` prefix
+- Identify trimmed Canvas Shape DSL attribute `line_join` styles without `join_` prefix
+
+### 4.20.5.1
+
+- Fix issue with Namespace is required always showing up when buildling a custom widget gem or custom shape gem
+
+### 4.20.5.0
+
+- Relax glimmer-dsl-swt version number when scaffolding custom shape/widget/shell gems. Keep it strict for app development.
+- Explicit support for `tray_item` keyword as nested under `shell`, having `menu` nested under `tray_item`, automating everything relating to using SWT TrayItem (no need to work with the Display System Tray or Menu objects manually).
+- Hello, Tray Item! Sample
+
 ### 4.20.4.2
 
 - Hello, Label!

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.20.4.3
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.20.6.0
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
@@ -15,7 +15,7 @@
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.4.3 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.6.0 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
 
 **Starting in version 4.20.0.0, [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) comes with the new [***Shine***](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#shine) syntax** for highly intuitive and visually expressive View/Model Attribute Mapping, relying on `<=>` for bidirectional (two-way) data-binding and `<=` for unidirectional (one-way) data-binding, providing an alternative to the `bind` keyword (keep in mind that it is still a beta, so default back to `bind` whenever needed).
 
@@ -347,7 +347,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.4.3
+jgem install glimmer-dsl-swt -v 4.20.6.0
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -375,7 +375,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 4.20.4.3'
+gem 'glimmer-dsl-swt', '~> 4.20.6.0'
 ```
 
 And, then run:
@@ -396,7 +396,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.4.3
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.6.0
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/VERSION

@@ -1 +1 @@
-4.20.4.3
+4.20.6.0

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -18,6 +18,7 @@ This guide should help you get started with Glimmer DSL for SWT. For more advanc
       - [sync_exec](#sync_exec)
       - [timer_exec](#timer_exec)
     - [Menus](#menus)
+    - [Tray Item](#tray-item)
     - [ScrolledComposite](#scrolledcomposite)
     - [Sash Form Widget](#sash-form-widget)
     - [Browser Widget](#browser-widget)
@@ -872,6 +873,101 @@ shell {
 }.open
 ```
 
+#### Tray Item
+
+![Hello Tray Item Icon](/images/glimmer-hello-tray-item.png)
+
+The system tray allows showing icons for various apps that need to stay on for extended periods of time and provide quick access.
+
+In Glimmer DSL for SWT, generating tray items is automated via the `tray_item` keyword, which can be nested under `shell` and then have a child `menu` underneath that pops up when the user clicks on its icon in the system tray.
+
+Note how the shell was declared with the `:on_top` style (in addition to the default, which is `:shell_trim`) to ensure it opens above all apps when the "Show Application" menu item is selected.
+
+Example code:
+
+```ruby
+    shell(:shell_trim, :on_top) { # make it always appear on top of everything
+      row_layout(:vertical) {
+        center true
+      }
+      text 'Hello, Tray Item!'
+      
+      on_shell_closed do |event|
+        # do not perform event that closes app when shell is closed
+        event.doit = false
+        # body_root is the root shell
+        body_root.hide
+        self.show_application = false # updates Show Application checkbox menu item indirectly
+      end
+      
+      tray_item {
+        tool_tip_text 'Glimmer'
+        image @image # could use an image path instead
+
+        menu {
+          menu_item {
+            text 'About'
+
+            on_widget_selected do
+              message_box {
+                text 'Glimmer - About'
+                message 'This is a Glimmer DSL for SWT Tray Item'
+              }.open
+            end
+          }
+          menu_item(:separator)
+          menu_item(:check) {
+            text 'Show Application'
+            selection <=> [self, :show_application]
+            
+            on_widget_selected do
+              # body_root is the root shell
+              if body_root.visible?
+                body_root.hide
+              else
+                body_root.show
+              end
+            end
+          }
+          menu_item(:separator)
+          menu_item {
+            text 'Exit'
+
+            on_widget_selected {
+              exit(0)
+            }
+          }
+        }
+        
+        # supported tray item listeners (you can try to add actions to them when needed)
+#         on_swt_Show {
+#         }
+#
+#         on_swt_Hide {
+#         }
+#
+#         on_widget_selected {
+#         }
+#
+#         on_menu_detected {
+#         }
+      }
+      
+      label(:center) {
+        text 'This is the application'
+        font height: 30
+      }
+      label {
+        text 'Click on the tray item (circles icon) to open its menu'
+      }
+      label {
+        text 'Uncheck Show Application to hide the app and recheck it to show the app'
+      }
+    }
+```
+
+Learn more at [Hello, Tray Item!](/docs/reference/GLIMMER_SAMPLES.md#hello-tray-item)
+
 #### ScrolledComposite
 
 Glimmer provides smart defaults for the `scrolled_composite` widget by:
@@ -2147,13 +2243,13 @@ Learn more at the [Hello, Canvas Transform! Sample](GLIMMER_SAMPLES.md#hello-can
 
 (note: this is a very new feature of Glimmer. It may change a bit while getting battle tested. As always, you could default to basic SWT usage if needed.)
 
-Glimmer additionally provides built-in support for animations via a declarative Animation DSL, another sub-DSL of the Glimmer GUI DSL.
+Glimmer provides built-in support for animations via a declarative Animation DSL, another sub-DSL of the Glimmer GUI DSL.
 
-Animations take advantage of multi-threading, automatically running each animation in its own independent thread of execution while updating the GUI asynchronously.
+Animations take advantage of multi-threading, with Glimmer DSL for SWT automatically running each animation in its own independent thread of execution while updating the GUI asynchronously.
 
-Multiple simultaneous animations are supported by declaring an animation per `canvas` (or widget) parent.
+Multiple simultaneous animations are supported per `canvas` (or widget) parent (they do not compete or starve each other).
 
-`canvas` has the `:double_buffered` SWT style by default to ensure flicker-free rendering. If you need to disable it for whatever reason, just pass the `:none` SWT style instead (e.g. `canvas(:none)`)
+`canvas` has the `:double_buffered` SWT style by default on platforms other than the Mac to ensure flicker-free rendering (Mac does not need it). If you need to disable it for whatever reason, just pass the `:none` SWT style instead (e.g. `canvas(:none)`)
 
 This example says it all (it moves a tiny red square across a blue background) (you may copy/paste in [`girb`](GLIMMER_GIRB.md)):
 

data/docs/reference/GLIMMER_SAMPLES.md

@@ -52,6 +52,7 @@
     - [Hello, Custom Shape!](#hello-custom-shape)
     - [Hello, Tool Bar!](#hello-tool-bar)
     - [Hello, Cool Bar!](#hello-cool-bar)
+    - [Hello, Tray Item!](#hello-tray-item)
   - [Elaborate Samples](#elaborate-samples)
     - [User Profile](#user-profile)
     - [Login](#login)
@@ -942,6 +943,26 @@ Hello, Cool Bar!
 
 ![Hello Cool Bar Reorg3](/images/glimmer-hello-cool-bar-reorg3.png)
 
+#### Hello, Tray Item!
+
+This sample demonstrates the use of `tray_item`, which enables hiding an app (sending to background) and showing again on top of all other apps. It can also show an About Message Box and exit completely if needed.
+
+Code:
+
+[samples/hello/hello_tray_item.rb](/samples/hello/hello_tray_item.rb)
+
+Hello, Tray Item Icon!
+
+![Hello Tray Item Icon](/images/glimmer-hello-tray-item.png)
+
+Hello, Tray Item Icon App!
+
+![Hello Tray Item App](/images/glimmer-hello-tray-item-app.png)
+
+Hello, Tray Item Icon About Message Box!
+
+![Hello Tray Item Åbout](/images/glimmer-hello-tray-item-about.png)
+
 ### Elaborate Samples
 
 For more elaborate samples, check the following:

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

@@ -0,0 +1,43 @@
+# 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/parent_expression'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/tray_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      class TrayExpression < StaticExpression
+        include ParentExpression
+        
+        def can_interpret?(parent, keyword, *args, &block)
+          super && parent.is_a?(Glimmer::SWT::DisplayProxy) && args.empty?
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::TrayProxy.instance
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+# 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/parent_expression'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/tray_proxy'
+require 'glimmer/swt/tray_item_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      class TrayItemExpression < StaticExpression
+        include ParentExpression
+        
+        include_package 'org.eclipse.swt.widgets'
+      
+        def can_interpret?(parent, keyword, *args, &block)
+          super and
+            parent.swt_widget.is_a?(Shell) and
+            args.empty?
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::TrayItemProxy.new(parent, *args)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/rake_task/scaffold.rb

@@ -106,15 +106,23 @@ module Glimmer
           /vendor/jars/
         MULTI_LINE_STRING
     
-        GEMFILE = <<~MULTI_LINE_STRING
+        GEMFILE_PREFIX = <<~MULTI_LINE_STRING
           # frozen_string_literal: true
           
           source 'https://rubygems.org'
           
           git_source(:github) {|repo_name| "https://github.com/\#{repo_name}" }
-          
+        MULTI_LINE_STRING
+        GEMFILE_APP_MIDFIX = <<~MULTI_LINE_STRING
+        
           gem 'glimmer-dsl-swt', '~> #{VERSION}'
-          
+        MULTI_LINE_STRING
+        GEMFILE_GEM_MIDFIX = <<~MULTI_LINE_STRING
+        
+          gem 'glimmer-dsl-swt', '~> #{VERSION.split('.')[0...2].join('.')}'
+        MULTI_LINE_STRING
+        GEMFILE_SUFFIX = <<~MULTI_LINE_STRING
+        
           group :development do
             gem 'rspec', '~> 3.5.0'
             gem 'juwelier', '2.4.9'
@@ -122,6 +130,8 @@ module Glimmer
             gem 'simplecov', '>= 0'
           end
         MULTI_LINE_STRING
+        APP_GEMFILE = GEMFILE_PREFIX + GEMFILE_APP_MIDFIX + GEMFILE_SUFFIX
+        GEM_GEMFILE = GEMFILE_PREFIX + GEMFILE_GEM_MIDFIX + GEMFILE_SUFFIX
     
         def app(app_name)
           common_app(app_name)
@@ -250,7 +260,7 @@ module Glimmer
           write '.ruby-version', RUBY_VERSION
           write '.ruby-gemset', gem_name
           write 'VERSION', '1.0.0'
-          write 'Gemfile', GEMFILE
+          write 'Gemfile', GEM_GEMFILE
           write 'Rakefile', gem_rakefile(custom_shell_name, namespace, gem_name)
           append "lib/#{gem_name}.rb", gem_main_file(custom_shell_name, namespace)
           custom_shell(custom_shell_name, namespace, :gem)
@@ -302,13 +312,13 @@ module Glimmer
         end
     
         def custom_widget_gem(custom_widget_name, namespace)
-          return puts('Namespace is required! Usage: glimmer scaffold:custom_widget_gem[custom_widget_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
           gem_name = "glimmer-cw-#{compact_name(custom_widget_name)}"
           gem_summary = "#{human_name(custom_widget_name)} - Glimmer Custom Widget"
           if namespace
             gem_name += "-#{compact_name(namespace)}"
             gem_summary += " (#{human_name(namespace)})"
           else
+            return puts('Namespace is required! Usage: glimmer scaffold:custom_widget_gem[custom_widget_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
             namespace = 'glimmer'
           end
           
@@ -321,7 +331,7 @@ module Glimmer
           write '.ruby-version', RUBY_VERSION
           write '.ruby-gemset', gem_name
           write 'VERSION', '1.0.0'
-          write 'Gemfile', GEMFILE
+          write 'Gemfile', GEM_GEMFILE
           write 'Rakefile', gem_rakefile
           append "lib/#{gem_name}.rb", gem_main_file(custom_widget_name, namespace)
           custom_widget(custom_widget_name, namespace)
@@ -340,13 +350,13 @@ module Glimmer
         end
     
         def custom_shape_gem(custom_shape_name, namespace)
-          return puts('Namespace is required! Usage: glimmer scaffold:custom_shape_gem[custom_shape_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
           gem_name = "glimmer-cp-#{compact_name(custom_shape_name)}"
           gem_summary = "#{human_name(custom_shape_name)} - Glimmer Custom Shape"
           if namespace
             gem_name += "-#{compact_name(namespace)}"
             gem_summary += " (#{human_name(namespace)})"
           else
+            return puts('Namespace is required! Usage: glimmer scaffold:custom_shape_gem[custom_shape_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
             namespace = 'glimmer'
           end
           
@@ -359,7 +369,7 @@ module Glimmer
           write '.ruby-version', RUBY_VERSION
           write '.ruby-gemset', gem_name
           write 'VERSION', '1.0.0'
-          write 'Gemfile', GEMFILE
+          write 'Gemfile', GEM_GEMFILE
           write 'Rakefile', gem_rakefile
           append "lib/#{gem_name}.rb", gem_main_file(custom_shape_name, namespace)
           custom_shape(custom_shape_name, namespace)
@@ -418,7 +428,7 @@ module Glimmer
         
         def gemfile(shell_type)
           if shell_type == :desktopify
-            lines = GEMFILE.split("\n")
+            lines = APP_GEMFILE.split("\n")
             require_glimmer_dsl_swt_index = lines.index(lines.detect {|l| l.include?("gem 'glimmer-dsl-swt'") })
             lines[(require_glimmer_dsl_swt_index + 1)..(require_glimmer_dsl_swt_index + 1)] = [
               "",
@@ -428,7 +438,7 @@ module Glimmer
             ]
             lines.join("\n")
           else
-            GEMFILE
+            APP_GEMFILE
           end
         end
     

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

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/swt/properties'
+require 'glimmer/swt/custom/shape'
 
 module Glimmer
   module SWT
@@ -222,8 +223,12 @@ module Glimmer
           self.class.schedule_frame_animation(self) do
             if started? && start_number == @start_number && within_duration_limit?
               unless @parent.isDisposed
-                @parent.clear_shapes # TODO adjust this to clear only the shapes of this animation (not all shapes) to allow simultaneous animations to occur on the same parent
-                @parent.content { frame_block.call(*block_args) }
+                @shapes.to_a.each(&:dispose)
+                parent_shapes_before = @parent.shapes.clone
+                @parent.content {
+                  frame_block.call(*block_args)
+                }
+                @shapes = @parent.shapes - parent_shapes_before
               end
             else
               if stopped? && @frame_index > current_frame_index

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

@@ -295,6 +295,15 @@ module Glimmer
             if method_name.to_s == 'setLineStyle'
               args[0] = "line_#{args[0]}" if !args[0].to_s.downcase.start_with?('line_')
             end
+            if method_name.to_s == 'setFillRule'
+              args[0] = "fill_#{args[0]}" if !args[0].to_s.downcase.start_with?('fill_')
+            end
+            if method_name.to_s == 'setLineCap'
+              args[0] = "cap_#{args[0]}" if !args[0].to_s.downcase.start_with?('cap_')
+            end
+            if method_name.to_s == 'setLineJoin'
+              args[0] = "join_#{args[0]}" if !args[0].to_s.downcase.start_with?('join_')
+            end
             if the_java_method.parameter_types.first == Java::int.java_class
               args[0] = SWTProxy.constant(args[0])
             end

data/lib/glimmer/swt/menu_proxy.rb

@@ -63,6 +63,9 @@ module Glimmer
           @swt_menu_item.setMenu(swt_widget)
         elsif parent.swt_widget.is_a?(Shell)
           @swt_widget = swt_widget_class.new(parent.swt_widget, style('menu', styles))
+        elsif parent.swt_widget.is_a?(TrayItem)
+          @swt_widget = swt_widget_class.new(parent.shell_proxy.swt_widget, style('menu', styles))
+          parent.menu_proxy = self
         else
           @swt_widget = swt_widget_class.new(parent.swt_widget)
         end
@@ -70,7 +73,18 @@ module Glimmer
         if styles.include?(:bar)
           DisplayProxy.instance.auto_exec { parent.swt_widget.setMenuBar(swt_widget) }
         elsif styles.include?(:pop_up)
-          DisplayProxy.instance.auto_exec { parent.swt_widget.setMenu(swt_widget) }
+          if parent.swt_widget.is_a?(TrayItem)
+            parent.on_widget_selected {
+              self.visible = true
+            }
+            parent.on_menu_detected {
+              self.visible = true
+            }
+          else
+            DisplayProxy.instance.auto_exec {
+              parent.swt_widget.setMenu(swt_widget) unless parent.swt_widget.is_a?(TrayItem)
+            }
+          end
         end
       end
 

data/lib/glimmer/swt/tray_item_proxy.rb

@@ -0,0 +1,44 @@
+# 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/swt/swt_proxy'
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/tray_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.TrayItem
+    #
+    # Invoking `#swt_widget` returns the SWT TrayItem object wrapped by this proxy
+    #
+    # Follows the Proxy Design Pattern and Flyweight Design Pattern (caching memoization)
+    class TrayItemProxy < Glimmer::SWT::WidgetProxy
+      attr_reader :tray_proxy, :shell_proxy
+      attr_accessor :menu_proxy
+      
+      def initialize(shell_proxy, *args)
+        @shell_proxy = shell_proxy
+        @tray_proxy = Glimmer::SWT::TrayProxy.instance
+        super('tray_item', @tray_proxy, args)
+      end
+    end
+  end
+end

data/lib/glimmer/swt/tray_proxy.rb

@@ -0,0 +1,64 @@
+# 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/swt/display_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.Tray
+    #
+    # Invoking `#swt_widget` returns the SWT Tray object wrapped by this proxy
+    #
+    # Follows the Proxy Design Pattern and Flyweight Design Pattern (caching memoization)
+    class TrayProxy
+      class << self
+        def instance
+          @instance ||= new(Glimmer::SWT::DisplayProxy.instance)
+        end
+      end
+      
+      attr_reader :swt_widget
+      
+      def initialize(display_proxy)
+        @swt_widget = display_proxy.getSystemTray
+      end
+      
+      def method_missing(method, *args, &block)
+        @swt_widget.send(method, *args, &block)
+      end
+      
+      def respond_to?(method, *args, &block)
+        super || @swt_widget.respond_to?(method, *args, &block)
+      end
+      
+      def post_initialize_child(child)
+        # No Op
+      end
+
+      # Subclasses may override to perform post add_content work.
+      # Make sure its logic detects if it ran before since it could run multiple times
+      # when adding content multiple times post creation.
+      def post_add_content
+        # No Op
+      end
+    end
+  end
+end

data/samples/hello/hello_canvas_animation.rb

@@ -25,27 +25,30 @@ include Glimmer
 
 shell {
   text 'Hello, Canvas Animation!'
-  minimum_size 800, 420
+  minimum_size 1200, 420
 
   canvas {
+    background :white
+    
     animation {
       every 0.01 # in seconds (one hundredth)
             
       frame { |index| # frame block loops indefinitely (unless frame_count is set to an integer)
-        background rgb(index%255, 100, 200) # sets canvas background color
-        
         oval(0, 0, 400, 400) { # x, y, width, height
           foreground :black # sets oval background color
         }
         arc(0, 0, 400, 400, -1.4*index%360, 10) {  # x, y, width, height, start angle, arc angle
-          background rgb(200, 200, 50) # sets arc background color
+          background rgb(50, 200, 50) # sets arc background color
         }
       }
     }
   }
 
   canvas {
+    background :white
+    
     colors = [:yellow, :red]
+    
     animation {
       every 0.25 # in seconds (one quarter)
       cycle colors # cycles array of colors into the second variable of the frame block below
@@ -65,4 +68,42 @@ shell {
       }
     }
   }
+
+  canvas {
+    background :white
+    
+    colors = [:yellow, :red]
+    
+    animation {
+      every 0.25 # in seconds (one quarter)
+      cycle colors # cycles array of colors into the second variable of the frame block below
+
+      frame { |index, color| # frame block loops indefinitely (unless frame_count or cycle_count is set to an integer)
+        outside_color = colors[index % 2]
+        inside_color = colors[(index + 1) % 2]
+
+        background outside_color # sets canvas background color
+
+        rectangle(0, 0, 200, 200) {
+          background inside_color # sets rectangle background color
+        }
+        rectangle(200, 200, 200, 200) {
+          background inside_color # sets rectangle background color
+        }
+      }
+    }
+    
+    animation {
+      every 0.01 # in seconds (one hundredth)
+            
+      frame { |index| # frame block loops indefinitely (unless frame_count is set to an integer)
+        oval(0, 0, 400, 400) { # x, y, width, height
+          foreground :black # sets oval background color
+        }
+        arc(0, 0, 400, 400, -1.4*index%360, 10) {  # x, y, width, height, start angle, arc angle
+          background rgb(50, 200, 50) # sets arc background color
+        }
+      }
+    }
+  }
 }.open

data/samples/hello/hello_tray_item.rb

@@ -0,0 +1,135 @@
+# 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'
+
+class HelloTrayItem
+  include Glimmer::UI::CustomShell
+  
+  # boolean that indicates if application is visible
+  attr_accessor :show_application
+  
+  before_body {
+    # application starts visible
+    @show_application = true
+    # pre-render an icon image using the Canvas Shape DSL
+    @image = image(16, 16) {
+      rectangle(0, 0, 16, 16) {
+        background :black
+      }
+      oval(1, 1, [:default, - 2], [:default, - 2]) {
+        foreground :white
+      }
+      oval(3, 3, [:default, - 6], [:default, - 6]) {
+        foreground :white
+      }
+      oval(5, 5, [:default, - 10], [:default, - 10]) {
+        foreground :white
+      }
+      oval(7, 7, [:default, - 14], [:default, - 14]) {
+        foreground :white
+      }
+    }
+  }
+  
+  body {
+    shell(:shell_trim, :on_top) { # make it always appear on top of everything
+      row_layout(:vertical) {
+        center true
+      }
+      text 'Hello, Tray Item!'
+      
+      on_shell_closed do |event|
+        # do not perform event that closes app when shell is closed
+        event.doit = false
+        # body_root is the root shell
+        body_root.hide
+        self.show_application = false # updates Show Application checkbox menu item indirectly
+      end
+      
+      tray_item {
+        tool_tip_text 'Glimmer'
+        image @image # could use an image path instead
+
+        menu {
+          menu_item {
+            text 'About'
+
+            on_widget_selected do
+              message_box {
+                text 'Glimmer - About'
+                message 'This is a Glimmer DSL for SWT Tray Item'
+              }.open
+            end
+          }
+          menu_item(:separator)
+          menu_item(:check) {
+            text 'Show Application'
+            selection <=> [self, :show_application]
+            
+            on_widget_selected do
+              # body_root is the root shell
+              if body_root.visible?
+                body_root.hide
+              else
+                body_root.show
+              end
+            end
+          }
+          menu_item(:separator)
+          menu_item {
+            text 'Exit'
+
+            on_widget_selected {
+              exit(0)
+            }
+          }
+        }
+        
+        # supported tray item listeners (you can try to add actions to them when needed)
+#         on_swt_Show {
+#         }
+#
+#         on_swt_Hide {
+#         }
+#
+#         on_widget_selected {
+#         }
+#
+#         on_menu_detected {
+#         }
+      }
+      
+      label(:center) {
+        text 'This is the application'
+        font height: 30
+      }
+      label {
+        text 'Click on the tray item (circles icon) to open its menu'
+      }
+      label {
+        text 'Uncheck Show Application to hide the app and recheck it to show the app'
+      }
+    }
+  }
+end
+
+HelloTrayItem.launch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.4.3
+  version: 4.20.6.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -457,6 +457,8 @@ files:
 - lib/glimmer/dsl/swt/table_items_data_binding_expression.rb
 - lib/glimmer/dsl/swt/timer_exec_expression.rb
 - lib/glimmer/dsl/swt/transform_expression.rb
+- lib/glimmer/dsl/swt/tray_expression.rb
+- lib/glimmer/dsl/swt/tray_item_expression.rb
 - lib/glimmer/dsl/swt/tree_items_data_binding_expression.rb
 - lib/glimmer/dsl/swt/tree_properties_expression.rb
 - lib/glimmer/dsl/swt/widget_expression.rb
@@ -516,6 +518,8 @@ files:
 - lib/glimmer/swt/table_proxy.rb
 - lib/glimmer/swt/tool_bar_proxy.rb
 - lib/glimmer/swt/transform_proxy.rb
+- lib/glimmer/swt/tray_item_proxy.rb
+- lib/glimmer/swt/tray_proxy.rb
 - lib/glimmer/swt/tree_proxy.rb
 - lib/glimmer/swt/widget_listener_proxy.rb
 - lib/glimmer/swt/widget_proxy.rb
@@ -615,6 +619,7 @@ files:
 - samples/hello/hello_table/baseball_park.png
 - samples/hello/hello_text.rb
 - samples/hello/hello_tool_bar.rb
+- samples/hello/hello_tray_item.rb
 - samples/hello/hello_tree.rb
 - samples/hello/hello_world.rb
 - samples/hello/images/denmark.png