glimmer-dsl-swt 4.17.6.0 → 4.17.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50dd550729725e788ad32393c82aa34c1e39cbc536b0bfce60734603c052b1cf
-  data.tar.gz: 19cf9cb269726720dac30ebf82d458afc1c535861153be8e3fad8ba0864f4a5f
+  metadata.gz: 2a6e9aed9497c88e3858e2e4a5c3734d784fce7aed040f4f538433e2318317d1
+  data.tar.gz: 10edec048056954ef796359f731f72d85ff586ec011291ece257d2d268fc34f6
 SHA512:
-  metadata.gz: f2dffb27676fc7884bd58927e1648677ec972b56b56fdd9a6162c99e252fe6018b3f135766abf739a215d46398136422bdf656a52832821b326b6c02dbed9a8a
-  data.tar.gz: 93c4fb967105b1271e3425155ccb3e5e71acb796d63eac3990a984fc0094708ec7be11faf0f9f0760c5c16e3168a6e477d6737bca444801c4425556458978a81
+  metadata.gz: de93b471548a07642f95d134a838b8e4ecf9045f209fa50d3ec8958b8d5c5bc3f39bc9ed0071a24724c2313913ed807d20b97ecd4b4313f52413e178606bca5c
+  data.tar.gz: 206afc10eb6b566e0617da956f92507145e50393c30b8e398580af8565ea8a3cde61c03fbdc675e9b52a616fcfd7c1920764901c1318c94272848fc95572a12c

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+### 4.17.7.0
+
+- `checkbox_group` built-in custom widget
+- Hello, Checkbox Group! Sample
+- Refactor `radio_group` to render labels instead of relying on radio button text since they are better stylable
+- Refactor Glimmer Meta-Sample to use `radio_group` instead of `radio`
+- Fix issue with ExpandBar fill_layout with the extra element at the end (remove it)
+
 ### 4.17.6.0
 
 - New `radio_group` built-in Glimmer custom widget

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.17.6.0
+# [<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.17.7.0
 ## JRuby Desktop Development GUI Library
 [![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)
@@ -350,6 +350,7 @@ Glimmer App:
       - [Hello, Radio!](#hello-radio)
       - [Hello, Radio Group!](#hello-radio-group)
       - [Hello, Checkbox!](#hello-checkbox)
+      - [Hello, Checkbox Group!](#hello-checkbox-group)
     - [Elaborate Samples](#elaborate-samples)
       - [User Profile](#user-profile)
       - [Login](#login)
@@ -443,7 +444,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.17.6.0
+jgem install glimmer-dsl-swt -v 4.17.7.0
 ```
 
 `jgem` is JRuby's version of `gem` command. 
@@ -519,7 +520,7 @@ bin/glimmer samples
 Below are the full usage instructions that come up when running `glimmer` without args.
 
 ```
-Glimmer (Ruby Desktop Development GUI Library) - JRuby Gem: glimmer-dsl-swt v4.17.6.0
+Glimmer (Ruby Desktop Development GUI Library) - JRuby Gem: glimmer-dsl-swt v4.17.7.0
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 
@@ -996,7 +997,7 @@ Output:
                                                                          
   Css    glimmer-dsl-css    1.1.0     AndyMaleh    Glimmer DSL for CSS    
   Opal   glimmer-dsl-opal   0.4.0     AndyMaleh    Glimmer DSL for Opal   
-  Swt    glimmer-dsl-swt    4.17.6.0  AndyMaleh    Glimmer DSL for SWT    
+  Swt    glimmer-dsl-swt    4.17.7.0  AndyMaleh    Glimmer DSL for SWT    
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk     
   Xml    glimmer-dsl-xml    1.1.0     AndyMaleh    Glimmer DSL for XML                                                                         
 ```
@@ -3078,6 +3079,55 @@ shell(:no_resize) {
 
 Also, you may invoke `Display.setAppVersion('1.0.0')` if needed for OS app version identification reasons during development, replacing `'1.0.0'` with your application version.
 
+#### Checkbox Group Widget
+
+`checkbox_group` (or alias `check_group`) is a Glimmer built-in custom widget that displays a list of `checkbox` buttons (`button(:check)`) based on its `items` property.
+
+`checkbox_group` consists of a root `composite` (with `grid_layout 1, false` by default) that holds nested `checkbox` (`button(:check)`) widgets.
+
+The `selection` property determines which `checkbox` buttons are checked. It expects an `Array` of `String` objects
+The `selection_indices` property determines which `checkbox` button indices are checked. It expects an `Array` of index `Integer` objects that are zero-based.
+The `checkboxes` property returns the list of nested `checkbox` widgets.
+
+When data-binding `selection`, the model property should have a matching property with `_options` suffix (e.g. `activities_options` for `activities`) to provide an `Array` of `String` objects for `checkbox` buttons.
+
+You may see an example at the [Hello, Checkbox Group!](#hello-checkbox-group) sample.
+
+![Hello Checkbox Group](images/glimmer-hello-checkbox-group.png)
+
+#### Radio Group Widget
+
+`radio_group` is a Glimmer built-in custom widget that displays a list of `radio` buttons (`button(:radio)`) based on its `items` property, which expects an `Array` of `String` objects.
+
+`radio_group` consists of a root `composite` (with `grid_layout 1, false` by default) that holds nested `radio` widgets.
+
+The `selection` property determines which `radio` button is selected. It expects a `String`
+The `selection_index` property determines which `radio` button index is selected. It expects an index integer that is zero-based.
+The `radios` property returns the list of nested `radio` widgets.
+
+When data-binding `selection`, the model property should have a matching property with `_options` suffix (e.g. `country_options` for `country`) to provide text for `radio` buttons.
+
+This custom widget is used in the [Glimmer Meta-Sample (The Sample of Samples)](#samples):
+
+![Glimmer Meta-Sample](images/glimmer-meta-sample.png)
+
+Glimmer Meta-Sample Code Example:
+
+```ruby
+# ...
+radio_group { |radio_group_proxy|
+  row_layout(:vertical) {
+    fill true
+  }
+  selection bind(sample_directory, :selected_sample_name)
+  font height: 24
+}
+
+# ...
+```
+
+You may see another example at the [Hello, Radio Group!](#hello-radio-group) sample.
+
 #### Code Text Widget
 
 `code_text` is a Glimmer built-in custom widget that displays syntax highlighted Ruby code in a customized SWT [StyledText](https://help.eclipse.org/2020-09/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/custom/StyledText.html) widget.
@@ -3662,7 +3712,7 @@ Hello, Radio!
 
 #### Hello, Radio Group!
 
-This sample demonstrates the use of a `radio_group` in Glimmer, which is a terser way of representing multiple radio buttons by relying on data-binding to automatically spawn the `radio` widgets based on available options on the model.
+This sample demonstrates the use of a `radio_group` in Glimmer, which provides terser syntax for representing multiple radio buttons by relying on data-binding to automatically spawn the `radio` widgets based on available options on the model.
 
 Code:
 
@@ -3684,6 +3734,18 @@ Hello, Checkbox!
 
 ![Hello Checkbox](images/glimmer-hello-checkbox.png)
 
+#### Hello, Checkbox Group!
+
+This sample demonstrates the use of a `checkbox_group` (aka `check_group`) in Glimmer, which provides terser syntax for representing multiple checkbox buttons (`button(:check)`) by relying on data-binding to automatically spawn the `checkbox` widgets (`button(:check)`) based on available options on the model.
+
+Code:
+
+[samples/hello/hello_checkbox_group.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_checkbox_group.rb)
+
+Hello, Checkbox Group!
+
+![Hello Checkbox Group](images/glimmer-hello-checkbox-group.png)
+
 ### Elaborate Samples
 
 For more elaborate samples, check the following:

data/VERSION

@@ -1 +1 @@
-4.17.6.0
+4.17.7.0

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.17.6.0 ruby lib
+# stub: glimmer-dsl-swt 4.17.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.17.6.0"
+  s.version = "4.17.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2020-10-28"
+  s.date = "2020-10-29"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Library)".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/dsl/swt/async_exec_expression.rb",
     "lib/glimmer/dsl/swt/bind_expression.rb",
     "lib/glimmer/dsl/swt/block_property_expression.rb",
+    "lib/glimmer/dsl/swt/checkbox_group_selection_data_binding_expression.rb",
     "lib/glimmer/dsl/swt/color_expression.rb",
     "lib/glimmer/dsl/swt/column_properties_expression.rb",
     "lib/glimmer/dsl/swt/combo_selection_data_binding_expression.rb",
@@ -86,6 +87,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/rake_task/scaffold.rb",
     "lib/glimmer/swt/color_proxy.rb",
     "lib/glimmer/swt/cursor_proxy.rb",
+    "lib/glimmer/swt/custom/checkbox_group.rb",
     "lib/glimmer/swt/custom/code_text.rb",
     "lib/glimmer/swt/custom/radio_group.rb",
     "lib/glimmer/swt/display_proxy.rb",
@@ -125,6 +127,7 @@ Gem::Specification.new do |s|
     "samples/elaborate/user_profile.rb",
     "samples/hello/hello_browser.rb",
     "samples/hello/hello_checkbox.rb",
+    "samples/hello/hello_checkbox_group.rb",
     "samples/hello/hello_combo.rb",
     "samples/hello/hello_computed.rb",
     "samples/hello/hello_computed/contact.rb",

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

@@ -0,0 +1,61 @@
+# Copyright (c) 2007-2020 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/expression'
+require 'glimmer/data_binding/model_binding'
+require 'glimmer/data_binding/widget_binding'
+
+module Glimmer
+  module DSL
+    module SWT
+      class CheckboxGroupSelectionDataBindingExpression < Expression
+ 
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'selection' and
+            block.nil? and
+            (parent.is_a?(Glimmer::SWT::Custom::CheckboxGroup) or (parent.is_a?(Glimmer::UI::CustomWidget) and parent.body_root.is_a?(Glimmer::SWT::Custom::CheckboxGroup)) ) and
+            args.size == 1 and
+            args[0].is_a?(DataBinding::ModelBinding) and
+            args[0].evaluate_options_property.is_a?(Array)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          model_binding = args[0]
+  
+          #TODO make this options observer dependent and all similar observers in widget specific data binding handlers
+          # TODO consider delegating some of this work
+          widget_binding = DataBinding::WidgetBinding.new(parent, 'items')
+          widget_binding.call(model_binding.evaluate_options_property)
+          model = model_binding.base_model
+          widget_binding.observe(model, model_binding.options_property_name)
+  
+          widget_binding = DataBinding::WidgetBinding.new(parent, 'selection')
+          widget_binding.call(model_binding.evaluate_property)
+          widget_binding.observe(model, model_binding.property_name_expression)
+  
+          parent.on_widget_selected do
+            model_binding.call(widget_binding.evaluate_property)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -27,6 +27,7 @@ require 'glimmer/ui/custom_widget'
 require 'glimmer/ui/custom_shell'
 require 'glimmer/swt/custom/code_text'
 require 'glimmer/swt/custom/radio_group'
+require 'glimmer/swt/custom/checkbox_group'
 
 module Glimmer
   module DSL

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

@@ -41,6 +41,7 @@ module Glimmer
           layout
           widget_listener
           combo_selection_data_binding
+          checkbox_group_selection_data_binding
           radio_group_selection_data_binding
           list_selection_data_binding
           tree_items_data_binding

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

@@ -0,0 +1,160 @@
+require 'glimmer/ui/custom_widget'
+
+module Glimmer
+  module SWT
+    module Custom
+      # CodeText is a customization of StyledText with support for Ruby Syntax Highlighting
+      class CheckboxGroup
+        include Glimmer::UI::CustomWidget
+        
+        body {
+          composite # just an empty composite to hold checkboxs upon data-binding `selection`
+        }
+        
+        def items=(text_array)
+          selection_value = selection
+          @items = Array[*text_array]
+          build_checkboxes
+        end
+        
+        def items
+          @items || []
+        end
+        
+        def selection=(selection_texts)
+          items.count.times do |index|
+            checkbox = checkboxes[index]
+            item = items[index]
+            label_text = labels[index]&.text
+            checkbox.selection = selection_texts.to_a.include?(label_text)
+          end
+          selection_texts
+        end
+        
+        def selection
+          selection_indices.map do |selection_index|
+            labels[selection_index]&.text
+          end
+        end
+        
+        def selection_indices=(indices)
+          self.selection=(indices.to_a.map {|index| items[index]})
+        end
+        alias select selection_indices=
+        
+        def selection_indices
+          checkboxes.each_with_index.map do |checkbox, index|
+            index if checkbox.selection
+          end.to_a.compact
+        end
+        
+        def checkboxes
+          @checkboxes ||= []
+        end
+        alias checks checkboxes
+        
+        def labels
+          @labels ||= []
+        end
+        
+        def can_handle_observation_request?(observation_request)
+          checkboxes.first&.can_handle_observation_request?(observation_request) || super(observation_request)
+        end
+        
+        def handle_observation_request(observation_request, &block)
+          observation_requests << [observation_request, block]
+          delegate_observation_request_to_checkboxes(observation_request, &block)
+          super
+        end
+        
+        def delegate_observation_request_to_checkboxes(observation_request, &block)
+          if observation_request != 'on_widget_disposed'
+            checkboxes.count.times do |index|
+              checkbox = checkboxes[index]
+              label = labels[index]              
+              listener_block = lambda do |event|
+                event.widget = self.swt_widget
+                block.call(event)
+              end
+              if observation_request == 'on_widget_selected'
+                checkbox.handle_observation_request(observation_request, &listener_block) if checkbox.can_handle_observation_request?(observation_request)
+                label.handle_observation_request('on_mouse_up', &listener_block)
+              else
+                checkbox.handle_observation_request(observation_request, &listener_block) if checkbox.can_handle_observation_request?(observation_request)
+                label.handle_observation_request(observation_request, &listener_block) if label.can_handle_observation_request?(observation_request)              
+              end
+            end
+          end
+        end
+        
+        def observation_requests
+          @observation_requests ||= Set.new
+        end
+        
+        def has_attribute?(attribute_name, *args)
+          (@composites.to_a + @checkboxes.to_a + @labels.to_a).map do |widget_proxy|
+            return true if widget_proxy.has_attribute?(attribute_name, *args)            
+          end
+          super
+        end
+         
+        def set_attribute(attribute_name, *args)
+          excluded_attributes = ['selection']
+          unless excluded_attributes.include?(attribute_name.to_s)
+            (@composites.to_a + @checkboxes.to_a + @labels.to_a).each do |widget_proxy|
+              widget_proxy.set_attribute(attribute_name, *args) if widget_proxy.has_attribute?(attribute_name, *args)
+            end
+          end
+          super
+        end
+        
+        private
+        
+        def build_checkboxes
+          current_selection = selection
+          @composites.to_a.each(&:dispose)
+          @checkboxes = []
+          @labels = []
+          @composites = []
+          items.each do |item|
+            body_root.content {
+              @composites << composite {
+                grid_layout(2, false) {
+                  margin_width 0
+                  margin_height 0
+                  horizontal_spacing 0
+                  vertical_spacing 0
+                }                
+                checkboxes << checkbox { |checkbox_proxy|
+                  on_widget_selected {                  
+                    self.selection_indices = checkboxes.each_with_index.map {|cb, i| i if cb.selection}.to_a.compact
+                  }
+                }
+                labels << label { |label_proxy|
+                  layout_data :fill, :center, true, false
+                  text item
+                  on_mouse_up { |event|                    
+                    found_text = labels.each_with_index.detect {|l, i| event.widget == l.swt_widget}[0]&.text
+                    selection_values = self.selection
+                    if selection_values.include?(found_text)
+                      selection_values.delete(found_text)
+                    else
+                      selection_values << found_text
+                    end
+                    self.selection = selection_values
+                  }
+                }
+              }
+            }
+          end
+          observation_requests.to_a.each do |observation_request, block|
+            delegate_observation_request_to_checkboxes(observation_request, &block)            
+          end
+          self.selection = current_selection
+        end
+      end
+      
+      CheckGroup = CheckboxGroup
+    end
+  end
+end

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

@@ -7,8 +7,6 @@ module Glimmer
       class RadioGroup
         include Glimmer::UI::CustomWidget
         
-        # TODO support setting font, background, foreground, cursor
-        
         body {
           composite # just an empty composite to hold radios upon data-binding `selection`
         }
@@ -20,18 +18,20 @@ module Glimmer
         end
         
         def items
-          @items
+          @items || []
         end
         
         def selection=(text)
-          radios.each do |radio|
-            radio.selection = radio.text == text
+          radios.count.times do |index|
+            radio = radios[index]
+            item = items[index]
+            radio.selection = item == text
           end
         end
         
         def selection
-          # TODO use labels to retrieve text since they are better customizable with fonts while maintaining alignment with radio buttons
-          radios.detect(&:selection)&.text.to_s
+          selection_value = labels[selection_index]&.text unless selection_index == -1
+          selection_value.to_s
         end
         
         def selection_index=(index)
@@ -47,6 +47,10 @@ module Glimmer
           @radios ||= []
         end
         
+        def labels
+          @labels ||= []
+        end
+        
         def can_handle_observation_request?(observation_request)
           radios.first&.can_handle_observation_request?(observation_request) || super(observation_request)
         end
@@ -58,15 +62,31 @@ module Glimmer
         end
         
         def delegate_observation_request_to_radios(observation_request, &block)
-          if observation_request != 'on_widget_disposed' && radios.first&.can_handle_observation_request?(observation_request)
-            radios.each do |radio|            
-              radio_block = lambda do |event|
-                if event.widget.selection || selection_index == -1
+          if observation_request != 'on_widget_disposed'
+            radios.count.times do |index|
+              radio = radios[index]
+              label = labels[index]              
+              if observation_request == 'on_widget_selected'
+                radio_block = lambda do |event|
+                  if event.widget.selection || selection_index == -1
+                    event.widget = self.swt_widget
+                    block.call(event)
+                  end
+                end
+                label_block = lambda do |event|
+                  self.selection_index = index
+                  block.call(event)
+                end              
+                radio.handle_observation_request(observation_request, &radio_block) if radio.can_handle_observation_request?(observation_request)
+                label.handle_observation_request('on_mouse_up', &label_block)
+              else
+                listener_block = lambda do |event|
                   event.widget = self.swt_widget
                   block.call(event)
                 end
+                radio.handle_observation_request(observation_request, &listener_block) if radio.can_handle_observation_request?(observation_request)
+                label.handle_observation_request(observation_request, &listener_block) if label.can_handle_observation_request?(observation_request)              
               end
-              radio.handle_observation_request(observation_request, &block)
             end
           end
         end
@@ -75,18 +95,52 @@ module Glimmer
           @observation_requests ||= Set.new
         end
         
+        def has_attribute?(attribute_name, *args)
+          (@composites.to_a + @radios.to_a + @labels.to_a).map do |widget_proxy|
+            return true if widget_proxy.has_attribute?(attribute_name, *args)            
+          end
+          super
+        end
+         
+        def set_attribute(attribute_name, *args)
+          excluded_attributes = ['selection']
+          unless excluded_attributes.include?(attribute_name.to_s)
+            (@composites.to_a + @radios.to_a + @labels.to_a).each do |widget_proxy|
+              widget_proxy.set_attribute(attribute_name, *args) if widget_proxy.has_attribute?(attribute_name, *args)
+            end
+          end
+          super
+        end
+        
         private
         
         def build_radios
-          # TODO consider doing a diff instead of disposing and rebuilding everything in the future
-          # TODO add labels since they are better customizable with fonts while maintaining alignment with radio buttons
           current_selection = selection
-          radios.each(&:dispose) # TODO take care of the fact that dispose removes the observers attached
+          @composites.to_a.each(&:dispose)
           @radios = []
+          @labels = []
+          @composites = []
           items.each do |item|
             body_root.content {
-              radios << radio {
-                text item
+              @composites << composite {
+                grid_layout(2, false) {
+                  margin_width 0
+                  margin_height 0
+                  horizontal_spacing 0
+                  vertical_spacing 0
+                }
+                radios << radio { |radio_proxy|
+                  on_widget_selected {
+                    self.selection = items[radios.index(radio_proxy)]
+                  }
+                }
+                labels << label { |label_proxy|
+                  layout_data :fill, :center, true, false
+                  text item
+                  on_mouse_up {
+                    self.selection = label_proxy.text
+                  }
+                }
               }
             }
           end

data/lib/glimmer/swt/expand_item_proxy.rb

@@ -61,7 +61,6 @@ module Glimmer
       
       def post_add_content
         @swt_expand_item.setHeight(swt_widget.computeSize(SWTProxy[:default], SWTProxy[:default]).y) unless @swt_expand_item.getHeight > 0
-        WidgetProxy.new('composite', self, []) # adding filler since it seems like the last child gets a bad style, so this gets it instead
       end
       
       def has_attribute?(attribute_name, *args)

data/lib/glimmer/swt/widget_proxy.rb

@@ -50,6 +50,7 @@ module Glimmer
         'check'               => [:check],
         'drag_source'         => [:drop_copy],
         'drop_target'         => [:drop_copy],
+        'expand_bar'          => [:v_scroll],
         'list'                => [:border, :v_scroll],
         'menu_item'           => [:push],
         'radio'               => [:radio],
@@ -61,7 +62,6 @@ module Glimmer
         'toggle'              => [:toggle],
         'tool_bar'            => [:push],
         'tool_item'           => [:push],
-        'expand_bar'          => [:v_scroll],
         'tree'                => [:virtual, :border, :h_scroll, :v_scroll],
       }
 
@@ -91,11 +91,11 @@ module Glimmer
       }
       
       KEYWORD_ALIASES = {
-        'radio'          => 'button',
+        'arrow'          => 'button',
         'checkbox'       => 'button',
         'check'          => 'button',
+        'radio'          => 'button',
         'toggle'         => 'button',
-        'arrow'          => 'button',
       }
       
       class << self

data/samples/elaborate/meta_sample.rb

@@ -20,7 +20,7 @@ class Sample
   end
   
   def content
-    @content ||= File.read(file)
+    @content = File.read(file)
   end
     
   def launch
@@ -58,12 +58,12 @@ class SampleDirectory
     
     def all_samples
       @all_samples ||= sample_directories.map(&:samples).reduce(:+)
-    end
+    end    
   end
   
   include Glimmer # used for observe syntax
   
-  attr_accessor :file
+  attr_accessor :file, :selected_sample_name
   
   def initialize(file)
     self.file = file
@@ -92,7 +92,20 @@ class SampleDirectory
       end
     end
     @samples
-  end  
+  end
+  
+  def selected_sample_name_options
+    samples.map(&:name)
+  end
+  
+  def selected_sample_name=(selected_name)
+    @selected_sample_name = selected_name
+    unless selected_name.nil?
+      (self.class.sample_directories - [self]).each { |sample_dir| sample_dir.selected_sample_name = nil }
+      self.class.selected_sample = samples.detect { |sample| sample.name == @selected_sample_name }
+    end
+  end
+  
 end
 
 class MetaSampleApplication
@@ -114,26 +127,18 @@ class MetaSampleApplication
           expand_bar {
             layout_data(:fill, :fill, true, true)
             font height: 30
-            
+                        
             SampleDirectory.sample_directories.each { |sample_directory|
               expand_item {
                 layout_data(:fill, :fill, true, true)
-                grid_layout 2, false
                 text "#{sample_directory.name} Samples"
                 
-                sample_directory.samples.each { |sample|
-                  label_radio = radio {
-                    selection bind(sample, :selected)
-                  }
-                  label {
-                    layout_data :fill, :center, true, false
-                    text sample.name
-                    font height: 24
-                    
-                    on_mouse_up {
-                      sample.selected = true
-                    }
+                radio_group { |radio_group_proxy|
+                  row_layout(:vertical) {
+                    fill true
                   }
+                  selection bind(sample_directory, :selected_sample_name)
+                  font height: 24
                 }
               }
             }
@@ -157,7 +162,7 @@ class MetaSampleApplication
           caret nil
         }
         
-        weights 1, 2
+        weights 4, 9
       }            
     }.open
   end

data/samples/hello/hello_checkbox.rb

@@ -19,22 +19,22 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class Person
-  attr_accessor :skiing, :snowboarding, :snowmobiling, :snowshoeing
-  
-  def initialize
-    reset_activities
+class HelloCheckbox
+  class Person
+    attr_accessor :skiing, :snowboarding, :snowmobiling, :snowshoeing
+    
+    def initialize
+      reset_activities
+    end
+    
+    def reset_activities
+      self.skiing = false
+      self.snowboarding = true
+      self.snowmobiling = false
+      self.snowshoeing = false
+    end
   end
   
-  def reset_activities
-    self.skiing = false
-    self.snowboarding = true
-    self.snowmobiling = false
-    self.snowshoeing = false
-  end
-end
-
-class HelloCheckbox
   include Glimmer
   
   def launch

data/samples/hello/hello_checkbox_group.rb

@@ -0,0 +1,68 @@
+# Copyright (c) 2007-2020 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.
+
+class HelloCheckboxGroup
+  class Person
+    attr_accessor :activities
+    
+    def initialize
+      reset_activities
+    end
+    
+    def activities_options
+      ['Skiing', 'Snowboarding', 'Snowmobiling', 'Snowshoeing']
+    end
+    
+    def reset_activities
+      self.activities = ['Snowboarding']
+    end
+  end
+  
+  include Glimmer
+  
+  def launch
+    person = Person.new
+    
+    shell {
+      text 'Hello, Checkbox Group!'
+      row_layout :vertical
+      
+      label {
+        text 'Check all snow activities you are interested in:'
+        font style: :bold
+      }
+      
+      checkbox_group {
+        selection bind(person, :activities)
+      }
+    
+      button {
+        text 'Reset Activities'
+        
+        on_widget_selected do
+          person.reset_activities
+        end
+      }
+    }.open
+  end
+end
+
+HelloCheckboxGroup.new.launch

data/samples/hello/hello_combo.rb

@@ -19,20 +19,20 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class Person
-  attr_accessor :country, :country_options
-
-  def initialize
-    self.country_options = ['', 'Canada', 'US', 'Mexico']
-    reset_country
-  end
-
-  def reset_country
-    self.country = 'Canada'
+class HelloCombo
+  class Person
+    attr_accessor :country, :country_options
+  
+    def initialize
+      self.country_options = ['', 'Canada', 'US', 'Mexico']
+      reset_country
+    end
+  
+    def reset_country
+      self.country = 'Canada'
+    end
   end
-end
 
-class HelloCombo
   include Glimmer
   
   def launch

data/samples/hello/hello_expand_bar.rb

@@ -55,6 +55,7 @@ class HelloExpandBar
           button {
             text 'Database'
           }
+          composite # just filler
         }
         
         expand_item {
@@ -72,6 +73,7 @@ class HelloExpandBar
           button {
             text 'Scientific Calculator'
           }
+          composite # just filler
         }
         
         expand_item {
@@ -89,6 +91,7 @@ class HelloExpandBar
           button {
             text 'Papers'
           }
+          composite # just filler
         }
         
         on_item_expanded { |expand_event|
@@ -99,7 +102,6 @@ class HelloExpandBar
           @status_label.text = "#{expand_event.item.text} Collapsed!"
         }
         
-        
       }
     }.open
   end

data/samples/hello/hello_list_multi_selection.rb

@@ -19,30 +19,30 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class Person
-  attr_accessor :provinces, :provinces_options
-
-  def initialize
-    self.provinces_options=[
-      "",
-      "Quebec",
-      "Ontario",
-      "Manitoba",
-      "Saskatchewan",
-      "Alberta",
-      "British Columbia",
-      "Nova Skotia",
-      "Newfoundland"
-    ]
-    self.provinces = ["Quebec", "Manitoba", "Alberta"]
-  end
-
-  def reset_provinces
-    self.provinces = ["Quebec", "Manitoba", "Alberta"]
-  end
-end
-
 class HelloListMultiSelection
+  class Person
+    attr_accessor :provinces, :provinces_options
+  
+    def initialize
+      self.provinces_options=[
+        "",
+        "Quebec",
+        "Ontario",
+        "Manitoba",
+        "Saskatchewan",
+        "Alberta",
+        "British Columbia",
+        "Nova Skotia",
+        "Newfoundland"
+      ]
+      self.provinces = ["Quebec", "Manitoba", "Alberta"]
+    end
+  
+    def reset_provinces
+      self.provinces = ["Quebec", "Manitoba", "Alberta"]
+    end
+  end
+  
   include Glimmer
   
   def launch

data/samples/hello/hello_list_single_selection.rb

@@ -19,21 +19,22 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class Person 
-  attr_accessor :country, :country_options
-
-  def initialize
-    self.country_options=["", "Canada", "US", "Mexico"]
-    self.country = "Canada"
-  end
-
-  def reset_country
-    self.country = "Canada"
-  end
-end
-
 class HelloListSingleSelection
+  class Person 
+    attr_accessor :country, :country_options
+  
+    def initialize
+      self.country_options=["", "Canada", "US", "Mexico"]
+      self.country = "Canada"
+    end
+  
+    def reset_country
+      self.country = "Canada"
+    end
+  end
+  
   include Glimmer
+  
   def launch
     person = Person.new
     

data/samples/hello/hello_radio.rb

@@ -19,25 +19,25 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class Person
-  attr_accessor :male, :female, :child, :teen, :adult, :senior
-  
-  def initialize
-    reset
+class HelloRadio  
+  class Person
+    attr_accessor :male, :female, :child, :teen, :adult, :senior
+    
+    def initialize
+      reset
+    end
+    
+    def reset
+      self.male = nil
+      self.female = nil
+      self.child = nil
+      self.teen = nil
+      self.adult = true
+      self.senior = nil
+    end
   end
   
-  def reset
-    self.male = nil
-    self.female = nil
-    self.child = nil
-    self.teen = nil
-    self.adult = true
-    self.senior = nil
-  end
-end
-
-class HelloRadio
-  include Glimmer
+  include Glimmer  
   
   def launch
     person = Person.new

data/samples/hello/hello_radio_group.rb

@@ -19,28 +19,28 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-class Person
-  attr_accessor :gender, :age_group
-  
-  def initialize
-    reset
-  end
-  
-  def gender_options
-    ['Male', 'Female']
-  end
-  
-  def age_group_options
-    ['Child', 'Teen', 'Adult', 'Senior']  
-  end
-  
-  def reset
-    self.gender = nil
-    self.age_group = 'Adult'
+class HelloRadioGroup
+  class Person
+    attr_accessor :gender, :age_group
+    
+    def initialize
+      reset
+    end
+    
+    def gender_options
+      ['Male', 'Female']
+    end
+    
+    def age_group_options
+      ['Child', 'Teen', 'Adult', 'Senior']  
+    end
+    
+    def reset
+      self.gender = nil
+      self.age_group = 'Adult'
+    end
   end
-end
 
-class HelloRadioGroup
   include Glimmer
   
   def launch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.17.6.0
+  version: 4.17.7.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -345,6 +345,7 @@ files:
 - lib/glimmer/dsl/swt/async_exec_expression.rb
 - lib/glimmer/dsl/swt/bind_expression.rb
 - lib/glimmer/dsl/swt/block_property_expression.rb
+- lib/glimmer/dsl/swt/checkbox_group_selection_data_binding_expression.rb
 - lib/glimmer/dsl/swt/color_expression.rb
 - lib/glimmer/dsl/swt/column_properties_expression.rb
 - lib/glimmer/dsl/swt/combo_selection_data_binding_expression.rb
@@ -386,6 +387,7 @@ files:
 - lib/glimmer/rake_task/scaffold.rb
 - lib/glimmer/swt/color_proxy.rb
 - lib/glimmer/swt/cursor_proxy.rb
+- lib/glimmer/swt/custom/checkbox_group.rb
 - lib/glimmer/swt/custom/code_text.rb
 - lib/glimmer/swt/custom/radio_group.rb
 - lib/glimmer/swt/display_proxy.rb
@@ -425,6 +427,7 @@ files:
 - samples/elaborate/user_profile.rb
 - samples/hello/hello_browser.rb
 - samples/hello/hello_checkbox.rb
+- samples/hello/hello_checkbox_group.rb
 - samples/hello/hello_combo.rb
 - samples/hello/hello_computed.rb
 - samples/hello/hello_computed/contact.rb