glimmer-dsl-swt 4.24.4.3 → 4.24.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b47f7d900d7e9e17d688b2a87f6996e2a4e23f2aec2139b7d5efc03fc1837d7
-  data.tar.gz: 0dd67034463fa4193ebbb4c064f6d2dccfd26dde29d326fef69b8a12b80a04a6
+  metadata.gz: e66b329b7d9bf09db34b1b4b9d98a42b52793a6822512ecb1cd95b55a9a8e664
+  data.tar.gz: 2840c2f1c4cb5064afd54e8723668de648541568cdc9d23626fd07c791bfe1bd
 SHA512:
-  metadata.gz: 5737d7b9ad280998dfe94b4e4df7879ee48ff805c2abb0bb1626a3d688684371c2aca03c0da8eb27e2011a4ab26e58f3e4c3a44154056d7197a66acfb89ef4c1
-  data.tar.gz: 05e8484a449adcbd19a4f1b4ba8644614032a272ec957770bbbc1c11cdbea8299fdeaed0ebcbf42df493280782d6b425ec4d967dca8f967a6fc1a1a95dbaeff2
+  metadata.gz: 5072ef09d0a73a58f4e8957c1e69efb69843fb31eeb658513368287754357833f69ab263acc36395242c12f9089a48e48541d68abc4dbf1bb1acc06ef4dfd0d5
+  data.tar.gz: 9ea20dfe409781ec75beed5f5f68afee7e91e09d4a0c14bb43b002525497dcd3948257eccabd8c9513597b108b4e5d051f38faa0c2459c5e44a7a398ee4601f9

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 4.24.4.4
+
+- Support `refined_table` `selection` data-binding
+- Remove extra horizontal/vertical margins in `refined_table` pagination area
+- Update Hello, Refined Table! to support booking a game with right-click pop up context menu
+- Have `Glimmer::UI::CustomWidget` better delegate listners and data-binding observers to `@children_owner` when set
+
 ## 4.24.4.3
 
 - Fix issue with failed `table` extra property data-binding (e.g. foreground color, background color) due to asynchronous multi-threading optimization (now it works).

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.24.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.24.4.4
 ## 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)
