glimmer-dsl-swt 4.17.10.0 → 4.17.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e98b64d0a38325d6474b61a1a411d910418fcf47448fe9d6a2c88742bc2109ed
-  data.tar.gz: dff1f5b21cc4b594be8f5b6eac5337e4ee4d072b1fb2bf87c3eb0e6728e1eb41
+  metadata.gz: 811cbe738d6049291f6f00f32234ebef5af6d334009136314a309bf96807d863
+  data.tar.gz: f2618026dc2b90cd076a75ffde44334aac013dc412afd23368cc0f072c4b5ed5
 SHA512:
-  metadata.gz: 62c570e832502b5dcde331cc9ef6774d1a15353d7f33066641ce7b07fa3f5a278cb4b1031a1266996fc9d09e37aa1884523ffb57100e47605cc4c54225b1b0b0
-  data.tar.gz: acf8dd65d70769f0f7c27873715f1360f6847ad0ffe3f1eed4c5af0c58768ec2c8ca6d4d1e337c88bca2ecb771025ded162130ed48aa0eec57c04c32590eda91
+  metadata.gz: ad40ab20b33c48f575ac525b88e1c6c3fd38a5db937416afa748b6d4700f0b0930a3dbf000b69c3ac03cbdc092510762aeacc8a1588616679db6a783ce26fbfc
+  data.tar.gz: 6bc20ea164c4fda7e35e5400ceb6e864205dc6be59eefc98a296f3df3fd795594b2f054988cbdd55ac6d0bbf555546dfdcad8231906a810ef099212420749aae

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Change Log
 
+### 4.17.10.5
+
+- Hello, Button! Sample
+
+### 4.17.10.4
+
+- Do not select first row in a table by default (keep unselected)
+- Prevented extra call to model data in table items data-binding
+- Upgraded to glimmer v1.0.5
+
+### 4.17.10.3
+
+- Fixed issue in StyledText data-binding relating to capturing selection changes on mouse click
+
+### 4.17.10.2
+
+- Upgraded glimmer gem to version 1.0.4
+- Fixed issues relating to data-binding `styled_text` widget
+
+### 4.17.10.1
+
+- Upgraded glimmer gem to version 1.0.3
+- Upgraded rouge gem to version 3.25.0
+
 ### 4.17.10.0
 
 - Support table editing via `date_time` for date/time values

data/README.md

@@ -1,6 +1,6 @@
-# [<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.10.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.10.5
 
