glimmer-dsl-swt 4.20.13.5 → 4.20.13.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b15c41b36b1464cbcf34e302e630fce0a9e63f5512754c095d14e646dcc2c2b7
-  data.tar.gz: 02addc76d6e2f275a1c79741f30bf6ba89087fc68e03cbb7ef29eb051cbd8b87
+  metadata.gz: c7f34d2baa127f20cc05b387d51afed496456ee236e5a206594c1b5bd672aa56
+  data.tar.gz: e19feae85a8f5b29fee1c40eb259618b95b235ce7b41e847e8277a124e5ae362
 SHA512:
-  metadata.gz: 2e7595726d4f5c1657b547f2a893a1c83e1469b9ef20d336adb1f7e50a06ea6af69e71a30272dc24a6a50bf9d85cfa9fea558ddc9e1112ef1a6c43d53b011d3f
-  data.tar.gz: 9ccd2bedd1040f95b1e12fdb4dbfac53bf96ade95290e4e1b3e168643843cb4340dc5ca892f3f405a91c77ac81032508a9a256d6eac3798dfdb70518d3804453
+  metadata.gz: e8fa48e0b887ed4a772eda18f997ed91f5ad2005d3aeae9aa1e1fccd2baffbdeb3e9578a56c2ca51b04eda425dc7b1ef420bf9bb6ab1b2fe28bde0aefc820dd2
+  data.tar.gz: 89a9947c73556344f300e7db6fe8d43913f1d089c041d5416b9c0b69367549764978c990737da74c157d573118d81c0a771ff06025676b5b3ba781f30e095853

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+### 4.20.13.8
+
+- Glimmer Klondike Solitaire elaborate sample
+
+### 4.20.13.7
+
+- Support accepting ImageProxy objects in Canvas Shape DSL (not just image paths)
+- Fix issue in ImageProxy not flattening args before selecting file path
+
+### 4.20.13.6
+
+- Ensure a dragged shape can be dropped back into a parent it originally belonged to without it counting as a drop into itself.
+- Add set_data and get_data to Glimmer::UI::CustomShape, which proxies calls to body_root
+
 ### 4.20.13.5
 
 - Fix issue occurring with shape drag & drop when the dragged shape is a drop target too, thus getting dropped back to itself.

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.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.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.4 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.4
+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.4'
+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.4
+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.5
+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/lib/glimmer/swt/custom/shape.rb

@@ -228,9 +228,9 @@ module Glimmer
           contain?(x, y)
         end
 
-        def include_with_children?(x, y)
+        def include_with_children?(x, y, except_child: nil)
           included = include?(x, y)
-          included ||= expanded_shapes.detect { |shape| shape.include?(x, y) }
+          included ||= expanded_shapes.reject {|shape| shape == except_child}.detect { |shape| shape.include?(x, y) }
         end
 
         # Indicates if a shape's x, y, width, height differ from its bounds calculation (e.g. arc / polygon)
@@ -405,7 +405,7 @@ module Glimmer
           end
           if @name == 'image'
             if @args.first.is_a?(::String)
-              @args[0] = ImageProxy.new(@args[0])
+              @args[0] = ImageProxy.create(@args[0])
             end
             if @args.first.is_a?(ImageProxy)
               @image = @args[0] = @args[0].swt_image
@@ -592,7 +592,7 @@ module Glimmer
           if observation_request == 'on_drop'
             Shape.drop_shapes << self
             handle_observation_request('on_mouse_up') do |event|