@@ -21,7 +21,7 @@ Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) an
 
 ![Eclipse SWT RCP NASA Mars Rover](/images/glimmer-eclipse-swt-rcp-nasa-mars-rover.png)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.24.4.3 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. 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.
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.24.4.4 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. 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.
 
 **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. That was [originally conceived back in 2007](https://andymaleh.blogspot.com/2007/12/data-shining-in-glimmer.html).
 
@@ -338,7 +338,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.24.4.3
+jgem install glimmer-dsl-swt -v 4.24.4.4
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -366,7 +366,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.24.4.3'
+gem 'glimmer-dsl-swt', '~> 4.24.4.4'
 ```
 
 And, then run:
@@ -389,7 +389,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.4.3
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.4.4
       
 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.24.4.3
+4.24.4.4

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -3732,7 +3732,7 @@ shell {
 
 Screenshot:
 
-![Canvas Animation Example](/images/glimmer-example-canvas-animation.png)
+![Canvas Animation Example](/images/glimmer-example-canvas-animation.gif)
 
 Keywords:
 - `animation` declares an animation under a canvas, which renders frames using a frame block indefinitely or finitely depending on (cycle_count/frame_count) properties

data/docs/reference/GLIMMER_SAMPLES.md

@@ -793,6 +793,14 @@ Hello, Refined Table!
 
 ![Hello Refined Table](/images/glimmer-hello-refined-table.png)
 
+Hello, Refined Table! Booking Menu
+
+![Hello Refined Table](/images/glimmer-hello-refined-table-booking-menu.png)
+
+Hello, Refined Table! Game Booked
+
+![Hello Refined Table](/images/glimmer-hello-refined-table-game-booked.png)
+
 #### Hello, Link!
 
 This sample demonstrates the use of the `link` widget in Glimmer, including identifying which link was clicked and performing an action (displaying help) based on its location.

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

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2022 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
@@ -7,10 +7,10 @@
 # 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

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

@@ -54,7 +54,7 @@ module Glimmer
                   filter_and_paginate
                 end
                 @table_proxy.content {
-                  items(dsl: true) <=> [self, :refined_model_array, model_binding.binding_options.merge(read_only: true)]
+                  items <=> [self, :refined_model_array, model_binding.binding_options.merge(read_only: true)]
                 }
                 filter_and_paginate
               end
@@ -82,7 +82,10 @@ module Glimmer
           composite {
             layout_data(:fill, :center, true, false)
             
-            fill_layout(:horizontal)
+            fill_layout(:horizontal) {
+              margin_width 0
+              margin_height 0
+            }
             
             @first_button_proxy = button {
               text '<<'
@@ -169,29 +172,7 @@ module Glimmer
         def last_button_block=(block)
           @last_button_proxy.content(&block)
         end
-        
-        def method_missing(method_name, *args, &block)
-          dsl_mode = @dsl_mode || args.last.is_a?(Hash) && args.last[:dsl]
-          if dsl_mode
-            args.pop if args.last.is_a?(Hash) && args.last[:dsl]
-            super(method_name, *args, &block)
-          elsif @table_proxy&.respond_to?(method_name, *args, &block)
-            @table_proxy&.send(method_name, *args, &block)
-          else
-            super
-          end
-        end
-        
-        def respond_to?(method_name, *args, &block)
-          dsl_mode = @dsl_mode || args.last.is_a?(Hash) && args.last[:dsl]
-          if dsl_mode
-            args = args[0...-1] if args.last.is_a?(Hash) && args.last[:dsl]
-            super(method_name, *args, &block)
-          else
-            super || @table_proxy&.respond_to?(method_name, *args, &block)
-          end
-        end
-        
+                
         def page_count
           (filtered_model_array && (filtered_model_array.count / per_page.to_f).ceil) || 0
         end

data/lib/glimmer/swt/menu_proxy.rb

@@ -57,6 +57,7 @@ module Glimmer
 
         swt_widget_class = self.class.swt_widget_class_for('menu')
         if parent.swt_widget.is_a?(Menu)
+          # TODO support CustomWidget children_owner
           @menu_item_proxy = SWT::WidgetProxy.new('menu_item', parent, [:cascade] + [index].compact)
           @swt_menu_item = @menu_item_proxy.swt_widget
           @swt_widget = swt_widget_class.new(@menu_item_proxy.swt_widget)
@@ -64,6 +65,7 @@ module Glimmer
         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)
+          # TODO support CustomWidget children_owner
           @swt_widget = swt_widget_class.new(parent.shell_proxy.swt_widget, style('menu', styles))
           parent.menu_proxy = self
         else

data/lib/glimmer/swt/widget_proxy.rb

@@ -159,8 +159,7 @@ module Glimmer
             @parent_proxy = parent
             styles, extra_options = extract_args(underscored_widget_name, args)
             swt_widget_class = self.class.swt_widget_class_for(underscored_widget_name)
-            swt_widget_producer = @parent_proxy.respond_to?(:children_owner) ? @parent_proxy.children_owner : @parent_proxy
-            @swt_widget = swt_widget_class.new(swt_widget_producer.swt_widget, style(underscored_widget_name, styles), *extra_options)
+            @swt_widget = swt_widget_class.new(@parent_proxy.swt_widget, style(underscored_widget_name, styles), *extra_options)
           else
             @swt_widget = swt_widget
             underscored_widget_name = self.class.underscored_widget_name(@swt_widget)

data/lib/glimmer/ui/custom_shell.rb

@@ -40,13 +40,21 @@ module Glimmer
       
       def initialize(parent, *swt_constants, options, &content)
         super
-        auto_exec do
-          @swt_widget.set_data('custom_shell', self)
-          @swt_widget.set_data('custom_window', self)
-        end
         raise Error, 'Invalid custom shell (window) body root! Must be a shell (window) or another custom shell (window).' unless body_root.swt_widget.is_a?(org.eclipse.swt.widgets.Shell)
       end
       
+      def swt_widget
+        if @swt_widget.nil? && children_owner
+          @swt_widget = children_owner.swt_widget
+          auto_exec do
+            @swt_widget.set_data('custom_widget', self)
+            @swt_widget.set_data('custom_shell', self)
+            @swt_widget.set_data('custom_window', self)
+          end
+        end
+        @swt_widget
+      end
+      
       # Classes may override
       def open
         body_root.open

data/lib/glimmer/ui/custom_widget.rb

@@ -161,13 +161,13 @@ module Glimmer
         end
       end
 
-      attr_reader :body_root, :swt_widget, :parent, :parent_proxy, :swt_style, :options
+      attr_reader :body_root, :parent, :parent_proxy, :swt_style, :options
 
       def initialize(parent, *swt_constants, options, &content)
         SWT::DisplayProxy.current_custom_widgets_and_shapes << self
         @parent_proxy = @parent = parent
         @parent_proxy = @parent&.get_data('proxy') if @parent.respond_to?(:get_data) && @parent.get_data('proxy')
-        @swt_style = SWT::SWTProxy[*swt_constants]
+        @swt_style = SWT::SWTProxy[*swt_constants] # TODO support non-standard styles like :editable, perhaps by packing in an array instead of interpreting right away
         options ||= {}
         @options = self.class.options.merge(options)
         @content = Util::ProcTracker.new(content) if content
@@ -176,9 +176,8 @@ module Glimmer
         raise Glimmer::Error, 'Invalid custom widget for having no body! Please define body block!' if body_block.nil?
         @body_root = auto_exec { instance_exec(&body_block) }
         raise Glimmer::Error, 'Invalid custom widget for having an empty body! Please fill body block!' if @body_root.nil?
-        @swt_widget = @body_root.swt_widget
         auto_exec do
-          @swt_widget.set_data('custom_widget', self)
+          @body_root.set_data('custom_widget', self)
         end
         auto_exec { execute_hook('after_body') }
         auto_exec do
@@ -201,6 +200,16 @@ module Glimmer
         SWT::DisplayProxy.current_custom_widgets_and_shapes.delete(self)
       end
       
+      def swt_widget
+        if @swt_widget.nil? && children_owner
+          @swt_widget = children_owner.swt_widget
+          auto_exec do
+            @swt_widget.set_data('custom_widget', self)
+          end
+        end
+        @swt_widget
+      end
+      
       def observer_registrations
         @observer_registrations ||= []
       end
@@ -212,7 +221,9 @@ module Glimmer
           property = observation_request.sub(/^on_updated_/, '')
           result = can_add_observer?(property)
         end
-        result || body_root&.can_handle_observation_request?(observation_request)
+        result ||
+          (children_owner != body_root && children_owner&.can_handle_observation_request?(observation_request)) ||
+          body_root&.can_handle_observation_request?(observation_request)
       end
 
       def handle_observation_request(observation_request, &block)
@@ -220,18 +231,25 @@ module Glimmer
         if observation_request.start_with?('on_updated_')
           property = observation_request.sub(/^on_updated_/, '') # TODO look into eliminating duplication from above
           add_observer(DataBinding::Observer.proc(&block), property) if can_add_observer?(property)
+        elsif children_owner != body_root && children_owner&.can_handle_observation_request?(observation_request)
+          children_owner.handle_observation_request(observation_request, &block)
         else
           body_root.handle_observation_request(observation_request, &block)
         end
       end
 
       def can_add_observer?(attribute_name)
-        has_instance_method?(attribute_name) || has_instance_method?("#{attribute_name}?") || @body_root.can_add_observer?(attribute_name)
+        has_instance_method?(attribute_name) ||
+          has_instance_method?("#{attribute_name}?") ||
+          (children_owner != @body_root && children_owner.can_add_observer?(attribute_name)) ||
+          @body_root.can_add_observer?(attribute_name)
       end
 
       def add_observer(observer, attribute_name)
         if has_instance_method?(attribute_name)
           super
+        elsif children_owner != @body_root && children_owner.can_add_observer?(attribute_name)
+          children_owner.add_observer(observer, attribute_name)
         else
           @body_root.add_observer(observer, attribute_name)
         end
@@ -239,12 +257,15 @@ module Glimmer
 
       def has_attribute?(attribute_name, *args)
         has_instance_method?(attribute_setter(attribute_name)) ||
+          (children_owner != @body_root && children_owner.has_attribute?(attribute_name, *args)) ||
           @body_root.has_attribute?(attribute_name, *args)
       end
 
       def set_attribute(attribute_name, *args)
         if has_instance_method?(attribute_setter(attribute_name))
           send(attribute_setter(attribute_name), *args)
+        elsif (children_owner != @body_root && children_owner.has_attribute?(attribute_name, *args))
+          children_owner.set_attribute(attribute_name, *args)
         else
           @body_root.set_attribute(attribute_name, *args)
         end
@@ -262,6 +283,8 @@ module Glimmer
       def get_attribute(attribute_name)
         if has_instance_method?(attribute_name)
           send(attribute_name)
+        elsif children_owner != @body_root && children_owner.has_attribute?(attribute_name)
+          children_owner.get_attribute(attribute_name)
         else
           @body_root.get_attribute(attribute_name)
         end
@@ -317,6 +340,8 @@ module Glimmer
         # but fail the glimmer DSL for the right reason to avoid seeing noise in the log output
         if block && can_handle_observation_request?(method)
           handle_observation_request(method, &block)
+        elsif children_owner != @body_root && children_owner.respond_to?(method, *args, &block)
+          children_owner.send(method, *args, &block)
         else
           body_root.send(method, *args, &block)
         end
@@ -326,6 +351,7 @@ module Glimmer
       def respond_to?(method, *args, &block)
         super or
           can_handle_observation_request?(method) or
+          children_owner.respond_to?(method, *args, &block) or
           body_root.respond_to?(method, *args, &block)
       end
       

data/samples/hello/hello_refined_table.rb

@@ -78,9 +78,15 @@ class HelloRefinedTable
     def ballpark
       home_team.ballpark
     end
+    
+    def to_s
+      "#{home_team_name} vs #{away_team_name} at #{ballpark}"
+    end
   end
   
   BaseballSeason = Struct.new(:year) do
+    attr_accessor :selected_game
+  
     def games
       if @games.nil?
         @games = []
@@ -149,7 +155,21 @@ class HelloRefinedTable
           text 'Away Team'
         }
         
+        menu {
+          menu_item {
+            text 'Book'
+            
+            on_widget_selected do
+              message_box {
+                text 'Game Booked!'
+                message "The game \"#{@baseball_season.selected_game}\" has been booked!"
+              }.open
+            end
+          }
+        }
+        
         model_array <= [@baseball_season, :games, column_attributes: {'Home Team' => :home_team_name, 'Away Team' => :away_team_name}]
+        selection <=> [@baseball_season, :selected_game]
       }
     }
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.24.4.3
+  version: 4.24.4.4
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement