glimmer-dsl-swt 4.18.3.2 → 4.18.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed3de759196522f355d23f94734175e7bd1f5957b25637005d2b266f0868cd3d
-  data.tar.gz: 4cf0d426d9ab01d53de2c52246be5521bce14e963b1269568d8ecee6f0d01326
+  metadata.gz: 59c5aae689604e6024a5bffb1053cd50cc05c1598dca6fc3a01510f17371deab
+  data.tar.gz: 5fc97483b96bf334b1e25b30b8455ad41af3e6f56ae6f5310ac31504ce87c41d
 SHA512:
-  metadata.gz: f2a0569e88e07cedbd989aae075e1bf03721f88dc647906e1ce7c16492a59d129f282dd8ce53f535e76027cb402b3ea07a5b56d1ac8d2303dbdc468c1cd17741
-  data.tar.gz: d58989c1839bbe0d15e8fd8a96cdfb917a4c2a2bc9cc0382e2271ef40445b0b891d3ddd06e8f05b361535cfa57915e57e8cbbca0e2d19c2b2425670addfdbfba
+  metadata.gz: fdf5681c5632aa64d15c9e2037757d4e7599fbcaeacc14acc1af1dd1669c205ca7a8730551277ae0a3cff5bb435a802dcbdb824e7dbc749f75471ba15079e999
+  data.tar.gz: 5f96f41c1bdd491da20ae87ad1b2a5f072eeaca78c6e8f15a1a942390c2cc23b07259465452b242e0d61111a6881954458b5fe5214d77bfd4f45dd365ae0eb14

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+### 4.18.3.3
+
+- Support Table data binding read_only_sort: true option to allow visual sorting without affecting model data
+- Tetris Add lines and level to High Score Dialog
+- Tetris Immediate Drop on Arrow Up
+- Tetris Pause on showing High Score Dialog
+- Tetris Make High Scores -> Show a check menu item
+- Tetris Disable pause button upon showing High Score Dialog
+- Fix Quit Tetris CMD+Q shortcut by adding on_quit event to display
+- Tetris Fix escape button upon entering high score name
+- If WidgetBinding encounters a disposed widget, it deregisters all observables that it is observing
+
 ### 4.18.3.2
 
 - Tetris High Scores

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.18.3.2
+# [<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.18.3.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)
@@ -493,7 +493,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.3.2
+jgem install glimmer-dsl-swt -v 4.18.3.3
 
 
 ```
@@ -513,7 +513,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.18.3.2
+gem 'glimmer-dsl-swt', '~> 4.18.3.3
 '
 ```
 
@@ -572,7 +572,7 @@ bin/glimmer samples
 Below are the full usage instructions that come up when running `glimmer` without args.
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.3.2
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.3.3
 
 
       
@@ -1053,7 +1053,7 @@ Output:
                                                                          
   Css    glimmer-dsl-css    1.1.0     AndyMaleh    Glimmer DSL for CSS
   Opal   glimmer-dsl-opal   0.10.2     AndyMaleh    Glimmer DSL for Opal
-  Swt    glimmer-dsl-swt    4.18.3.2
+  Swt    glimmer-dsl-swt    4.18.3.3
 
   AndyMaleh    Glimmer DSL for SWT
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk
@@ -3025,6 +3025,7 @@ Here is an explanation of the example above:
 - Task Start Date table column has a custom sort comparator block
 - Additional (secondary) sort properties are applied when sorting by Task, Project, or Duration in the order specified
 
+`bind(model, :property, read_only_sort: true)` could be used with items to make sorting not propagate sorting changes to model.
 
 #### Tree
 
@@ -4860,6 +4861,8 @@ Code:
 
 ![Tetris Game Over](images/glimmer-tetris-game-over.png)
 
+![Tetris Game Over](images/glimmer-tetris-game-over-sorted-by-score.png)
+
 ![Tetris High Scores](images/glimmer-tetris-high-score-dialog.png)
 
 ![Tetris Game Menu](images/glimmer-tetris-game-menu.png)