-              if Shape.dragging && !expanded_shapes.include?(Shape.dragged_shape) && include_with_children?(event.x, event.y)
+              if Shape.dragging && include_with_children?(event.x, event.y, except_child: Shape.dragged_shape)
                 drop_event = DropEvent.new(
                   doit: true,
                   dragged_shape: Shape.dragged_shape,

data/lib/glimmer/swt/image_proxy.rb

@@ -74,8 +74,8 @@ module Glimmer
         end
         options = @args.last.is_a?(Hash) ? @args.delete_at(-1) : {}
         options[:swt_image] = @args.first if @args.size == 1 && @args.first.is_a?(Image)
-        @file_path = @args.first if @args.first.is_a?(String)
         @args = @args.first if @args.size == 1 && @args.first.is_a?(Array)
+        @file_path = @args.first if @args.first.is_a?(String)
         if options&.keys&.include?(:swt_image)
           @swt_image = options[:swt_image]
           @original_image_data = @image_data = @swt_image.image_data

data/lib/glimmer/ui/custom_shape.rb

@@ -264,6 +264,19 @@ module Glimmer
         body_root.handle_observation_request(observation_request, &block)
       end
       
+      # Sets data just like SWT widgets
+      def set_data(key=nil, value)
+        body_root.set_data(key, value)
+      end
+      alias setData set_data # for compatibility with SWT APIs
+
+      # Gets data just like SWT widgets
+      def get_data(key=nil)
+        body_root.get_data(key)
+      end
+      alias getData get_data # for compatibility with SWT APIs
+      alias data get_data # for compatibility with SWT APIs
+    
       def method_missing(method, *args, &block)
         # TODO Consider supporting a glimmer error silencing option for methods defined here
         # but fail the glimmer DSL for the right reason to avoid seeing noise in the log output

data/samples/elaborate/klondike_solitaire.rb

@@ -0,0 +1,112 @@
+require 'glimmer-dsl-swt'
+
+require_relative 'klondike_solitaire/model/game'
+
+require_relative 'klondike_solitaire/view/action_panel'
+require_relative 'klondike_solitaire/view/tableau'
+
+class KlondikeSolitaire
+  include Glimmer::UI::CustomShell
+  
+  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
+  #
+  # options :title, :background_color
+  # option :width, default: 320
+  # option :height, default: 240
+
+  ## Use before_body block to pre-initialize variables to use in body
+  #
+  #
+  before_body {
+    @game = Model::Game.new
+    Display.app_name = 'Glimmer Klondike Solitaire'
+    @display = display {
+      on_about {
+        display_about_dialog
+      }
+      on_preferences {
+        display_about_dialog
+      }
+    }
+  }
+
+  ## Use after_body block to setup observers for widgets in body
+  #
+  # after_body {
+  #
+  # }
+
+  ## Add widget content inside custom shell body
+  ## Top-most widget must be a shell or another custom shell
+  #
+  body {
+    shell(:no_resize) {
+      row_layout(:vertical) {
+        fill true
+        center true
+        margin_width 0
+        margin_height 0
+        margin_top 15
+      }
+      minimum_size TABLEAU_WIDTH, TABLEAU_HEIGHT
+      text "Glimmer Klondike Solitaire"
+      background :dark_green
+    
+      action_panel(game: @game)
+      tableau(game: @game) {
+        layout_data {
+          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 {
+            text '&About...'
+            on_widget_selected {
+              display_about_dialog
+            }
+          }
+        }
+      }
+    }
+  }
+
+  def display_about_dialog
+    message_box(body_root) {
+      text 'About'
+      message "Glimmer Klondike Solitaire\nGlimmer DSL for SWT Elaborate Sample"
+    }.open
+  end
+end
+
+KlondikeSolitaire.launch

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

@@ -0,0 +1,60 @@
+class KlondikeSolitaire
+  module Model
+    class ColumnPile
+      include Glimmer::DataBinding::ObservableModel
+      attr_reader :count
+    
+      def initialize(game, count)
+        @game = game
+        @count = count
+        reset!
+      end
+      
+      def reset!
+        playing_cards.clear
+        populate!(count.times.map { @game.deck.pop })
+        notify_observers(:playing_cards)
+      end
+    
+      # this method does not validate
+      def populate!(new_playing_cards)
+        new_playing_cards.each_with_index do |playing_card, index|
+          playing_card.hidden = true if index < (new_playing_cards.size - 1)
+          playing_cards.push(playing_card)
+        end
+      end
+      
+      # this method validates that playing card fits at the bottom of the column (opposite color and one number smaller)
+      # throws an error if it does not fit
+      def add!(new_playing_card)
+        bottom_card = playing_cards.last
+        if (playing_cards.empty? && new_playing_card.rank == 13) ||
+            (new_playing_card.color != bottom_card.color && new_playing_card.rank == (bottom_card.rank - 1))
+          playing_cards.push(new_playing_card)
+        else
+          raise "Cannot add #{new_playing_card} to #{self}"
+        end
+      end
+      
+      def remove!(card)
+        remove_cards_starting_at(playing_cards.index(card)).tap do |result|
+          playing_cards.last&.hidden = false
+        end
+      end
+      
+      def remove_cards_starting_at(index)
+        removed_cards = playing_cards[index...playing_cards.size]
+        playing_cards[index...playing_cards.size] = []
+        removed_cards
+      end
+      
+      def playing_cards
+        @playing_cards ||= []
+      end
+      
+      def to_s
+        "Column Pile #{count} (#{playing_cards.map {|card| "#{card.rank}#{card.suit.to_s[0].upcase}"}.join(" | ")})"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+class KlondikeSolitaire
+  module Model
+    class DealingPile
+      DEALING_INITIAL_COUNT = 24
+      
+      def initialize(game)
+        @game = game
+        reset!
+      end
+      
+      def reset!
+        playing_cards.clear
+        DEALING_INITIAL_COUNT.times { playing_cards << @game.deck.pop }
+      end
+
+      def deal!
+        playing_card = playing_cards.shift
+        if playing_card.nil?
+          @game.dealt_pile.playing_cards.each do |a_playing_card|
+            playing_cards << a_playing_card
+          end
+          @game.dealt_pile.playing_cards.clear
+        else
+          @game.dealt_pile.push!(playing_card)
+        end
+    end
+      
+      def playing_cards
+        @playing_cards ||= []
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+class KlondikeSolitaire
+  module Model
+    class DealtPile
+      def initialize(game)
+        @game = game
+      end
+      
+      def reset!
+        playing_cards.clear
+      end
+    
+      def push!(playing_card)
+        playing_cards.push(playing_card)
+      end
+      
+      def remove!(card)
+        playing_cards.delete(card)
+      end
+      
+      def playing_cards
+        @playing_cards ||= []
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+class KlondikeSolitaire
+  module Model
+    class FoundationPile
+      attr_reader :suit
+    
+      def initialize(game, suit)
+        @game = game
+        @suit = suit
+        reset!
+      end
+      
+      def reset!
+        playing_cards.clear
+      end
+    
+      # adds a card
+      # validates if it is a card that belongs to the suit
+      def add!(playing_card)
+        if playing_card.suit == suit &&
+          (
+            (playing_cards.empty? && playing_card.rank == 1) ||
+            playing_card.rank == (playing_cards.last.rank + 1)
+          )
+          playing_cards.push(playing_card)
+        else
+          raise "Cannot add #{playing_card} to #{self}"
+        end
+      end
+      
+      def playing_cards
+        @playing_cards ||= []
+      end
+            
+      def to_s
+        "Foundation Pile #{suit} (#{playing_cards.map {|card| "#{card.rank}#{card.suit.to_s[0].upcase}"}.join(" | ")})"
+      end
+      
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+require_relative 'playing_card'
+require_relative 'dealt_pile'
+require_relative 'dealing_pile'
+require_relative 'column_pile'
+require_relative 'foundation_pile'
+
+class KlondikeSolitaire
+  module Model
+    class Game
+      COLUMN_PILE_COUNT = 7
+        
+      attr_reader :deck, :dealing_pile, :dealt_pile, :column_piles, :foundation_piles
+      
+      def initialize
+        @deck = new_deck
+        @dealt_pile = DealtPile.new(self)
+        @dealing_pile = DealingPile.new(self)
+        @column_piles = COLUMN_PILE_COUNT.times.map {|n| ColumnPile.new(self, n + 1)}
+        @foundation_piles = PlayingCard::SUITS.map {|suit| FoundationPile.new(self, suit)}
+      end
+                  
+      def restart!
+        @deck = new_deck
+        @dealt_pile.reset!
+        @dealing_pile.reset!
+        @column_piles.each(&:reset!)
+        @foundation_piles.each(&:reset!)
+      end
+        
+      private
+      
+      def new_deck
+        PlayingCard.deck.shuffle
+      end
+    end
+  end
+end

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

@@ -0,0 +1,86 @@
+class KlondikeSolitaire
+  module Model
+    class PlayingCard
+      SUITS = [:spades, :hearts, :clubs, :diamonds]
+      BLACK_SUITS = [:spades, :clubs]
+      RED_SUITS = [:hearts, :diamonds]
+      RANK_COUNT = 13
+      
+      class << self
+        def deck
+          suit_decks.flatten
+        end
+        
+        def suit_decks
+          SUITS.map do |suit|
+            suit_deck(suit)
+          end
+        end
+        
+        def suit_deck(suit)
+          1.upto(RANK_COUNT).map do |rank|
+            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
+      attr_accessor :hidden
+      alias hidden? hidden
+      
+      def initialize(rank, suit, hidden = false)
+        @rank = rank
+        @suit = suit
+        @hidden = hidden
+      end
+      
+      def color
+        if BLACK_SUITS.include?(suit)
+          :black
+        elsif RED_SUITS.include?(suit)
+          :red
+        end
+      end
+      
+      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/action_panel.rb

@@ -0,0 +1,30 @@
+class KlondikeSolitaire
+  module View
+    class ActionPanel
+      include Glimmer::UI::CustomWidget
+
+      option :game
+      
+      body {
+        composite {
+          grid_layout(1, false) {
+            margin_width 0
+            margin_height 0
+          }
+          
+          background :dark_green
+          
+          button {
+            layout_data :center, :center, true, false
+            
+            text 'Restart Game'
+            
+            on_widget_selected {
+              game.restart!
+            }
+          }
+        }
+      }
+    end
+  end
+end

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

@@ -0,0 +1,66 @@
+require_relative '../model/column_pile'
+
+require_relative 'playing_card'
+
+class KlondikeSolitaire
+  module View
+    class ColumnPile
+      include Glimmer::UI::CustomShape
+  
+      IMAGE_EMPTY = image(50, 80) {
+        rectangle(0, 0, 50, 80) {
+          background :dark_green
+          
+          rectangle(0, 0, 49, 79, 15, 15) {
+            foreground :gray
+          }
+        }
+      }
+      
+      options :pile_x, :pile_y, :model
+      
+      after_body {
+        observe(model, 'playing_cards.last.hidden') do
+          build_column_pile(model.playing_cards)
+        end
+        build_column_pile(model.playing_cards)
+      }
+      
+      body {
+        shape(pile_x, pile_y) {
+          on_drop do |drop_event|
+            begin
+              card_shape = drop_event.dragged_shape.get_data('custom_shape')
+              card = card_shape.model
+              model.add!(card)
+              card_parent_pile = card_shape.parent_pile
+              card_source_model = card_parent_pile.model
+              cards = card_source_model.remove!(card)
+              if cards.is_a?(Array) # if it is a column pile
+                cards[1..-1].each do |card|
+                  model.add!(card)
+                end
+              end
+              drop_event.dragged_shape.dispose
+            rescue => e
+#               pd e
+              drop_event.doit = false
+            end
+          end
+        }
+      }
+  
+      def build_column_pile(playing_cards)
+        body_root.shapes.to_a.each(&:dispose)
+        current_parent = body_root
+        playing_cards.each_with_index do |card, i|
+          current_parent.content {
+            current_parent = playing_card(card_x: 0, card_y: 20, model: card, parent_pile: self) {
+              drag_source true unless card.hidden?
+            }.body_root
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require_relative '../model/dealing_pile'
+
+require_relative 'empty_playing_card'
+require_relative 'hidden_playing_card'
+
+class KlondikeSolitaire
+  module View
+    class DealingPile
+      include Glimmer::UI::CustomShape
+      
+      options :pile_x, :pile_y, :model
+      
+      after_body {
+        observe(model, 'playing_cards.empty?') do |empty_value|
+          body_root.shapes.to_a.each(&:dispose)
+          if empty_value
+            body_root.content {
+              empty_playing_card
+            }
+          else
+            body_root.content {
+              hidden_playing_card
+            }
+          end
+        end
+      }
+  
+      body {
+        shape(pile_x, pile_y) {
+          hidden_playing_card
+        }
+      }
+  
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require_relative '../model/dealt_pile'
+
+require_relative 'empty_playing_card'
+require_relative 'playing_card'
+
+class KlondikeSolitaire
+  module View
+    class DealtPile
+      include Glimmer::UI::CustomShape
+      
+      options :pile_x, :pile_y, :model
+      
+      after_body do
+        observe(model, 'playing_cards.empty?') do |empty_value|
+          if empty_value
+            body_root.shapes.to_a.dup.each(&:dispose)
+            body_root.content {
+              empty_playing_card
+            }
+          else
+            body_root.content {
+              playing_card(model: model.playing_cards.last, parent_pile: self) {
+                drag_source true
+              }
+            }
+          end
+        end
+      end
+  
+      body {
+        shape(pile_x, pile_y) {
+          empty_playing_card
+        }
+      }
+                                
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+require_relative '../model/playing_card'
+
+class KlondikeSolitaire
+  module View
+    class EmptyPlayingCard
+      include Glimmer::UI::CustomShape
+      
+      option :suit
+  
+      body {
+        rectangle(0, 0, 49, 79, 15, 15) {
+          foreground :gray
+          
+          if suit
+            text {
+              string Model::PlayingCard.suit_text(suit)
+              x :default
+              y :default
+              is_transparent true
+              foreground Model::PlayingCard::BLACK_SUITS.include?(suit) ? :black : :red
+            }
+          end
+        }
+      }
+  
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+require_relative '../model/playing_card'
+require_relative '../model/foundation_pile'
+
+class KlondikeSolitaire
+  module View
+    class FoundationPile
+      include Glimmer::UI::CustomShape
+      
+      options :pile_x, :pile_y, :game, :suit
+      
+      attr_accessor :current_image, :model
+      
+      before_body {
+        self.current_image = image(50, 80) {empty_playing_card(suit: suit)}
+        self.model = game.foundation_piles[Model::PlayingCard::SUITS.index(suit)]
+      }
+  
+      after_body {
+        observe(model, 'playing_cards.last') do |last_card|
+          if last_card
+            body_root.content {
+              playing_card(model: last_card)
+            }
+          else
+            body_root.clear_shapes
+            body_root.content {
+              empty_playing_card(suit: suit)
+            }
+          end
+        end
+      }
+      
+      body {
+        shape(pile_x, pile_y) {
+          empty_playing_card(suit: suit)
+          
+          on_drop do |drop_event|
+            begin
+              # TODO make sure one cannot drag a column pile of cards here
+              card_shape = drop_event.dragged_shape.get_data('custom_shape')
+              card = card_shape.model
+              card_parent_pile = card_shape.parent_pile
+              card_source_model = card_parent_pile.model
+              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
+#               pd e
+              drop_event.doit = false
+            end
+          end
+        }
+      }
+    end
+    
+  end
+  
+end

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

@@ -0,0 +1,19 @@
+class KlondikeSolitaire
+  module View
+    class HiddenPlayingCard
+      include Glimmer::UI::CustomShape
+  
+      body {
+        rectangle(0, 0, 49, 79, 15, 15) {
+          background :red
+          
+          # border
+          rectangle(0, 0, 49, 79, 15, 15) {
+            foreground :black
+          }
+        }
+      }
+  
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+class KlondikeSolitaire
+  module View
+    class PlayingCard
+      include Glimmer::UI::CustomShape
+  
+      options :card_x, :card_y, :model, :parent_pile
+      
+      before_body {
+        self.card_x ||= 0
+        self.card_y ||= 0
+      }
+  
+      body {
+        rectangle(card_x, card_y, 49, 79, 15, 15) {
+          background model.hidden ? :red : :white
+          
+          # border
+          rectangle(0, 0, 49, 79, 15, 15) {
+            foreground :black
+          }
+          
+          unless model.hidden?
+            text {
+              string model ? "#{model.rank_text}#{model.suit_text}" : ""
+              x 5
+              y 5
+              foreground model ? model.color : :transparent
+            }
+          end
+        }
+      }
+  
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+require_relative 'dealing_pile'
+require_relative 'dealt_pile'
+require_relative 'column_pile'
+require_relative 'foundation_pile'
+
+require_relative '../model/game'
+
+class KlondikeSolitaire
+  module View
+    class Tableau
+      include Glimmer::UI::CustomWidget
+      
+      option :game
+      
+      body {
+        canvas {
+          background :dark_green
+          
+          # row 1
+          @foundation_piles = Model::PlayingCard::SUITS.each_with_index.map do |suit, i|
+            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: 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: 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
+        }
+      }
+  
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.13.5
+  version: 4.20.13.9
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2021-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -545,6 +545,22 @@ files:
 - samples/elaborate/contact_manager/contact.rb
 - samples/elaborate/contact_manager/contact_manager_presenter.rb
 - samples/elaborate/contact_manager/contact_repository.rb
+- samples/elaborate/klondike_solitaire.rb
+- samples/elaborate/klondike_solitaire/model/column_pile.rb
+- samples/elaborate/klondike_solitaire/model/dealing_pile.rb
+- samples/elaborate/klondike_solitaire/model/dealt_pile.rb
+- samples/elaborate/klondike_solitaire/model/foundation_pile.rb
+- samples/elaborate/klondike_solitaire/model/game.rb
+- samples/elaborate/klondike_solitaire/model/playing_card.rb
+- samples/elaborate/klondike_solitaire/view/action_panel.rb
+- samples/elaborate/klondike_solitaire/view/column_pile.rb
+- samples/elaborate/klondike_solitaire/view/dealing_pile.rb
+- samples/elaborate/klondike_solitaire/view/dealt_pile.rb
+- samples/elaborate/klondike_solitaire/view/empty_playing_card.rb
+- samples/elaborate/klondike_solitaire/view/foundation_pile.rb
+- samples/elaborate/klondike_solitaire/view/hidden_playing_card.rb
+- samples/elaborate/klondike_solitaire/view/playing_card.rb
+- samples/elaborate/klondike_solitaire/view/tableau.rb
 - samples/elaborate/login.rb
 - samples/elaborate/mandelbrot_fractal.rb
 - samples/elaborate/meta_sample.rb