glimmer-dsl-swt 4.18.2.2 → 4.18.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86c6cb24dde4db7916e8af3e1c2e61c8146d1be0893ff9d59f3546867438032d
-  data.tar.gz: 63a055522af49c34e2bf1fad56f2fa54fab9842129c99816561bc60081b3373a
+  metadata.gz: 813f7cef0d25c94aa62c0cd57d3445a3eb13acb229bdd59264f7d4a0268f1ed3
+  data.tar.gz: dccf84bac2d2ca037df0b4157335fd7451fc2701d90a79df18abc61971725df6
 SHA512:
-  metadata.gz: 132c53c40c35a0e05a3f44953651b1418b453b6cf8d9bd8cd2f5d90bfa1ce1254b816f5bfb0c26fa7222e924818817dbf8260f4107f92c54816de2c42545e21d
-  data.tar.gz: cd8c874d5549295a0466944a2a3257405f3f670417dce6cade8c80202a5016d3b86a1cf7393479694c9fd0e2ea080a9fd4e965c57d653ae62653140883d612fc
+  metadata.gz: 9702ce2c81c56ddf6c56e590c7f30509149d75fbd6ee8e01da4bb5e0405381fae39da688ec30ab0686ff987cdc4eee06992d7c4b365a32f8bc2d773ea23e3b05
+  data.tar.gz: 4d1a2dfa58fffa6dd037ef07463056ccc70d09261bb0720f238332c07284347993c94e96ef5d18bb9a7f1f75d71b72ed2fdfe72202320f8de489624ac9084edc

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+### 4.18.2.3
+
+- Added Tetris Elaborate Sample
+- Added support for CustomShell `::launch` and `::shutdown` class methods to treat a top-level custom shell as a self contained launchable app (saving you from writing boilerplate code for launching Glimmer applications)
+
 ### 4.18.2.2
 
 - Fixed issue with processing shape color due to missing Color class package name

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.2.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.2.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)
@@ -364,6 +364,7 @@ Glimmer App:
       - [Login](#login)
       - [Tic Tac Toe Sample](#tic-tac-toe-sample)
       - [Contact Manager Sample](#contact-manager-sample)
+      - [Tetris](#tetris)
     - [External Samples](#external-samples)
       - [Glimmer Calculator](#glimmer-calculator)
       - [Gladiator](#gladiator)
@@ -452,7 +453,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.2.2
+jgem install glimmer-dsl-swt -v 4.18.2.3
 
 
 ```
@@ -472,7 +473,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.2.2
+gem 'glimmer-dsl-swt', '~> 4.18.2.3
 '
 ```
 
@@ -531,7 +532,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.2.2
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.2.3
 
 
       
@@ -1012,7 +1013,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.2.2
+  Swt    glimmer-dsl-swt    4.18.2.3
 
   AndyMaleh    Glimmer DSL for SWT
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk
@@ -4633,6 +4634,16 @@ Contact Manager - Edit Done
 
 ![Contact Manager](images/glimmer-contact-manager-edit-done.png)
 
+#### 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, and keyboard events.
+
+Code:
+
+[samples/elaborate/tic_tac_toe.rb](samples/elaborate/tetris.rb)
+
+![Tetris](images/glimmer-tetris.png)
+
 ### External Samples
 
 #### Glimmer Calculator

data/VERSION

@@ -1 +1 @@
-4.18.2.2
+4.18.2.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.2.2 ruby lib
+# stub: glimmer-dsl-swt 4.18.2.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.2.2"
+  s.version = "4.18.2.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-22"
+  s.date = "2021-01-23"
   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]
@@ -132,6 +132,12 @@ Gem::Specification.new do |s|
     "samples/elaborate/contact_manager/contact_repository.rb",
     "samples/elaborate/login.rb",
     "samples/elaborate/meta_sample.rb",
+    "samples/elaborate/tetris.rb",
+    "samples/elaborate/tetris/model/block.rb",
+    "samples/elaborate/tetris/model/game.rb",
+    "samples/elaborate/tetris/model/tetromino.rb",
+    "samples/elaborate/tetris/view/block.rb",
+    "samples/elaborate/tetris/view/playfield.rb",
     "samples/elaborate/tic_tac_toe.rb",
     "samples/elaborate/tic_tac_toe/board.rb",
     "samples/elaborate/tic_tac_toe/cell.rb",

data/lib/glimmer/dsl/swt/display_expression.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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

data/lib/glimmer/rake_task/scaffold.rb

@@ -42,6 +42,7 @@ module Glimmer
           *.gem
           *.rbc
           /.config
+          /.mvn/
           /coverage/
           /InstalledFiles
           /pkg/
@@ -97,9 +98,9 @@ module Glimmer
           .gladiator
           
           # Glimmer
-          dist
-          packages
-          vendor/jars
+          /dist/
+          /packages/
+          /vendor/jars/
         MULTI_LINE_STRING
     
         GEMFILE = <<~MULTI_LINE_STRING

data/lib/glimmer/swt/display_proxy.rb

@@ -45,7 +45,7 @@ module Glimmer
       class << self
         # Returns singleton instance
         def instance(*args)
-          if @instance.nil? || @instance.swt_display.isDisposed
+          if @instance.nil? || @instance.swt_display.nil? || @instance.swt_display.isDisposed
             @instance = new(*args)
           end
           @instance

data/lib/glimmer/swt/widget_proxy.rb

@@ -74,12 +74,10 @@ module Glimmer
 
       DEFAULT_INITIALIZERS = {
         composite: lambda do |composite|
-          if composite.get_layout.nil?
-            layout = GridLayout.new
-            layout.marginWidth = 15
-            layout.marginHeight = 15
-            composite.layout = layout
-          end
+          composite.layout = GridLayout.new if composite.get_layout.nil?
+        end,
+        canvas: lambda do |canvas|
+          canvas.layout = nil unless canvas.get_layout.nil?
         end,
         scrolled_composite: lambda do |scrolled_composite|
           scrolled_composite.expand_horizontal = true

data/lib/glimmer/ui/custom_shell.rb

@@ -27,6 +27,19 @@ module Glimmer
       include SuperModule
       include Glimmer::UI::CustomWidget
       
+      class << self
+        attr_reader :custom_shell
+        
+        def launch
+          @custom_shell = send(self.name.underscore.gsub('::', '__'))
+          @custom_shell.open
+        end
+        
+        def shutdown
+          @custom_shell.close
+        end
+      end
+      
       def initialize(parent, *swt_constants, options, &content)
         super
         @swt_widget.set_data('custom_shell', self)

data/samples/elaborate/meta_sample.rb

@@ -1,3 +1,24 @@
+# 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 'fileutils'
 require 'etc'
 

data/samples/elaborate/tetris.rb

@@ -0,0 +1,102 @@
+# 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.
+
+# Tetris App View Custom Shell (represents `tetris` keyword)
+
+require_relative 'tetris/model/game'
+
+require_relative 'tetris/view/playfield'
+
+class Tetris
+  include Glimmer::UI::CustomShell
+  
+  BLOCK_SIZE = 25
+  PLAYFIELD_WIDTH = 10
+  PLAYFIELD_HEIGHT = 20
+  
+  before_body {
+    Model::Game.configure_beeper do
+      display.beep
+    end
+    
+    Model::Game.start
+    
+    display {
+      on_swt_keydown { |key_event|
+        unless Model::Game.current_tetromino.stopped?
+          case key_event.keyCode
+          when swt(:arrow_down)
+            Model::Game.current_tetromino.down
+          when swt(:arrow_left)
+            Model::Game.current_tetromino.left
+          when swt(:arrow_right)
+            Model::Game.current_tetromino.right
+          when swt(:shift)
+            if key_event.keyLocation == swt(:right) # right shift key
+              Model::Game.current_tetromino.rotate(:right)
+            elsif key_event.keyLocation == swt(:left) # left shift key
+              Model::Game.current_tetromino.rotate(:left)
+            end
+          when 'd'.bytes.first, swt(:arrow_up)
+            Model::Game.current_tetromino.rotate(:right)
+          when 'a'.bytes.first
+            Model::Game.current_tetromino.rotate(:left)
+          end
+        end
+      }
+    }
+  }
+  
+  after_body {
+    Thread.new {
+      loop {
+        sleep(0.9)
+        sync_exec {
+          unless @game_over
+            Model::Game.current_tetromino.down
+            if Model::Game.current_tetromino.stopped? && Model::Game.current_tetromino.row <= 0
+              @game_over = true
+              display.beep
+              message_box(:icon_error) {
+                text 'Tetris'
+                message 'Game Over!'
+              }.open
+              Model::Game.restart
+              @game_over = false
+            end
+            Model::Game.consider_adding_tetromino
+          end
+        }
+      }
+    }
+  }
+  
+  body {
+    shell(:no_resize) {
+      text 'Glimmer Tetris'
+      background :gray
+      
+      playfield(playfield_width: PLAYFIELD_WIDTH, playfield_height: PLAYFIELD_HEIGHT, block_size: BLOCK_SIZE)
+    }
+  }
+end
+
+Tetris.launch

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

@@ -0,0 +1,48 @@
+# 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 Tetris
+  module Model
+    class Block
+      COLOR_CLEAR = :white
+    
+      attr_accessor :color
+      
+      # Initializes with color. Default color (gray) signifies an empty block
+      def initialize(color = COLOR_CLEAR)
+        @color = color
+      end
+      
+      def clear
+        self.color = COLOR_CLEAR
+      end
+      
+      def clear?
+        self.color == COLOR_CLEAR
+      end
+      
+      def occupied?
+        !clear?
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,116 @@
+# 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_relative 'block'
+require_relative 'tetromino'
+
+class Tetris
+  module Model
+    class Game
+      class << self
+        def consider_adding_tetromino
+          if tetrominoes.empty? || Game.current_tetromino.stopped?
+            tetrominoes << Tetromino.new
+          end
+        end
+        
+        def current_tetromino
+          tetrominoes.last
+        end
+      
+        def tetrominoes
+          @tetrominoes ||= reset_tetrominoes
+        end
+        
+        # Returns blocks in the playfield
+        def playfield
+          @playfield ||= PLAYFIELD_HEIGHT.times.map {
+            PLAYFIELD_WIDTH.times.map {
+              Block.new
+            }
+          }
+        end
+        
+        def consider_eliminating_lines
+          cleared_line = false
+          playfield.each_with_index do |row, playfield_row|
+            if row.all? {|block| !block.clear?}
+              cleared_line = true
+              shift_blocks_down_above_row(playfield_row)
+            end
+          end
+          beep if cleared_line
+        end
+        
+        def beep
+          @beeper&.call
+        end
+        
+        def configure_beeper(&beeper)
+          @beeper = beeper
+        end
+        
+        def shift_blocks_down_above_row(row)
+          row.downto(0) do |playfield_row|
+             playfield[playfield_row].each_with_index do |block, playfield_column|
+               previous_row = playfield[playfield_row - 1]
+               previous_block = previous_row[playfield_column]
+               block.color = previous_block.color
+             end
+          end
+          playfield[0].each(&:clear)
+        end
+        
+        def restart
+          reset_playfield
+          reset_tetrominoes
+        end
+        alias start restart
+        
+        def reset_tetrominoes
+          @tetrominoes = [Tetromino.new]
+        end
+        
+        def reset_playfield
+          playfield.each do |row|
+            row.each do |block|
+              block.clear
+            end
+          end
+        end
+        
+        def playfield_remaining_heights(tetromino = nil)
+          PLAYFIELD_WIDTH.times.map do |playfield_column|
+            (playfield.each_with_index.detect do |row, playfield_row|
+              !row[playfield_column].clear? &&
+              (
+                tetromino.nil? ||
+                tetromino.bottom_block_for_column(playfield_column).nil? ||
+                (playfield_row > tetromino.row + tetromino.bottom_block_for_column(playfield_column)[:row])
+              )
+            end || [nil, PLAYFIELD_HEIGHT])[1]
+          end.to_a
+        end
+      end
+    end
+  end
+end
+    

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

@@ -0,0 +1,228 @@
+# 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_relative 'block'
+
+require 'matrix'
+
+class Tetris
+  module Model
+    class Tetromino
+      ORIENTATIONS = [:north, :east, :south, :west]
+      
+      LETTER_COLORS = {
+        I: :cyan,
+        J: :blue,
+        L: :dark_yellow,
+        O: :yellow,
+        S: :green,
+        T: :magenta,
+        Z: :red,
+      }
+      
+      attr_reader :letter
+      attr_accessor :orientation, :blocks, :row, :column
+      
+      def initialize
+        @letter = LETTER_COLORS.keys.sample
+        @orientation = :north
+        @blocks = default_blocks
+        new_row = 1 - height
+        new_column = (PLAYFIELD_WIDTH - width)/2
+        update_playfield(new_row, new_column)
+      end
+      
+      def update_playfield(new_row = nil, new_column = nil)
+        remove_from_playfield
+        if !new_row.nil? && !new_column.nil?
+          @row = new_row
+          @column = new_column
+          add_to_playfield
+        end
+      end
+      
+      def add_to_playfield
+        update_playfield_block do |playfield_row, playfield_column, row_index, column_index|
+          Game.playfield[playfield_row][playfield_column].color = blocks[row_index][column_index].color if playfield_row >= 0 && Game.playfield[playfield_row][playfield_column].clear? && !blocks[row_index][column_index].clear?
+        end
+      end
+      
+      def remove_from_playfield
+        return if @row.nil? || @column.nil?
+        update_playfield_block do |playfield_row, playfield_column, row_index, column_index|
+          Game.playfield[playfield_row][playfield_column].clear if playfield_row >= 0 && !blocks[row_index][column_index].clear? && Game.playfield[playfield_row][playfield_column].color == color
+        end
+      end
+      
+      def stopped?(blocks: nil)
+        blocks ||= @blocks
+        playfield_remaining_heights = Game.playfield_remaining_heights(self)
+        result = bottom_blocks(blocks).any? do |bottom_block|
+          playfield_column = @column + bottom_block[:column_index]
+          !bottom_block[:block].clear? &&
+            (@row + bottom_block[:row]) >= playfield_remaining_heights[playfield_column] - 1
+        end
+        Game.consider_eliminating_lines if result
+        result
+      end
+      
+      # Returns blocks at the bottom of a tetromino, which could be from multiple rows depending on shape (e.g. T)
+      def bottom_blocks(blocks = nil)
+        blocks ||= @blocks
+        width.times.map do |column_index|
+          row_blocks_with_row_index = @blocks.each_with_index.to_a.reverse.detect do |row_blocks, row_index|
+            !row_blocks[column_index].clear?
+          end
+          bottom_block = row_blocks_with_row_index[0][column_index]
+          bottom_block_row = row_blocks_with_row_index[1]
+          {
+            block: bottom_block,
+            row: bottom_block_row,
+            column_index: column_index
+          }
+        end
+      end
+      
+      def bottom_block_for_column(column)
+        bottom_blocks.detect {|bottom_block| (@column + bottom_block[:column_index]) == column}
+      end
+      
+      def right_blocked?
+        (@column == PLAYFIELD_WIDTH - width) || Game.playfield[row][column + width].occupied?
+      end
+      
+      def left_blocked?
+        (@column == 0) || Game.playfield[row][column - 1].occupied?
+      end
+      
+      def width
+        @blocks[0].size
+      end
+      
+      def height
+        @blocks.size
+      end
+      
+      def down
+        unless stopped?
+          new_row = @row + 1
+          update_playfield(new_row, @column)
+        end
+      end
+      
+      def left
+        unless left_blocked?
+          new_column = @column - 1
+          update_playfield(@row, new_column)
+        end
+      end
+      
+      def right
+        unless right_blocked?
+          new_column = @column + 1
+          update_playfield(@row, new_column)
+        end
+      end
+      
+      # Rotate in specified direcation, which can be :right (clockwise) or :left (counterclockwise)
+      def rotate(direction)
+        return if stopped?
+        array_rotation_value = direction == :right ? -1 : 1
+        self.orientation = ORIENTATIONS[ORIENTATIONS.rotate(array_rotation_value).index(@orientation)]
+        new_blocks = Matrix[*@blocks].transpose.to_a
+        if direction == :right
+          new_blocks = new_blocks.map(&:reverse)
+        else
+          new_blocks = new_blocks.reverse
+        end
+        new_blocks = Matrix[*new_blocks].to_a
+        unless stopped?(blocks: new_blocks) || right_blocked? || left_blocked?
+          remove_from_playfield
+          self.blocks = new_blocks
+          update_playfield(@row, @column)
+        end
+      end
+      
+      def default_blocks
+        case @letter
+        when :I
+          [
+            [block, block, block, block]
+          ]
+        when :J
+          [
+            [block, block, block],
+            [empty, empty, block],
+          ]
+        when :L
+          [
+            [block, block, block],
+            [block, empty, empty],
+          ]
+        when :O
+          [
+            [block, block],
+            [block, block],
+          ]
+        when :S
+          [
+            [empty, block, block],
+            [block, block, empty],
+          ]
+        when :T
+          [
+            [block, block, block],
+            [empty, block, empty],
+          ]
+        when :Z
+          [
+            [block, block, empty],
+            [empty, block, block],
+          ]
+        end
+      end
+      
+      def color
+        LETTER_COLORS[@letter]
+      end
+      
+      private
+      
+      def block
+        Block.new(color)
+      end
+      
+      def empty
+        Block.new
+      end
+      
+      def update_playfield_block(&updater)
+        @row.upto(@row + height - 1) do |playfield_row|
+          @column.upto(@column + width - 1) do |playfield_column|
+            row_index = playfield_row - @row
+            column_index = playfield_column - @column
+            updater.call(playfield_row, playfield_column, row_index, column_index)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# 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 Tetris
+  module View
+    class Block
+      include Glimmer::UI::CustomWidget
+  
+      options :block_size, :row, :column
+  
+      body {
+        composite {
+          layout nil
+          layout_data {
+            width_hint block_size
+            height_hint block_size
+          }
+          background bind(Model::Game.playfield[row][column], :color)
+          rectangle(0, 0, block_size, block_size)
+          rectangle(3, 3, block_size - 6, block_size - 6) {
+            foreground :gray
+          }
+        }
+      }
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+# 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_relative 'block'
+
+class Tetris
+  module View
+    class Playfield
+      include Glimmer::UI::CustomWidget
+  
+      options :playfield_width, :playfield_height, :block_size
+  
+      body {
+        composite {
+          grid_layout(playfield_width, true) {
+            margin_width block_size
+            margin_height block_size
+            horizontal_spacing 0
+            vertical_spacing 0
+          }
+          
+          playfield_height.times { |row|
+            playfield_width.times { |column|
+              block(block_size: block_size, row: row, column: column)
+            }
+          }
+        }
+      }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.2.2
+  version: 4.18.2.3
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -465,6 +465,12 @@ files:
 - samples/elaborate/contact_manager/contact_repository.rb
 - samples/elaborate/login.rb
 - samples/elaborate/meta_sample.rb
+- samples/elaborate/tetris.rb
+- samples/elaborate/tetris/model/block.rb
+- samples/elaborate/tetris/model/game.rb
+- samples/elaborate/tetris/model/tetromino.rb
+- samples/elaborate/tetris/view/block.rb
+- samples/elaborate/tetris/view/playfield.rb
 - samples/elaborate/tic_tac_toe.rb
 - samples/elaborate/tic_tac_toe/board.rb
 - samples/elaborate/tic_tac_toe/cell.rb