-## JRuby Desktop Development GUI Library
+## 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)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer-dsl-swt/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer-dsl-swt?branch=master)
@@ -61,8 +61,6 @@ Glimmer code (from [samples/elaborate/tic_tac_toe.rb](https://github.com/AndyObt
 
 ```ruby
 # ...
-    @tic_tac_toe_board = Board.new
-    
     @shell = shell {
       text "Tic-Tac-Toe"
       minimum_size 150, 178
@@ -83,11 +81,6 @@ Glimmer code (from [samples/elaborate/tic_tac_toe.rb](https://github.com/AndyObt
         }
       }
     }
-    
-    observe(@tic_tac_toe_board, :game_status) { |game_status|
-      display_win_message if game_status == Board::WIN
-      display_draw_message if game_status == Board::DRAW
-    }
 # ...
 ```
 
@@ -238,7 +231,7 @@ Glimmer App:
 
 ## Table of contents
 
-- [Glimmer (Ruby Desktop Development GUI Library)](#-glimmer-ruby-desktop-development-gui-library)
+- [Glimmer (JRuby Desktop Development GUI Framework)](#jruby-desktop-development-gui-framework)
   - [Examples](#examples)
     - [Hello, World!](#hello-world)
     - [Tic Tac Toe](#tic-tac-toe)
@@ -353,7 +346,6 @@ Glimmer App:
       - [Hello, Expand Bar!](#hello-expand-bar)
       - [Hello, Radio!](#hello-radio)
       - [Hello, Radio Group!](#hello-radio-group)
-      - [Hello, Checkbox!](#hello-checkbox)
       - [Hello, Group!](#hello-group)
       - [Hello, Checkbox!](#hello-checkbox)
       - [Hello, Checkbox Group!](#hello-checkbox-group)
@@ -362,6 +354,7 @@ Glimmer App:
       - [Hello, Date Time!](#hello-date-time)
       - [Hello, Spinner!](#hello-spinner)
       - [Hello, Table!](#hello-table)
+      - [Hello, Button!](#hello-button)
     - [Elaborate Samples](#elaborate-samples)
       - [User Profile](#user-profile)
       - [Login](#login)
@@ -455,7 +448,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.17.10.0
+jgem install glimmer-dsl-swt -v 4.17.10.5
 
 ```
 
@@ -532,7 +525,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.10.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.17.10.5
 
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
@@ -710,7 +703,7 @@ glimmer bin/greeter
 
 #### Desktopify
 
-This scaffolding mode enables you to desktopify a web app. Glimmer Scaffolding basically wraps the website with a [Browser Widget](#browser-widget).
+Desktopify basically turns a website into a desktop application by wrapping the website within a [Browser Widget](#browser-widget).
 
 The desktopify app is similar to the standard scaffolded app. It can be extended and the [browser may even be instrumented](https://help.eclipse.org/2020-09/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/browser/Browser.html).
 
@@ -1010,7 +1003,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.10.0
+  Swt    glimmer-dsl-swt    4.17.10.5
   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
@@ -3874,14 +3867,6 @@ Hello, Radio Group!
 
 ![Hello Radio Group](images/glimmer-hello-radio-group.png)
 
-#### Hello, Checkbox!
-
-This sample demonstrates the use of a `checkbox` (aka `check` or `button(:check)`) in Glimmer.
-
-Code:
-
-[samples/hello/hello_checkbox.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_checkbox.rb)
-
 #### Hello, Group!
 
 This sample demonstrates the use of a `group` in Glimmer (not to be confused with the logical radio group custom widget, this is just an alternative to `composite` that provides a border around content).
@@ -4030,6 +4015,22 @@ Hello, Table! Context Menu
 
 ![Hello Table](images/glimmer-hello-table-context-menu.png)
 
+#### Hello, Button!
+
+This sample demonstrates the use of `button` widget in Glimmer, including data-binding and click event triggering via `on_widget_selected`.
+
+Code:
+
+[samples/hello/hello_button.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_button.rb)
+
+Hello, Button!
+
+![Hello Button](images/glimmer-hello-button.png)
+
+Hello, Button! Incremented 7 times!
+
+![Hello Button Incremented](images/glimmer-hello-button-incremented.png)
+
 ### Elaborate Samples
 
 For more elaborate samples, check the following:
@@ -4423,4 +4424,4 @@ Copyright (c) 2007-2020 - Andy Maleh.
 
 --
 
-[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 />](https://github.com/AndyObtiva/glimmer) Built for [Glimmer](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library).
+[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 />](https://github.com/AndyObtiva/glimmer) Built for [Glimmer](https://github.com/AndyObtiva/glimmer) (DSL Framework).

data/VERSION

@@ -1 +1 @@
-4.17.10.0
+4.17.10.5

data/glimmer-dsl-swt.gemspec

@@ -2,17 +2,17 @@
 # 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.10.0 ruby lib
+# stub: glimmer-dsl-swt 4.17.10.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.17.10.0"
+  s.version = "4.17.10.5"
 
   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-11-10"
-  s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Library)".freeze
+  s.date = "2020-12-09"
+  s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
   s.extra_rdoc_files = [
@@ -131,6 +131,7 @@ Gem::Specification.new do |s|
     "samples/elaborate/tic_tac_toe/cell.rb",
     "samples/elaborate/user_profile.rb",
     "samples/hello/hello_browser.rb",
+    "samples/hello/hello_button.rb",
     "samples/hello/hello_checkbox.rb",
     "samples/hello/hello_checkbox_group.rb",
     "samples/hello/hello_combo.rb",
@@ -172,7 +173,7 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.2"])
+    s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.5"])
     s.add_runtime_dependency(%q<super_module>.freeze, ["~> 1.4.1"])
     s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, ["~> 0.3.0"])
     s.add_runtime_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.2"])
@@ -182,7 +183,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])
     s.add_runtime_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
     s.add_runtime_dependency(%q<text-table>.freeze, [">= 1.2.4", "< 2.0.0"])
-    s.add_runtime_dependency(%q<rouge>.freeze, [">= 3.23.0", "< 4.0.0"])
+    s.add_runtime_dependency(%q<rouge>.freeze, [">= 3.25.0", "< 4.0.0"])
     s.add_development_dependency(%q<juwelier>.freeze, [">= 2.4.9", "< 3.0.0"])
     s.add_development_dependency(%q<warbler>.freeze, [">= 2.0.5", "< 3.0.0"])
     s.add_development_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])
@@ -191,7 +192,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
     s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
   else
-    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.2"])
+    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.5"])
     s.add_dependency(%q<super_module>.freeze, ["~> 1.4.1"])
     s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, ["~> 0.3.0"])
     s.add_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.2"])
@@ -201,7 +202,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<os>.freeze, [">= 1.0.0", "< 2.0.0"])
     s.add_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
     s.add_dependency(%q<text-table>.freeze, [">= 1.2.4", "< 2.0.0"])
-    s.add_dependency(%q<rouge>.freeze, [">= 3.23.0", "< 4.0.0"])
+    s.add_dependency(%q<rouge>.freeze, [">= 3.25.0", "< 4.0.0"])
     s.add_dependency(%q<juwelier>.freeze, [">= 2.4.9", "< 3.0.0"])
     s.add_dependency(%q<warbler>.freeze, [">= 2.0.5", "< 3.0.0"])
     s.add_dependency(%q<rspec-mocks>.freeze, ["~> 3.5.0"])

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -38,16 +38,16 @@ module Glimmer
         @model_binding = model_binding
         @table.swt_widget.data = @model_binding
         @column_properties = column_properties
+        @table.on_widget_disposed do |dispose_event|
+          unregister_all_observables
+        end
         if @table.respond_to?(:column_properties=)
           @table.column_properties = @column_properties
         else # assume custom widget
           @table.body_root.column_properties = @column_properties
         end
-        call(@model_binding.evaluate_property)
         @table_observer_registration = observe(model_binding)
-        @table.on_widget_disposed do |dispose_event|
-          unregister_all_observables
-        end
+        call
       end
 
       def call(new_model_collection=nil)
@@ -65,7 +65,7 @@ module Glimmer
       end
       
       def populate_table(model_collection, parent, column_properties)
-        selected_table_item_models = parent.swt_widget.getSelection.map(&:getData)
+        selected_table_item_models = parent.swt_widget.getSelection.map(&:get_data)
         parent.finish_edit!
         parent.swt_widget.items.each(&:dispose)
         parent.swt_widget.removeAll
@@ -74,11 +74,10 @@ module Glimmer
           for index in 0..(column_properties.size-1)
             table_item.setText(index, model.send(column_properties[index]).to_s)
           end
-          table_item.setData(model)
+          table_item.set_data(model)
         end
-        selected_table_items = parent.search {|item| selected_table_item_models.include?(item.getData) }
-        selected_table_items = [parent.swt_widget.getItems.first].to_java(TableItem) if selected_table_items.empty? && !parent.swt_widget.getItems.empty?
-        parent.swt_widget.setSelection(selected_table_items) unless selected_table_items.empty?
+        selected_table_items = parent.search {|item| selected_table_item_models.include?(item.get_data) }
+        parent.swt_widget.setSelection(selected_table_items)
         parent.sort!
         parent.swt_widget.redraw if parent&.swt_widget&.respond_to?(:redraw)
       end

data/lib/glimmer/data_binding/tree_items_binding.rb

@@ -1,5 +1,5 @@
 # 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
@@ -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
@@ -69,7 +69,7 @@ module Glimmer
         old_tree_item_expansion_by_data = old_tree_items.reduce({}) {|hash, ti| hash.merge(ti.getData => ti.getExpanded)}
         old_tree_items.each do |tree_item|
           tree_item.getData('observer_registrations').each(&:unregister)
-        end        
+        end
         parent.swt_widget.items.each(&:dispose)
         parent.swt_widget.removeAll
         populate_tree_node(model_tree_root_node, parent.swt_widget, tree_properties)
@@ -85,9 +85,9 @@ module Glimmer
           array + [observe(model_tree_node, key_value_pair.last)]
         end
         
-        tree_item.setData('observer_registrations', observer_registrations)
-        tree_item.setData(model_tree_node)
-        tree_item.setText((model_tree_node && model_tree_node.send(tree_properties[:text])).to_s)
+        tree_item.set_data('observer_registrations', observer_registrations)
+        tree_item.set_data(model_tree_node)
+        tree_item.text = (model_tree_node && model_tree_node.send(tree_properties[:text])).to_s
         [model_tree_node && model_tree_node.send(tree_properties[:children])].flatten.to_a.compact.each do |child|
           populate_tree_node(child, tree_item, tree_properties)
         end

data/lib/glimmer/launcher.rb

@@ -1,5 +1,5 @@
 # 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
@@ -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
@@ -31,12 +31,12 @@ module Glimmer
     OPERATING_SYSTEMS_SUPPORTED = ["mac", "windows", "linux"]
     
     TEXT_USAGE = <<~MULTI_LINE_STRING
-      Glimmer (Ruby Desktop Development GUI Library) - JRuby Gem: glimmer-dsl-swt v#{File.read(File.expand_path('../../../VERSION', __FILE__))}      
+      Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v#{File.read(File.expand_path('../../../VERSION', __FILE__))}
       Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
     
-      Runs Glimmer applications and tasks.    
+      Runs Glimmer applications and tasks.
     
-      When applications are specified, they are run using JRuby, 
+      When applications are specified, they are run using JRuby,
       automatically preloading the glimmer Ruby gem and SWT jar dependency.
     
       Optionally, extra Glimmer options, JRuby options, and/or environment variables may be passed in.
@@ -112,7 +112,7 @@ module Glimmer
       def launch(application, jruby_options: [], env_vars: {}, glimmer_options: {})
         jruby_options_string = jruby_options.join(' ') + ' ' if jruby_options.any?
         env_vars = env_vars.merge(glimmer_option_env_vars(glimmer_options))
-        env_vars_string = env_vars.map do |k,v| 
+        env_vars_string = env_vars.map do |k,v|
           if OS.windows? && ENV['PROMPT'] # detect command prompt (or powershell)
             "set #{k}=#{v} && "
           else
@@ -224,8 +224,8 @@ module Glimmer
           task_name = task.name_with_args.sub('glimmer:', '')
           line = "glimmer #{task_name.ljust(max_task_size)} # #{task.comment}"
           bound = TTY::Screen.width - 6
-          line.size <= bound ? line : "#{line[0..(bound - 3)]}..."          
-        end    
+          line.size <= bound ? line : "#{line[0..(bound - 3)]}..."
+        end
       end
     end
 

data/lib/glimmer/swt/styled_text_proxy.rb

@@ -1,5 +1,5 @@
 # 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
@@ -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
@@ -27,17 +27,12 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class StyledTextProxy < WidgetProxy
-      def set_attribute(attribute_name, *args)
-        if attribute_name.to_s == 'selection'
-          if args.first
-            async_exec { @swt_widget.setCaretOffset(args.first.x) }
-            async_exec { @swt_widget.setSelection(args.first) }
-          end
-        else
-          super(attribute_name, *args)
-        end
+      def initialize(*args)
+        super
+        on_modify_text { |event|
+          @last_modify_text = text
+        }
       end
-      
     end
   end
 end

data/lib/glimmer/swt/table_proxy.rb

@@ -245,7 +245,7 @@ module Glimmer
         end
       end
       
-      attr_reader :table_editor, :table_editor_widget_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block, :additional_sort_properties, :editor, :editable, :initial_sort_property
+      attr_reader :table_editor, :table_editor_widget_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block, :additional_sort_properties, :editor, :editable
       attr_accessor :column_properties
       alias editable? editable
       
@@ -353,19 +353,6 @@ module Glimmer
         @additional_sort_properties = args unless args.empty?
       end
       
-      def editor=(args)
-        @editor = args
-      end
-      
-      def cells_for(model)
-        column_properties.map {|property| model.send(property)}
-      end
-      
-      def cells
-        column_count = @table.column_properties.size
-        swt_widget.items.map {|item| column_count.times.map {|i| item.get_text(i)} }
-      end
-      
       def sort!
         return unless sort_property && (sort_type || sort_block || sort_by_block)
         array = model_binding.evaluate_property
@@ -395,6 +382,19 @@ module Glimmer
         model_binding.call(sorted_array)
       end
       
+      def editor=(args)
+        @editor = args
+      end
+      
+      def cells_for(model)
+        column_properties.map {|property| model.send(property)}
+      end
+      
+      def cells
+        column_count = @table.column_properties.size
+        swt_widget.items.map {|item| column_count.times.map {|i| item.get_text(i)} }
+      end
+            
       # Performs a search for table items matching block condition
       # If no condition block is passed, returns all table items
       # Returns a Java TableItem array to easily set as selection on org.eclipse.swt.Table if needed

data/lib/glimmer/swt/widget_proxy.rb

@@ -357,35 +357,52 @@ module Glimmer
               }
             end,
             :caret_position => lambda do |observer|
+              on_caret_moved { |event|
+                observer.call(@swt_widget.getSelection.x) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
+              }
               on_swt_keyup { |event|
-                observer.call(@swt_widget.getCaretOffset)
+                observer.call(@swt_widget.getSelection.x) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
               on_swt_mouseup { |event|
-                observer.call(@swt_widget.getCaretOffset)
+                observer.call(@swt_widget.getSelection.x) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
             :caret_offset => lambda do |observer|
+              on_caret_moved { |event|
+                observer.call(@swt_widget.getCaretOffset) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
+              }
+            end,
+            :selection => lambda do |observer|
+              on_widget_selected { |event|
+                observer.call(@swt_widget.getSelection) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
+              }
               on_swt_keyup { |event|
-                observer.call(@swt_widget.getCaretOffset)
+                observer.call(@swt_widget.getSelection) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
               on_swt_mouseup { |event|
-                observer.call(@swt_widget.getCaretOffset)
+                observer.call(@swt_widget.getSelection) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
-            :selection => lambda do |observer|
+            :selection_count => lambda do |observer|
+              on_widget_selected { |event|
+                observer.call(@swt_widget.getSelectionCount) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
+              }
               on_swt_keyup { |event|
-                observer.call(@swt_widget.getSelection) unless @swt_widget.getSelection.x == 0 && @swt_widget.getSelection.y == 0
+                observer.call(@swt_widget.getSelectionCount) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
               on_swt_mouseup { |event|
-                observer.call(@swt_widget.getSelection) unless @swt_widget.getSelection.x == 0 && @swt_widget.getSelection.y == 0
+                observer.call(@swt_widget.getSelectionCount) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
-            :selection_count => lambda do |observer|
+            :selection_range => lambda do |observer|
+              on_widget_selected { |event|
+                observer.call(@swt_widget.getSelectionRange) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
+              }
               on_swt_keyup { |event|
-                observer.call(@swt_widget.getSelectionCount)
+                observer.call(@swt_widget.getSelectionRange) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
               on_swt_mouseup { |event|
-                observer.call(@swt_widget.getSelectionCount)
+                observer.call(@swt_widget.getSelectionRange) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
             :top_index => lambda do |observer|
@@ -714,14 +731,17 @@ module Glimmer
             setter: {name: 'setFocus', invoker: lambda { |widget, args| @swt_widget.setFocus if args.first }},
           },
           'caret_position' => {
-            getter: {name: 'getCaretPosition', invoker: lambda { |widget, args| @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getCaretOffset}},
-            setter: {name: 'setSelection', invoker: lambda { |widget, args| @swt_widget.setSelection(args.first) if args.first }},
+            getter: {name: 'getCaretPosition', invoker: lambda { |widget, args| @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getSelection.x}},
+            setter: {name: 'setSelection', invoker: lambda { |widget, args| @swt_widget.setSelection(args.first, args.first + @swt_widget.getSelectionCount) if args.first }},
           },
           'selection_count' => {
             getter: {name: 'getSelectionCount'},
             setter: {name: 'setSelection', invoker: lambda { |widget, args|
-              caret_position = @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getCaretOffset
-              @swt_widget.setSelection(caret_position, caret_position + args.first) if args.first
+              if args.first
+                caret_position = @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getSelection.x
+                # TODO handle negative length
+                @swt_widget.setSelection(caret_position, caret_position + args.first)
+              end
             }},
           },
         }

data/samples/hello/hello_button.rb

@@ -0,0 +1,46 @@
+# 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 HelloButton
+  include Glimmer
+  
+  attr_accessor :count
+  
+  def initialize
+    @count = 0
+  end
+  
+  def launch
+    shell {
+      text 'Hello, Button!'
+      
+      button {
+        text bind(self, :count) {|value| "Click To Increment: #{value}  "}
+        
+        on_widget_selected {
+          self.count += 1
+        }
+      }
+    }.open
+  end
+end
+
+HelloButton.new.launch

data/samples/hello/hello_table.rb

@@ -100,10 +100,6 @@ class HelloTable
       def schedule=(new_schedule)
         @schedule = new_schedule
       end
-      
-      def selected_game=(new_game)
-        @selected_game = new_game
-      end
     end
     
     include Glimmer

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.17.10.0
+  version: 4.17.10.5
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.5
   name: glimmer
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -185,7 +185,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.23.0
+        version: 3.25.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -196,7 +196,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.23.0
+        version: 3.25.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -310,7 +310,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
-description: Glimmer DSL for SWT (JRuby Desktop Development GUI Library)
+description: Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
 email: andy.am@gmail.com
 executables:
 - glimmer
@@ -431,6 +431,7 @@ files:
 - samples/elaborate/tic_tac_toe/cell.rb
 - samples/elaborate/user_profile.rb
 - samples/hello/hello_browser.rb
+- samples/hello/hello_button.rb
 - samples/hello/hello_checkbox.rb
 - samples/hello/hello_checkbox_group.rb
 - samples/hello/hello_combo.rb