glimmer-dsl-swt 4.20.13.8 → 4.20.13.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59508a178a1694489ba4ec995672f08a0997b01c8ebaeb39cecd2db250d0f88b
-  data.tar.gz: 9610a96bf71aa15a581dedda77f9c11942286f1ff5f7ac96369624c97a798f28
+  metadata.gz: bec3c88dee81e6625c208ce0fe97f02984b27faa107bb5b1c0667612ada04cae
+  data.tar.gz: 4221c07f12ba4d2de558223a60546218a530c02cdb34e0d6c1a03b19b7a4ba6c
 SHA512:
-  metadata.gz: 1f2219231093b33e6c32637dd2a6ee2249e3c64daf3f92355c57ab170d15c6bfd4930d540c3703c0a4c926ff9e6c322ddc4dd119938be9bc23ccf19935c84675
-  data.tar.gz: 98c6a6e4b2f26fde8d9741eb04054866c145366c27a728343f71f6f960c5eba411fa127167101da055d96241b3c66fb7c7d8dbba91256fa9688d694165158cdc
+  metadata.gz: 1c555e4e44ae1ca8933a35d2316bc8711d4888483b0f6ff3a90d372e7f25f3b66b9ac114239f5970e8f72f69ad2aa1358dc0833d96a8689c5d14b0fa6aba79ef
+  data.tar.gz: 363b079ba036a24e47a6919bc72d1dbaa4396586ae814ccb77cde3917b6ca917c5e5fe295dc17ff9339cfa9dfb526ee60e936af4e4d66f081901727017712f4e

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+### 4.20.13.12
+
+- Fixed issue with dragged shapes having `drag_source true` not going back to original position when not dropped in a target if they were part of a composite shape
+
+### 4.20.13.11
+
+- Conway's Game of Life elaborate sample
+
+### 4.20.13.10
+
+- Update Glimmer Style Guide, scaffolding, and samples to have `before_body` and `after_body` in custom widgets/shells/shapes always take a `do; end` block since they contain logic not visuals
+
+### 4.20.13.9
+
+- Update Klondike Solitaire to have playing card suit symbols and avoid clipping of cards on the boundaries
+
 ### 4.20.13.8
 
 - Glimmer Klondike Solitaire elaborate sample

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.20.13.7
+# [<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.20.13.12
 ## 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)
@@ -15,7 +15,7 @@
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.13.7 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. 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. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.13.12 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. 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. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
 
 **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 (keep in mind that it is still a beta, so default back to `bind` whenever needed).
 
