glimmer-dsl-swt 4.20.13.8 → 4.20.13.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59508a178a1694489ba4ec995672f08a0997b01c8ebaeb39cecd2db250d0f88b
-  data.tar.gz: 9610a96bf71aa15a581dedda77f9c11942286f1ff5f7ac96369624c97a798f28
+  metadata.gz: c7f34d2baa127f20cc05b387d51afed496456ee236e5a206594c1b5bd672aa56
+  data.tar.gz: e19feae85a8f5b29fee1c40eb259618b95b235ce7b41e847e8277a124e5ae362
 SHA512:
-  metadata.gz: 1f2219231093b33e6c32637dd2a6ee2249e3c64daf3f92355c57ab170d15c6bfd4930d540c3703c0a4c926ff9e6c322ddc4dd119938be9bc23ccf19935c84675
-  data.tar.gz: 98c6a6e4b2f26fde8d9741eb04054866c145366c27a728343f71f6f960c5eba411fa127167101da055d96241b3c66fb7c7d8dbba91256fa9688d694165158cdc
+  metadata.gz: e8fa48e0b887ed4a772eda18f997ed91f5ad2005d3aeae9aa1e1fccd2baffbdeb3e9578a56c2ca51b04eda425dc7b1ef420bf9bb6ab1b2fe28bde0aefc820dd2
+  data.tar.gz: 89a9947c73556344f300e7db6fe8d43913f1d089c041d5416b9c0b69367549764978c990737da74c157d573118d81c0a771ff06025676b5b3ba781f30e095853

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.9
 ## 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.9 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.9
 ```
 
 `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.9'
 ```
 
 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.9
       
 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.9

data/docs/reference/GLIMMER_SAMPLES.md

@@ -62,6 +62,7 @@
     - [Tic Tac Toe](#tic-tac-toe)
     - [Contact Manager](#contact-manager)
     - [Glimmer Tetris](#glimmer-tetris)
+    - [Klondike Solitaire](#klondike-solitaire)
     - [Mandelbrot Fractal](#mandelbrot-fractal)
     - [Stock Ticker](#stock-ticker)
     - [Metronome](#metronome)
@@ -1098,6 +1099,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, custom-shell/custom-widgets, data-binding, observers, and drag & drop.
+
+Code:
+
+[samples/elaborate/klondike_solitaire.rb](/samples/elaborate/klondike_solitaire.rb)
+
+![Tetris](/images/glimmer-klondike-solitaire.png)
+
+![Tetris](/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/samples/elaborate/klondike_solitaire.rb

@@ -11,6 +11,10 @@ class KlondikeSolitaire
   PLAYING_CARD_WIDTH = 50
   PLAYING_CARD_HEIGHT = 80
   PLAYING_CARD_SPACING = 5
+  MARGIN = 15
+  TABLEAU_WIDTH = 2*MARGIN + 7*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING)
+  TABLEAU_HEIGHT = 400
+
 
   ## Add options like the following to configure CustomShell by outside consumers
   #
@@ -48,20 +52,42 @@ class KlondikeSolitaire
       row_layout(:vertical) {
         fill true
         center true
+        margin_width 0
+        margin_height 0
+        margin_top 15
       }
-      minimum_size 400, 400
+      minimum_size TABLEAU_WIDTH, TABLEAU_HEIGHT
       text "Glimmer Klondike Solitaire"
       background :dark_green
     
       action_panel(game: @game)
       tableau(game: @game) {
         layout_data {
-          width 380
-          height 400
+          width TABLEAU_WIDTH
+          height TABLEAU_HEIGHT
         }
       }
       
       menu_bar {
+        menu {
+          text '&Game'
+          menu_item {
+            text '&Restart'
+            accelerator (OS.mac? ? :command : :ctrl), :r
+            
+            on_widget_selected {
+              @game.restart!
+            }
+          }
+          menu_item {
+            text 'E&xit'
+            accelerator :alt, :f4
+            
+            on_widget_selected {
+              body_root.close
+            }
+          }
+        }
         menu {
           text '&Help'
           menu_item {

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

@@ -22,6 +22,34 @@ class KlondikeSolitaire
             new(rank, suit)
           end
         end
+        
+        def rank_text(rank)
+          case rank
+          when 1
+            'A'
+          when 11
+            'J'
+          when 12
+            'Q'
+          when 13
+            'K'
+          else
+            rank
+          end
+        end
+        
+        def suit_text(suit)
+          case suit
+          when :spades
+            "♠"
+          when :hearts
+            "♥"
+          when :clubs
+            "♣"
+          when :diamonds
+            "♦"
+          end
+        end
       end
       
       attr_reader :rank, :suit
@@ -45,6 +73,14 @@ class KlondikeSolitaire
       def to_s
         "Playing Card #{rank}#{suit.to_s[0].upcase}"
       end
+      
+      def suit_text
+        self.class.suit_text(suit)
+      end
+      
+      def rank_text
+        self.class.rank_text(rank)
+      end
     end
   end
 end

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

@@ -1,3 +1,5 @@
+require_relative '../model/playing_card'
+
 class KlondikeSolitaire
   module View
     class EmptyPlayingCard
@@ -11,10 +13,11 @@ class KlondikeSolitaire
           
           if suit
             text {
-              string suit.to_s[0].upcase
+              string Model::PlayingCard.suit_text(suit)
               x :default
               y :default
               is_transparent true
+              foreground Model::PlayingCard::BLACK_SUITS.include?(suit) ? :black : :red
             }
           end
         }

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

@@ -21,7 +21,7 @@ class KlondikeSolitaire
           
           unless model.hidden?
             text {
-              string model ? "#{model.rank} #{model.suit.to_s[0].upcase}" : ""
+              string model ? "#{model.rank_text}#{model.suit_text}" : ""
               x 5
               y 5
               foreground model ? model.color : :transparent

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

@@ -18,14 +18,14 @@ class KlondikeSolitaire
           
           # row 1
           @foundation_piles = Model::PlayingCard::SUITS.each_with_index.map do |suit, i|
-            foundation_pile(pile_x: i*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING), pile_y: 0, game: game, suit: suit)
+            foundation_pile(pile_x: MARGIN + i*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING), pile_y: 0, game: game, suit: suit)
           end
-          @dealt_pile = dealt_pile(pile_x: 5*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING), pile_y: 0, model: game.dealt_pile)
-          @dealing_pile = dealing_pile(pile_x: 6*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING), pile_y: 0, model: game.dealing_pile)
+          @dealt_pile = dealt_pile(pile_x: MARGIN + 5*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING), pile_y: 0, model: game.dealt_pile)
+          @dealing_pile = dealing_pile(pile_x: MARGIN + 6*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING), pile_y: 0, model: game.dealing_pile)
           
           # row 2
           @column_piles = 7.times.map do |n|
-            column_pile(pile_x: n*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING), pile_y: PLAYING_CARD_HEIGHT + PLAYING_CARD_SPACING, model: game.column_piles[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|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.13.8
+  version: 4.20.13.9
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-30 00:00:00.000000000 Z
+date: 2021-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement