glimmer-dsl-swt 4.24.4.0 → 4.24.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81eb61402ae45b2e3782b9c10dc6b0374e39fb7f74351d2ed940719fbd6e4ec3
-  data.tar.gz: dfa93b670ddc363dd2dc602920d5e24510202b179f7e7740ee8abc50fc91eee4
+  metadata.gz: 1b47f7d900d7e9e17d688b2a87f6996e2a4e23f2aec2139b7d5efc03fc1837d7
+  data.tar.gz: 0dd67034463fa4193ebbb4c064f6d2dccfd26dde29d326fef69b8a12b80a04a6
 SHA512:
-  metadata.gz: 46bee26330ce88284c85f263b0db58dda6dfb76cd2d2f37938c881f6567d74cd0a514565625a6c21da53b91e119fd31185dda8b22626e357fb79612e9013f6fe
-  data.tar.gz: '049762158e8e4015ec1a157edd148212078a106b753b9ad4f6111ab49746fe2934471382b4c5c20d9ee00a9abca8d8c22866c1c3ecd7aa733ccc5aeb28eb6c7b'
+  metadata.gz: 5737d7b9ad280998dfe94b4e4df7879ee48ff805c2abb0bb1626a3d688684371c2aca03c0da8eb27e2011a4ab26e58f3e4c3a44154056d7197a66acfb89ef4c1
+  data.tar.gz: 05e8484a449adcbd19a4f1b4ba8644614032a272ec957770bbbc1c11cdbea8299fdeaed0ebcbf42df493280782d6b425ec4d967dca8f967a6fc1a1a95dbaeff2

data/CHANGELOG.md

@@ -1,7 +1,27 @@
 # Change Log
 
+## 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).
+
+## 4.24.4.2
+
+- `refined_table` filtering support
+- Ensure correct `refined_table` enablement of pagination buttons based on whether on first/last page or not
+- Display vertical scroll bar when setting `refined_table` `per_page` to a height value that results in table exceeding screen height
+- Support `refined_table` nested elements `first_button {}`, `previous_button {}`, `page_text {}`, `next_button {}`, `last_button {}` to customize every widget within.
+- Support `refined_table` attributes for accessing nested elements: `table_proxy`, `first_button_proxy`, `previous_button_proxy`, `page_text_proxy`, `next_button_proxy`, `last_button_proxy` to customize every widget within.
+
+## 4.24.4.1
+
+- Optimize `table` data-binding performance (improving paging performance in `refined_table`) by making observer registrations run asynchronously in a separate thread
+- Fix cleaning of old `table` data-binding observers (it was retaining some old observers after table updates)
+- Fix issue with ActiveSupport overriding Facets String `underscore`/`snakecase`/`titlecase`/`camelcase` methods with different incompatible implementations when loaded by a project (now, that is repaired automatically)
+
 ## 4.24.4.0
 
+- `refined_table` custom widget with pagination support (and future filtering support)
+- Hello, Refined Table! sample demonstrating `refined_table`
 - Save `WidgetBinding` instances on `WidgetProxy` objects via `widget_bindings` attribute
 - Support specifying `@children_owner` in any custom widget for which adding children will not add them under the `body_root` (e.g. a composite wrapping a table will designate the table as the `@children_owner` for adding `table_column`s)
 - Add explicit `shell_proxy` method to `Glimmer::UI::CustomWidget` that delegates to `body_root` to avoid annoying false negative error every time that method is called

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.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.24.4.3
 ## 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.0 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.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.
 
 **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.0
+jgem install glimmer-dsl-swt -v 4.24.4.3
 ```
 
 `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.0'