data/VERSION

@@ -1 +1 @@
-4.18.3.2
+4.18.3.3

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.18.3.2 ruby lib
+# stub: glimmer-dsl-swt 4.18.3.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.3.2"
+  s.version = "4.18.3.3"
 
   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 = "2021-01-28"
+  s.date = "2021-01-29"
   s.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. 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 + App Store, MSI/EXE files on Windows, and Gem Packaged Shell Scripts on Linux.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -36,7 +36,9 @@ module Glimmer
       def initialize(parent, model_binding, column_properties)
         @table = parent
         @model_binding = model_binding
+        @read_only_sort = @model_binding.binding_options[:read_only_sort]
         @table.swt_widget.data = @model_binding
+        @table.swt_widget.set_data('table_items_binding', self)
         @column_properties = column_properties
         @table.on_widget_disposed do |dispose_event|
           unregister_all_observables
@@ -50,8 +52,8 @@ module Glimmer
         call
       end
 
-      def call(new_model_collection=nil)
-        new_model_collection = @model_binding.evaluate_property # this ensures applying converters (e.g. :on_read)
+      def call(new_model_collection=nil, internal_sort: false)
+        new_model_collection = model_binding_evaluated_property = @model_binding.evaluate_property unless internal_sort # this ensures applying converters (e.g. :on_read)
         table_cells = @table.swt_widget.items.map {|item| @table.column_properties.size.times.map {|i| item.get_text(i)} }
         model_cells = new_model_collection.to_a.map {|m| @table.cells_for(m)}
         return if table_cells == model_cells
@@ -61,10 +63,10 @@ module Glimmer
           add_dependent(@table_observer_registration => @table_items_observer_registration)
           @model_collection = new_model_collection
         end
-        populate_table(@model_collection, @table, @column_properties)
+        populate_table(@model_collection, @table, @column_properties, internal_sort: internal_sort)
       end
       
-      def populate_table(model_collection, parent, column_properties)
+      def populate_table(model_collection, parent, column_properties, internal_sort: false)
         selected_table_item_models = parent.swt_widget.getSelection.map(&:get_data)
         parent.finish_edit!
         parent.swt_widget.items.each(&:dispose)
@@ -78,7 +80,8 @@ module Glimmer
         end
         selected_table_items = parent.search {|item| selected_table_item_models.include?(item.get_data) }
         parent.swt_widget.setSelection(selected_table_items)
-        parent.sort!
+        sorted_model_collection = parent.sort!(internal_sort: internal_sort)
+        call(sorted_model_collection, internal_sort: true) if @read_only_sort && !internal_sort && !sorted_model_collection.nil?
         parent.swt_widget.redraw if parent&.swt_widget&.respond_to?(:redraw)
       end
     end

data/lib/glimmer/data_binding/widget_binding.rb

@@ -48,6 +48,10 @@ module Glimmer
         converted_value = translated_value = @translator.call(value)
       
         update_operation = lambda do
+          if @widget.respond_to?(:disposed?) && @widget.disposed?
+            unregister_all_observables
+            return
+          end
           @widget.set_attribute(@property, converted_value) unless evaluate_property == converted_value
         end
         if Config.auto_sync_exec? && Config.require_sync_exec?
@@ -58,6 +62,10 @@ module Glimmer
       end
       
       def evaluate_property
+        if @widget.respond_to?(:disposed?) && @widget.disposed?
+          unregister_all_observables
+          return
+        end
         @widget.get_attribute(@property)
       end
     end

data/lib/glimmer/swt/display_proxy.rb

@@ -40,7 +40,7 @@ module Glimmer
       
       include Custom::Drawable
       
-      OBSERVED_MENU_ITEMS = ['about', 'preferences']
+      OBSERVED_MENU_ITEMS = ['about', 'preferences', 'quit']
       
       class FilterListener
         include org.eclipse.swt.widgets.Listener

data/lib/glimmer/swt/shell_proxy.rb