@@ -326,7 +326,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.13.7
+jgem install glimmer-dsl-swt -v 4.20.13.12
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -354,7 +354,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.20.13.7'
+gem 'glimmer-dsl-swt', '~> 4.20.13.12'
 ```
 
 And, then run:
@@ -375,7 +375,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.7
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.12
       
 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.20.13.8
+4.20.13.12

data/docs/reference/GLIMMER_SAMPLES.md

@@ -61,7 +61,9 @@
     - [Login](#login)
     - [Tic Tac Toe](#tic-tac-toe)
     - [Contact Manager](#contact-manager)
+    - [Game of Life](#game-of-life)
     - [Glimmer Tetris](#glimmer-tetris)
+    - [Klondike Solitaire](#klondike-solitaire)
     - [Mandelbrot Fractal](#mandelbrot-fractal)
     - [Stock Ticker](#stock-ticker)
     - [Metronome](#metronome)
@@ -1070,6 +1072,16 @@ Contact Manager - Edit Done
 
 ![Contact Manager](/images/glimmer-contact-manager-edit-done.png)
 
+#### Game of Life
+
+This sample demonstrates how to build an interactive canvas-based visualization of Conway's Game of Life (test-first), taking advantage of data-binding and multi-threading.
+
+Code:
+
+[samples/elaborate/game_of_life.rb](/samples/elaborate/game_of_life.rb)
+
+![Game of Life](/images/glimmer-game-of-life.gif)
+
 #### Glimmer Tetris
 
 This sample demonstrates how to build an interactive animated game with MVC architecture, custom-shell/custom-widgets, multi-threading, asynchronous programming, data-binding, canvas shape graphic decorations, canvas shape icon image generation, and keyboard events/shortcuts.
@@ -1098,6 +1110,18 @@ Code:
 
 ![Tetris Help Menu](/images/glimmer-tetris-help-menu.png)
 
+#### Klondike Solitaire
+
+This sample demonstrates how to build an interactive card game with MVC architecture, canvas, custom-shapes, data-binding, observers, and drag & drop.
+
+Code:
+
+[samples/elaborate/klondike_solitaire.rb](/samples/elaborate/klondike_solitaire.rb)
+
+![Klondike Solitaire](/images/glimmer-klondike-solitaire.png)
+
+![Klondike Solitaire Played](/images/glimmer-klondike-solitaire-played.png)
+
 #### Mandelbrot Fractal
 
 This sample demonstrates how to render canvas graphics with multi-threaded processing taking advantage of all CPU cores and doing background processing of images.

data/docs/reference/GLIMMER_STYLE_GUIDE.md

@@ -10,6 +10,7 @@
 - Widget listeners are always declared starting with `on_` prefix and affixing listener event method name afterwards in underscored lowercase form. Their multi-line blocks rely on the `do; end` style.
 - Widget listeners are always followed by a block using curly braces (Only when declared in DSL. When invoked on widget object directly outside of GUI declarations, standard Ruby conventions apply)
 - Data-binding is done via `bind` keyword, which always takes arguments wrapped in parentheses
-- Custom widget `body`, `before_body`, and `after_body` blocks open their blocks and close them with curly braces.
+- Custom widget/shell/shape `body` blocks open and close with curly braces.
+- Custom widget/shell/shape `before_body` and `after_body` blocks are declared as `do; end` blocks.
 - Custom widgets receive additional keyword arguments called options, which come after the SWT styles.
 - Pure logic multi-line blocks that do not constitute GUI DSL view elements (such as `Thread.new`, `loop`, `each` and `observe` blocks) rely on the `do; end` style to clearly separate logic code from view code.

data/lib/glimmer/rake_task/scaffold.rb

@@ -607,7 +607,7 @@ module Glimmer
           
           if %i[gem app desktopify].include?(shell_type)
             custom_shell_file_content += <<-MULTI_LINE_STRING
-      before_body {
+      before_body do
         Display.app_name = '#{shell_type == :gem ? human_name(custom_shell_name) : human_name(namespace)}'
         Display.app_version = VERSION
         @display = display {
@@ -618,13 +618,13 @@ module Glimmer
             #{shell_type == :desktopify ? 'display_about_dialog' : 'display_preferences_dialog'}
           }
         }
-      }
+      end
             MULTI_LINE_STRING
           else
             custom_shell_file_content += <<-MULTI_LINE_STRING
-      # before_body {
+      # before_body do
       #
-      # }
+      # end
             MULTI_LINE_STRING
           end
     
@@ -632,9 +632,9 @@ module Glimmer
   
       ## Use after_body block to setup observers for widgets in body
       #
-      # after_body {
+      # after_body do
       #
-      # }
+      # end
   
       ## Add widget content inside custom shell body
       ## Top-most widget must be a shell or another custom shell
@@ -767,15 +767,15 @@ end
       ## Use before_body block to pre-initialize variables to use in body
       #
       #
-      # before_body {
+      # before_body do
       #
-      # }
+      # end
   
       ## Use after_body block to setup observers for widgets in body
       #
-      # after_body {
+      # after_body do
       #
-      # }
+      # end
   
       ## Add widget content under custom widget body
       ##
@@ -817,15 +817,15 @@ end
       ## Use before_body block to pre-initialize variables to use in body
       #
       #
-      # before_body {
+      # before_body do
       #
-      # }
+      # end
   
       ## Use after_body block to setup observers for shapes in body
       #
-      # after_body {
+      # after_body do
       #
-      # }
+      # end
   
       ## Add shape content under custom shape body
       #

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

@@ -121,7 +121,7 @@ module Glimmer
           @line_numbers_styled_text_proxy.content(&block)
         end
         
-        before_body {
+        before_body do
           require 'rouge'
           require 'ext/rouge/themes/glimmer'
           @swt_style = swt_style == 0 ? [:border, :multi, :v_scroll, :h_scroll] : swt_style
@@ -132,11 +132,11 @@ module Glimmer
             @lines_width = lines[:width]
           end
           @dsl_mode = true
-        }
+        end
         
-        after_body {
+        after_body do
           @dsl_mode = nil
-        }
+        end
         
         body {
           if lines

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

@@ -713,7 +713,7 @@ module Glimmer
               end
             end
             @drawable_on_mouse_up = drawable.handle_observation_request('on_mouse_up') do |event|
-              if Shape.dragging && Shape.dragged_shape == self && !Shape.drop_shapes.detect {|shape| shape.include_with_children?(event.x, event.y)}
+              if Shape.dragging && Shape.dragged_shape == self && !Shape.drop_shapes.detect {|shape| shape.include_with_children?(event.x, event.y, except_child: Shape.dragged_shape)}
                 Shape.dragging = false
                 Shape.dragged_shape.x = Shape.dragged_shape_original_x
                 Shape.dragged_shape.y = Shape.dragged_shape_original_y

data/samples/elaborate/calculator.rb

@@ -15,7 +15,7 @@ class Calculator
 
   attr_reader :presenter
 
-  before_body {
+  before_body do
     @presenter = Model::Presenter.new
     
     Display.setAppName('Glimmer Calculator')
@@ -30,7 +30,7 @@ class Calculator
         display_about_dialog
       }
     }
-  }
+  end
 
   body {
     shell {

data/samples/elaborate/contact_manager.rb

@@ -26,10 +26,10 @@ require_relative "contact_manager/contact_manager_presenter"
 class ContactManager
   include Glimmer::UI::CustomShell
 
-  before_body {
+  before_body do
     @contact_manager_presenter = ContactManagerPresenter.new
     @contact_manager_presenter.list
-  }
+  end
 
   body {
     shell {

data/samples/elaborate/game_of_life.rb

@@ -0,0 +1,111 @@
+# Copyright (c) 2007-2021 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 'game_of_life/model/grid'
+
+class GameOfLife
+  include Glimmer::UI::CustomShell
+  
+  WIDTH = 20
+  HEIGHT = 20
+  CELL_WIDTH = 25
+  CELL_HEIGHT = 25
+  
+  before_body do
+    @grid = GameOfLife::Model::Grid.new(WIDTH, HEIGHT)
+  end
+  
+  body {
+    shell {
+      row_layout :vertical
+      text "Conway's Game of Life (Glimmer Edition)"
+    
+      canvas {
+        layout_data {
+          width WIDTH*CELL_WIDTH
+          height HEIGHT*CELL_HEIGHT
+        }
+        (0...HEIGHT).each do |row_index|
+          (0...WIDTH).each do |column_index|
+            rectangle(column_index*CELL_WIDTH, row_index*CELL_HEIGHT, CELL_WIDTH, CELL_HEIGHT) {
+              background <= [@grid.cell_rows[row_index][column_index], "alive", on_read: ->(a) {a ? :black : :white}]
+              
+              on_mouse_down {
+                @grid.cell_rows[row_index][column_index].toggle_aliveness!
+              }
+            }
+          end
+        end
+      }
+        
+      composite {
+        row_layout(:horizontal) {
+          margin_width 0
+        }
+                
+        button {
+          text 'Step'
+          enabled <= [@grid, :playing, on_read: :! ]
+          
+          on_widget_selected {
+            @grid.step!
+          }
+        }
+        
+        button {
+          text 'Clear'
+          enabled <= [@grid, :playing, on_read: :! ]
+          
+          on_widget_selected {
+            @grid.clear!
+          }
+        }
+                
+        button {
+          text <= [@grid, :playing, on_read: ->(p) { p ? 'Stop' : 'Play' }]
+          
+          on_widget_selected {
+            @grid.toggle_playback!
+          }
+        }
+  
+        label {
+          text 'Slower'
+        }
+              
+        scale {
+          minimum 1
+          maximum 100
+          selection <=> [@grid, :speed]
+        }
+          
+        label {
+          text 'Faster'
+        }
+          
+      }
+    }
+  }
+end
+
+GameOfLife.launch

data/samples/elaborate/game_of_life/model/cell.rb

@@ -0,0 +1,72 @@
+# Copyright (c) 2007-2021 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 GameOfLife
+  module Model
+    class Cell
+      attr_reader :grid, :row_index, :column_index
+      attr_accessor :alive
+      alias alive? alive
+    
+      def initialize(grid, row_index, column_index, alive=false)
+        @grid = grid
+        @row_index = row_index
+        @column_index = column_index
+        @alive = alive
+      end
+      
+      def live!
+        self.alive = true
+      end
+      
+      def die!
+        self.alive = false
+      end
+      
+      def toggle_aliveness!
+        return if grid.playing?
+        dead ? live! : die!
+      end
+      
+      def dead?
+        !alive?
+      end
+      alias dead dead?
+      
+      # step into the next generation
+      def step!
+        self.alive = (alive? && alive_neighbor_count.between?(2, 3)) || (dead? && alive_neighbor_count == 3)
+      end
+      
+      def alive_neighbor_count
+        [row_index - 1, 0].max.upto([row_index + 1, grid.row_count - 1].min).map do |current_row_index|
+          [column_index - 1, 0].max.upto([column_index + 1, grid.column_count - 1].min).map do |current_column_index|
+            if current_row_index == row_index && current_column_index == column_index
+              0
+            else
+              grid.previous_cell_rows[current_row_index][current_column_index].alive? ? 1 : 0
+            end
+          end
+        end.flatten.reduce(:+)
+      end
+    end
+  end
+end