+gem 'glimmer-dsl-swt', '~> 4.24.4.3'
 ```
 
 And, then run:
@@ -389,7 +389,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.4.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.4.3
       
 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.0
+4.24.4.3

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -58,7 +58,7 @@ This guide should help you get started with Glimmer DSL for SWT. For more advanc
       - [Table Selection](#table-selection)
       - [Table Editing](#table-editing)
       - [Table Sorting](#table-sorting)
-      - [Refined Table with Pagination](#refined-table-with-pagination)
+      - [Refined Table](#refined-table)
     - [Tree](#tree)
     - [DateTime](#datetime)
   - [Observer](#observer)
@@ -4111,8 +4111,8 @@ This automatically leverages the SWT TableEditor custom class behind the scenes,
 passed table item text into something else.
 It automatically persists the change to `items` data-bound model on ENTER/FOCUS-OUT or cancels on ESC/NO-CHANGE.
 
-Note that `table` is designed to expect about 100 rows only, not more than that, or otherwise it will not offer a user-friendly experience due to requiring users to scroll through a lot of data.
-If you need to display a table with more than 100 rows, then you need to employ pagination. That is already supported in the [Refined Table (`refined_table`)](#refined-table-with-pagination) custom widget documented below.
+Note that `table` is useful with a maximum of about 100 rows only, not more than that, or otherwise it will not offer a user-friendly experience due to requiring users to scroll through a lot of data.
+If you need to display a table with more than 100 rows, then you need to employ pagination. That is already supported in the [Refined Table (`refined_table`)](#refined-table) custom widget documented below.
 
 ##### Table Item Properties
 
@@ -4241,7 +4241,7 @@ shell {
 
 Check out [Hello, Table!](/docs/reference/GLIMMER_SAMPLES.md#hello-table) for an actual example including table editors.
 
-[Are We There Yet?](#are-we-there-yet) is an actual production Glimmer application that takes full advantage of table capabilities, storing model data in a database via ActiveRecord. As such, it's an excellent demonstration of how to use Glimmer DSL for SWT with a database.
+[Are We There Yet?](#are-we-there-yet) is an actual production Glimmer application that takes full advantage of table capabilities, storing model data in a database via ActiveRecord and SQLite DB. As such, it's an excellent demonstration of how to use Glimmer DSL for SWT with a database. [Contact Manager](https://github.com/AndyObtiva/contact_manager) is an external sample application that also utilizes a table with ActiveRecord and SQLite DB. It comes with a [blog post](https://andymaleh.blogspot.com/2022/06/using-activerecord-with-sqlite-db-in.html?m=0) that provides a step by step guide on how to build such an application.
 
 ##### Table Sorting
 
@@ -4307,19 +4307,20 @@ Here is an explanation of the example above:
 
 `<= [model, :property, read_only_sort: true]` could be used with items to make sorting not propagate sorting changes to model.
 
-##### Refined Table with Pagination
+##### Refined Table
 
 **(ALPHA FEATURE)**
 
-`refined_table` is a custom widget that can handle very large amounts of data by applying pagination.
+`refined_table` is a custom widget that can handle very large amounts of data by applying pagination and filtering.
 
-Just use like a standard `table`, but data-bind models to a `model_array` property instead of `items`. `refined_table` will take care of the rest.
+Just use like a standard `table`, but data-bind models to the `model_array` property instead of `items`. `refined_table` will take care of the rest.
 
 Options:
 - `per_page` (default: `10`): specifies how many rows to display per page
 - `page` (default: `1` if table is filled and `0` otherwise): specifies initial page
+- `query` (default: `''`): specifies filter query term (empty shows all results)
 
-Note that currently `refined_table` only supports displaying a **read-only** table (meaning it can read updates from the model, but it cannot write back to the model through table editing cells).
+Note that currently `refined_table` only supports displaying a **read-only** table (meaning it can read updates from the model, but it cannot write back to the model through `TableEditor` cells). Also, it does not support selection or sorting by clicking columns yet.
 
 Example taken from [Hello, Refined Table!](/docs/reference/GLIMMER_SAMPLES.md#hello-refined-table):
 

data/docs/reference/GLIMMER_SAMPLES.md

@@ -783,7 +783,7 @@ Hello, Table! Game Booked Rows
 
 #### Hello, Refined Table!
 
-This sample demonstrates the use of the [`refined_table` widget](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#refined-table-with-pagination), which provides a paginated `table` that can handle very large amounts of data.
+This sample demonstrates the use of the [`refined_table` widget](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#refined-table), which provides a paginated `table` that can handle very large amounts of data.
 
 Code:
 

data/lib/ext/glimmer.rb

@@ -27,6 +27,11 @@ module Glimmer
       if Object.const_defined?(:ActiveSupport) && ActiveSupport.const_defined?(:Dependencies)
         begin
           ActiveSupport::Dependencies.unhook!
+          # override activesupport string method implementations if already loaded
+          gem 'facets'
+          load 'facets/string/snakecase.rb'
+          load 'facets/string/titlecase.rb'
+          load 'facets/string/camelcase.rb'
         rescue => e
           # noop TODO support logging unimportant details below debug level
         end

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -37,9 +37,12 @@ module Glimmer
       include_package 'org.eclipse.swt.widgets'
       
       TABLE_ITEM_PROPERTIES = %w[background foreground font image]
+      
+      attr_reader :data_binding_done
 
       def initialize(parent, model_binding, column_properties = nil)
         @table = parent.is_a?(Glimmer::SWT::TableProxy) ? parent : parent.body_root # assume custom widget in latter case
+        @table.table_items_binding = self
         @model_binding = model_binding
         @read_only_sort = @model_binding.binding_options[:read_only_sort]
         @table.editable = false if @model_binding.binding_options[:read_only]
@@ -81,35 +84,43 @@ module Glimmer
           else
             if new_model_collection and new_model_collection.is_a?(Array)
               @model_observer_registrations ||= {}
-              new_model_collection.each do |model|
-                @model_observer_registrations[model] ||= {}
-                @column_properties.each do |column_property|
-                  old_model_observer_registration = @model_observer_registrations[model][column_property]
-                  remove_dependent(@table_observer_registration => old_model_observer_registration) if old_model_observer_registration
-                  old_model_observer_registration&.unobserve
-                  model_observer_registration = observe(model, column_property)
-                  @model_observer_registrations[model][column_property] = model_observer_registration
-                  add_dependent(@table_observer_registration => model_observer_registration)
-                end
-              end
-
-              if !same_model_collection_with_different_sort?(new_model_collection)
-                new_model_collection.each do |model|
-                  TABLE_ITEM_PROPERTIES.each do |table_item_property|
+              @table_item_property_observation_mutex ||= Mutex.new
+              
+              brand_new_model_collection = !same_model_collection_with_different_sort?(new_model_collection)
+              
+              Thread.new do
+                @data_binding_done = false
+                @table_item_property_observation_mutex.synchronize do
+                  deregister_model_observer_registrations
+                
+                  new_model_collection.each_with_index do |model, model_index|
+                    @model_observer_registrations[model_index] ||= {}
                     @column_properties.each do |column_property|
-                      column_property = "#{column_property}_#{table_item_property}"
-                      old_model_observer_registration = @model_observer_registrations[model][column_property]
-                      remove_dependent(@table_observer_registration => old_model_observer_registration) if old_model_observer_registration
-                      old_model_observer_registration&.unobserve
                       model_observer_registration = observe(model, column_property)
-                      @model_observer_registrations[model][column_property] = model_observer_registration
+                      @model_observer_registrations[model_index][column_property] = model_observer_registration
                       add_dependent(@table_observer_registration => model_observer_registration)
                     end
                   end
+    
+                  if brand_new_model_collection
+                    new_model_collection.each_with_index do |model, model_index|
+                      TABLE_ITEM_PROPERTIES.each do |table_item_property|
+                        @column_properties.each do |column_property|
+                          column_property = "#{column_property}_#{table_item_property}"
+                          model_observer_registration = observe(model, column_property)
+                          @model_observer_registrations[model_index][column_property] = model_observer_registration
+                          add_dependent(@table_observer_registration => model_observer_registration)
+                        end
+                      end
+                    end
+                  end
+                  @data_binding_done = true
                 end
               end
               
               @model_collection = new_model_collection
+            else
+              @model_collection = []
             end
             
             populate_table(@model_collection, @table, @column_properties, internal_sort: internal_sort)
@@ -214,6 +225,17 @@ module Glimmer
         @table.swt_widget.items.map(&:get_data)
       end
       
+      def deregister_model_observer_registrations
+        @model_observer_registrations&.dup&.each do |model_index, model_column_properties|
+          model_column_properties.dup.each do |column_property, model_observer_registration|
+            remove_dependent(@table_observer_registration => model_observer_registration) if model_observer_registration
+            model_observer_registration&.unobserve
+            model_column_properties.delete(column_property)
+          end
+          @model_observer_registrations.delete(model_index)
+        end
+      end
+      
       def model_collection_attribute_values(model_collection)
         model_collection.map do |model|
           (["text"] + TABLE_ITEM_PROPERTIES).map do |table_item_property|

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

@@ -31,12 +31,16 @@ module Glimmer
         option :per_page, default: 10
         option :page, default: 0
         option :model_array
+        option :query, default: ''
         
+        attr_accessor :filtered_model_array
         attr_accessor :refined_model_array
-        attr_reader :table_proxy, :page_text_proxy
+        attr_reader :table_proxy, :page_text_proxy, :first_button_proxy, :previous_button_proxy, :next_button_proxy, :last_button_proxy
         
         before_body do
+          self.query ||= ''
           self.model_array ||= []
+          self.filtered_model_array = []
           self.refined_model_array = []
         end
         
@@ -47,12 +51,12 @@ module Glimmer
                 @data_bound = true
                 model_binding = new_widget_binding.model_binding
                 observe(self, :model_array) do
-                  paginate
+                  filter_and_paginate
                 end
                 @table_proxy.content {
                   items(dsl: true) <=> [self, :refined_model_array, model_binding.binding_options.merge(read_only: true)]
                 }
-                paginate
+                filter_and_paginate
               end
             end
           end.observe(body_root.widget_bindings)
@@ -60,76 +64,112 @@ module Glimmer
         
         body {
           composite {
-            composite {
+            text(:search, :border) {
               layout_data(:fill, :center, true, false)
               
-              fill_layout(:horizontal)
+              text <=> [self, :query, after_write: -> { filter_and_paginate }]
+            }
+            
+            pagination
+            
+            @children_owner = @table_proxy = table(swt_style) {
+              layout_data(:fill, :fill, true, true)
+            }
+          }
+        }
+        
+        def pagination
+          composite {
+            layout_data(:fill, :center, true, false)
+            
+            fill_layout(:horizontal)
+            
+            @first_button_proxy = button {
+              text '<<'
+              enabled <= [self, :page, on_read: ->(value) {value > first_page}]
               
-              button {
-                text '<<'
-                
-                on_widget_selected do
-                  self.page = first_page
-                  paginate
-                end
-              }
+              on_widget_selected do
+                self.page = first_page
+                filter_and_paginate
+              end
+            }
+            
+            @previous_button_proxy = button {
+              text '<'
+              enabled <= [self, :page, on_read: ->(value) {value > first_page}]
               
-              button {
-                text '<'
-                
-                on_widget_selected do
-                  self.page -= 1
-                  paginate
-                end
-              }
+              on_widget_selected do
+                self.page -= 1
+                filter_and_paginate
+              end
+            }
+            
+            @page_text_proxy = text(:border, :center) {
+              text <= [self, :page, on_read: ->(value) { "#{value} of #{page_count}" }]
               
-              @page_text_proxy = text(:border, :center) {
-                text <= [self, :page, on_read: ->(value) { "#{value} of #{page_count}" }]
-                
-                on_focus_gained do
-                  @page_text_proxy.select_all
-                end
-                
-                on_focus_lost do
-                  self.page = @page_text_proxy.text.to_i
-                  paginate
-                end
-                
-                on_key_pressed do |key_event|
-                  if key_event.keyCode == swt(:cr)
-                    self.page = @page_text_proxy.text.to_i
-                    paginate
-                  end
-                end
-              }
+              on_focus_gained do
+                @page_text_proxy.select_all
+              end
               
-              button {
-                text '>'
-                
-                on_widget_selected do
-                  self.page += 1
-                  paginate
-                end
-              }
+              on_focus_lost do
+                self.page = @page_text_proxy.text.to_i
+                filter_and_paginate
+              end
               
-              button {
-                text '>>'
-                
-                on_widget_selected do
-                  self.page = last_page
-                  paginate
+              on_key_pressed do |key_event|
+                if key_event.keyCode == swt(:cr)
+                  self.page = @page_text_proxy.text.to_i
+                  filter_and_paginate
                 end
-              }
+              end
             }
             
-            @children_owner = @table_proxy = table(swt_style)
+            @next_button_proxy = button {
+              text '>'
+              enabled <= [self, :page, on_read: ->(value) {value < last_page}]
+              
+              on_widget_selected do
+                self.page += 1
+                filter_and_paginate
+              end
+            }
+            
+            @last_button_proxy = button {
+              text '>>'
+              enabled <= [self, :page, on_read: ->(value) {value < last_page}]
+              
+              on_widget_selected do
+                self.page = last_page
+                filter_and_paginate
+              end
+            }
           }
-        }
+        end
         
         def table_block=(block)
           @table_proxy.content(&block)
         end
         
+        def page_text_block=(block)
+          @page_text_proxy.content(&block)
+        end
+        
+        def first_button_block=(block)
+          @first_button_proxy.content(&block)
+        end
+        
+        def previous_button_block=(block)
+          @previous_button_proxy.content(&block)
+        end
+        
+        def next_button_block=(block)
+          @next_button_proxy.content(&block)
+        end
+        
+        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
@@ -153,28 +193,41 @@ module Glimmer
         end
         
         def page_count
-          (model_array && (model_array.count / per_page.to_f).ceil) || 0
+          (filtered_model_array && (filtered_model_array.count / per_page.to_f).ceil) || 0
         end
         
         def corrected_page(initial_page_value = nil)
           correct_page = initial_page_value || page
           correct_page = [correct_page, page_count].min
           correct_page = [correct_page, 1].max
-          correct_page = (model_array&.count.to_i > 0) ? (correct_page > 0 ? correct_page : 1) : 0
+          correct_page = (filtered_model_array&.count.to_i > 0) ? (correct_page > 0 ? correct_page : 1) : 0
           correct_page
         end
         
         def first_page
-          (model_array&.count.to_i > 0) ? 1 : 0
+          (filtered_model_array&.count.to_i > 0) ? 1 : 0
         end
         
         def last_page
           page_count
         end
         
+        def filter_and_paginate
+          filter
+          paginate
+        end
+        
+        def filter
+          self.filtered_model_array = model_array.select do |model|
+            @table_proxy.cells_for(model).any? do |cell_text|
+              cell_text.to_s.downcase.include?(query.to_s.downcase)
+            end
+          end
+        end
+        
         def paginate
           self.page = corrected_page(page)
-          self.refined_model_array = model_array[(page - 1) * per_page, per_page]
+          self.refined_model_array = filtered_model_array[(page - 1) * per_page, per_page]
         end
       end
     end

data/lib/glimmer/swt/table_proxy.rb

@@ -247,6 +247,7 @@ module Glimmer
       
       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_writer :column_properties
+      attr_accessor :table_items_binding
       alias column_attributes= column_properties=
       alias editable? editable
       

data/samples/elaborate/contact_manager.rb

@@ -122,7 +122,7 @@ class ContactManager
           }
         }
 
-        table(:editable, :multi) { |table_proxy|
+        table(:editable, :border) { |table_proxy|
           layout_data {
             horizontal_alignment :fill
             vertical_alignment :fill

data/samples/elaborate/klondike_solitaire/model/dealing_pile.rb

@@ -23,7 +23,7 @@ class KlondikeSolitaire
         else
           @game.dealt_pile.push!(playing_card)
         end
-    end
+      end
       
       def playing_cards
         @playing_cards ||= []

data/samples/elaborate/klondike_solitaire/view/column_pile.rb

@@ -27,7 +27,6 @@ class KlondikeSolitaire
               card_source_model = card_parent_pile.model
               cards = card_source_model.remove!(card)
               cards[1..-1].each { |card| model.add!(card) } if cards.is_a?(Array) # if it is a column pile
-              drop_event.dragged_shape.dispose
             rescue => e
               Glimmer::Config.logger.debug { "Error encountered on drop of a card to a column pile: #{e.full_message}" }
               drop_event.doit = false

data/samples/elaborate/klondike_solitaire/view/dealing_pile.rb

@@ -28,6 +28,10 @@ class KlondikeSolitaire
       body {
         shape(pile_x, pile_y) {
           hidden_playing_card
+          
+          on_mouse_up do |event|
+            model.deal!
+          end
         }
       }
   

data/samples/elaborate/klondike_solitaire/view/dealt_pile.rb

@@ -18,11 +18,9 @@ class KlondikeSolitaire
               empty_playing_card
             }
           else
-            body_root.shapes.each { |shape| shape.drag_source = false }
             before_last_shape = body_root.shapes[-2] && body_root.shapes[-2].get_data('custom_shape').respond_to?(:model) && body_root.shapes[-2].get_data('custom_shape').model
             if model.playing_cards.last == before_last_shape # happens when dragging card out
               body_root.shapes.last.dispose
-              body_root.shapes.last.drag_source = true
             else
               body_root.content {
                 playing_card(model: model.playing_cards.last, parent_pile: self) {

data/samples/elaborate/klondike_solitaire/view/foundation_pile.rb

@@ -42,7 +42,6 @@ class KlondikeSolitaire
               raise 'Cannot accept multiple cards' if card_source_model.playing_cards.index(card) != (card_source_model.playing_cards.size - 1)
               model.add!(card)
               card_source_model.remove!(card)
-              drop_event.dragged_shape.dispose
             rescue => e
               Glimmer::Config.logger.debug { "Error encountered on drop of a card to a foundation pile: #{e.full_message}" }
               drop_event.doit = false

data/samples/elaborate/klondike_solitaire/view/tableau.rb

@@ -27,12 +27,6 @@ class KlondikeSolitaire
           @column_piles = 7.times.map do |n|
             column_pile(pile_x: MARGIN + n*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING), pile_y: PLAYING_CARD_HEIGHT + PLAYING_CARD_SPACING, model: game.column_piles[n])
           end
-          
-          on_mouse_up do |event|
-            if @dealing_pile.body_root.include?(event.x, event.y)
-              game.dealing_pile.deal!
-            end
-          end
         }
       }
   

data/samples/elaborate/klondike_solitaire.rb

@@ -1,3 +1,24 @@
+# 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
+# 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'
 
 require_relative 'klondike_solitaire/model/game'

data/samples/elaborate/meta_sample/tutorials.yml

@@ -30,3 +30,4 @@ Hello, Custom Widget!: aJHLo5yLDZc
 Hello, Custom Shell!: c8Eb8GWM_XQ
 Hello, Custom Shape!: H3J8ecp30Ak
 Battleship: b00OWeLZOt8
+Klondike Solitaire: qOzgiz9X3sI

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.24.4.0
+  version: 4.24.4.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -344,17 +344,17 @@ dependencies:
         version: 0.14.1.cr2
 description: Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI
   cross-platform desktop development library written in JRuby, an OS-threaded faster
-  JVM version of Ruby. It includes SWT 4.22 (released November 24, 2021). Glimmer's
-  main innovation is a declarative Ruby DSL that enables productive and efficient
-  authoring of desktop application user-interfaces by relying on the robust Eclipse
-  SWT library. Glimmer additionally innovates by having built-in data-binding support,
-  which greatly facilitates synchronizing the GUI with domain models, thus achieving
-  true decoupling of object oriented components and enabling developers to solve business
-  problems (test-first) without worrying about GUI concerns, or alternatively drive
-  development GUI-first, and then write clean business models (test-first) afterwards.
-  Not only does Glimmer provide a large set of GUI widgets, but it also supports drawing
-  Canvas Graphics like Shapes and Animations. To get started quickly, Glimmer offers
-  scaffolding options for Apps, Gems, and Custom Widgets. Glimmer also includes native-executable
+  JVM version of Ruby. It includes SWT 4.24 (released June 7, 2022). Glimmer's main
+  innovation is a declarative Ruby DSL that enables productive and efficient authoring
+  of desktop application user-interfaces by relying on the robust Eclipse SWT library.
+  Glimmer additionally innovates by having built-in data-binding support, which greatly
+  facilitates synchronizing the GUI with domain models, thus achieving true decoupling
+  of object oriented components and enabling developers to solve business problems
+  (test-first) without worrying about GUI concerns, or alternatively drive development
+  GUI-first, and then write clean business models (test-first) afterwards. Not only
+  does Glimmer provide a large set of GUI widgets, but it also supports drawing Canvas
+  Graphics like Shapes and Animations. To get started quickly, Glimmer offers scaffolding
+  options for Apps, Gems, and Custom Widgets. Glimmer also includes native-executable
   packaging support, sorely lacking in other libraries, thus enabling the delivery
   of desktop apps written in Ruby as truly native DMG/PKG/APP files on the Mac, MSI/EXE
   files on Windows, and DEB/RPM files on Linux. Glimmer was the first Ruby gem to