@@ -124,8 +124,14 @@ module Glimmer
       end
       alias disposed disposed?
 
+      # Hides shell. Automatically checks if widget is disposed to avoid crashing.
       def hide
-        @swt_widget.setVisible(false)
+        @swt_widget.setVisible(false) unless @swt_widget.isDisposed
+      end
+      
+      # Closes shell. Automatically checks if widget is disposed to avoid crashing.
+      def close
+        @swt_widget.close unless @swt_widget.isDisposed
       end
 
       def visible?

data/lib/glimmer/swt/table_proxy.rb

@@ -273,6 +273,10 @@ module Glimmer
         swt_widget.data
       end
       
+      def table_items_binding
+        swt_widget.get_data('table_items_binding')
+      end
+      
       def sort_block=(comparator)
         @sort_block = comparator
       end
@@ -357,9 +361,9 @@ module Glimmer
         @additional_sort_properties = args unless args.empty?
       end
       
-      def sort!
+      def sort!(internal_sort: false)
         return unless sort_property && (sort_type || sort_block || sort_by_block)
-        array = model_binding.evaluate_property
+        original_array = array = model_binding.evaluate_property
         array = array.sort_by(&:hash) # this ensures consistent subsequent sorting in case there are equivalent sorts to avoid an infinite loop
         # Converting value to_s first to handle nil cases. Should work with numeric, boolean, and date fields
         if sort_block
@@ -383,7 +387,12 @@ module Glimmer
           end
         end
         sorted_array = sorted_array.reverse if sort_direction == :descending
-        model_binding.call(sorted_array)
+        if model_binding.binding_options.symbolize_keys[:read_only_sort]
+          table_items_binding.call(sorted_array, internal_sort: true) unless internal_sort
+        else
+          model_binding.call(sorted_array)
+        end
+        sorted_array
       end
       
       def editor=(args)

data/lib/glimmer/swt/widget_proxy.rb

@@ -547,6 +547,10 @@ module Glimmer
         @swt_widget.dispose
       end
 
+      def disposed?
+        @swt_widget.isDisposed
+      end
+
       # TODO Consider renaming these methods as they are mainly used for data-binding
 
       def can_add_observer?(property_name)
@@ -663,7 +667,7 @@ module Glimmer
           can_handle_observation_request?(method) ||
           swt_widget.respond_to?(method, *args, &block)
       end
-
+      
       private
 
       def style(underscored_widget_name, styles)

data/lib/glimmer/ui/custom_widget.rb

@@ -249,6 +249,10 @@ module Glimmer
       def attribute_setter(attribute_name)
         "#{attribute_name}="
       end
+      
+      def disposed?
+        swt_widget.isDisposed
+      end
 
       def has_style?(style)
         (swt_style & SWT::SWTProxy[style]) == SWT::SWTProxy[style]

data/samples/elaborate/tetris.rb

@@ -55,6 +55,8 @@ class Tetris
         case key_event.keyCode
         when swt(:arrow_down), 's'.bytes.first
           game.down!
+        when swt(:arrow_up)
+          game.down!(immediate: true)
         when swt(:arrow_left), 'a'.bytes.first
           game.left!
         when swt(:arrow_right), 'd'.bytes.first
@@ -65,8 +67,6 @@ class Tetris
           elsif key_event.keyLocation == swt(:left) # left shift key
             game.rotate!(:left)
           end
-        when swt(:arrow_up)
-          game.rotate!(:right)
         when swt(:ctrl)
           game.rotate!(:left)
         end
@@ -76,6 +76,10 @@ class Tetris
       @about_observer = on_about {
         show_about_dialog
       }
+      
+      @quit_observer = on_quit {
+        exit(0)
+      }
     }
   }
   
@@ -87,6 +91,13 @@ class Tetris
         start_moving_tetrominos_down
       end
     end
+    @show_high_scores_observer = observe(@game, :show_high_scores) do |show_high_scores|
+      if show_high_scores
+        show_high_score_dialog
+      else
+        @high_score_dialog.close unless @high_score_dialog.nil? || @high_score_dialog.disposed? || !@high_score_dialog.visible?
+      end
+    end
     @game.start!
   }
   
@@ -147,10 +158,11 @@ class Tetris
   end
   
   def deregister_observers
-    @show_high_scores_observer.deregister
-    @game_over_observer.deregister
-    @keyboard_listener.deregister
+    @show_high_scores_observer&.deregister
+    @game_over_observer&.deregister
+    @keyboard_listener&.deregister
     @about_observer&.deregister
+    @quit_observer&.deregister
   end
 end
 

data/samples/elaborate/tetris/model/game.rb

@@ -38,7 +38,7 @@ class Tetris
       SCORE_MULTIPLIER = {1 => 40, 2 => 100, 3 => 300, 4 => 1200}
       
       attr_reader :playfield_width, :playfield_height
-      attr_accessor :game_over, :paused, :preview_tetromino, :lines, :score, :level, :high_scores, :beeping, :added_high_score
+      attr_accessor :game_over, :paused, :preview_tetromino, :lines, :score, :level, :high_scores, :beeping, :added_high_score, :show_high_scores
       alias game_over? game_over
       alias paused? paused
       alias beeping? beeping
@@ -48,10 +48,11 @@ class Tetris
         @playfield_width = playfield_width
         @playfield_height = playfield_height
         @high_scores = []
+        @show_high_scores = false
         @beeping = true
         load_high_scores!
       end
-    
+      
       def configure_beeper(&beeper)
         @beeper = beeper
       end
@@ -61,6 +62,7 @@ class Tetris
       end
       
       def start!
+        self.show_high_scores = false
         self.paused = false
         self.level = 1
         self.score = 0
@@ -86,7 +88,7 @@ class Tetris
       
       def add_high_score!
         self.added_high_score = true
-        high_scores.prepend(PastGame.new("Player #{high_scores.count + 1}", score))
+        high_scores.prepend(PastGame.new("Player #{high_scores.count + 1}", score, lines, level))
       end
       
       def save_high_scores!
@@ -115,9 +117,9 @@ class Tetris
         File.join(tetris_dir, "high_scores.txt")
       end
       
-      def down!
+      def down!(immediate: false)
         return unless game_in_progress?
-        current_tetromino.down!
+        current_tetromino.down!(immediate: immediate)
         game_over! if current_tetromino.row <= 0 && current_tetromino.stopped?
       end
       
@@ -247,12 +249,13 @@ class Tetris
             
       def playfield_remaining_heights(tetromino = nil)
         @playfield_width.times.map do |playfield_column|
+          bottom_most_block = tetromino.bottom_most_block_for_column(playfield_column)
           (playfield.each_with_index.detect do |row, playfield_row|
             !row[playfield_column].clear? &&
             (
               tetromino.nil? ||
-              (bottom_most_block = tetromino.bottom_most_block_for_column(playfield_column)).nil? ||
-              (playfield_row > tetromino.row + bottom_most_block[:row])
+              bottom_most_block.nil? ||
+              (playfield_row > tetromino.row + bottom_most_block[:row_index])
             )
           end || [nil, @playfield_height])[1]
         end.to_a

data/samples/elaborate/tetris/model/past_game.rb

@@ -21,6 +21,6 @@
 
 class Tetris
   module Model
-    PastGame = Struct.new(:name, :score)
+    PastGame = Struct.new(:name, :score, :lines, :level)
   end
 end

data/samples/elaborate/tetris/model/tetromino.rb

@@ -93,8 +93,8 @@ class Tetris
         playfield_remaining_heights = game.playfield_remaining_heights(self)
         result = bottom_most_blocks.any? do |bottom_most_block|
           playfield_column = @column + bottom_most_block[:column_index]
-            playfield_remaining_heights[playfield_column] &&
-            @row + bottom_most_block[:row] >= playfield_remaining_heights[playfield_column] - 1
+          playfield_remaining_heights[playfield_column] &&
+            @row + bottom_most_block[:row_index] >= playfield_remaining_heights[playfield_column] - 1
         end
         if result && !game.hypothetical?
           @stopped = result
@@ -114,7 +114,7 @@ class Tetris
           bottom_most_block_row = row_blocks_with_row_index[1]
           {
             block: bottom_most_block,
-            row: bottom_most_block_row,
+            row_index: bottom_most_block_row,
             column_index: column_index
           }
         end
@@ -182,10 +182,15 @@ class Tetris
         @blocks.size
       end
       
-      def down!
+      def down!(immediate: false)
         launch! if preview?
         unless stopped?
-          new_row = @row + 1
+          block_count = 1
+          if immediate
+            remaining_height, bottom_touching_block = remaining_height_and_bottom_touching_block
+            block_count = remaining_height - @row
+          end
+          new_row = @row + block_count
           update_playfield(new_row, @column)
         end
       end
@@ -245,6 +250,14 @@ class Tetris
         end
       end
       
+      def remaining_height_and_bottom_touching_block
+        playfield_remaining_heights = game.playfield_remaining_heights(self)
+        bottom_most_blocks.map do |bottom_most_block|
+          playfield_column = @column + bottom_most_block[:column_index]
+          [playfield_remaining_heights[playfield_column] - (bottom_most_block[:row_index] + 1), bottom_most_block]
+        end.min_by(&:first)
+      end
+      
       def default_blocks
         case @letter
         when :I

data/samples/elaborate/tetris/view/high_score_dialog.rb

@@ -59,8 +59,14 @@ class Tetris
             table_column {
               text 'Score'
             }
+            table_column {
+              text 'Lines'
+            }
+            table_column {
+              text 'Level'
+            }
             
-            items bind(game, :high_scores), column_properties(:name, :score)
+            items bind(game, :high_scores, read_only_sort: true), column_properties(:name, :score, :lines, :level)
           }
           composite {
             row_layout :horizontal
@@ -77,15 +83,19 @@ class Tetris
               focus true # initial focus
               
               on_widget_selected {
-                close
+                async_exec { close }
+                game.paused = @game_paused
                 game.restart! if game.game_over?
               }
             }
           }
           
           on_swt_show {
+            @game_paused = game.paused?
+            game.paused = true
             if game.game_over? && game.added_high_score?
               game.added_high_score = false
+              game.save_high_scores!
               @high_score_table.edit_table_item(
                 @high_score_table.items.first, # row item
                 0, # column
@@ -101,7 +111,16 @@ class Tetris
           }
           
           on_shell_closed {
-            @high_score_table.cancel_edit!
+            # guard is needed because there is an observer in Tetris closing on
+            # game.show_high_scores change, which gets set below
+            unless @closing
+              @closing = true
+              @high_score_table.cancel_edit!
+              game.paused = @game_paused
+              game.show_high_scores = false
+            else
+              @closing = false
+            end
           }
           
           on_widget_disposed {

data/samples/elaborate/tetris/view/tetris_menu_bar.rb

@@ -43,7 +43,8 @@ class Tetris
             menu_item(:check) {
               text '&Pause'
               accelerator :command, :p
-              enabled bind(game, :game_over, on_read: :!)
+              enabled bind(game, :game_over, on_read: :!) {|value| value && !game.show_high_scores}
+              enabled bind(game, :show_high_scores, on_read: :!) {|value| value && !game.game_over}
               selection bind(game, :paused)
             }
             menu_item {
@@ -70,13 +71,10 @@ class Tetris
             
             menu {
               text '&High Scores'
-              menu_item {
+              menu_item(:check) {
                 text '&Show'
                 accelerator :command, :shift, :h
-                
-                on_widget_selected {
-                  parent_custom_shell&.show_high_score_dialog
-                }
+                selection bind(game, :show_high_scores)
               }
               menu_item {
                 text '&Clear'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.3.2
+  version: 4.18.3.3
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-28 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement