glimmer-dsl-swt 4.18.2.3 → 4.18.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 813f7cef0d25c94aa62c0cd57d3445a3eb13acb229bdd59264f7d4a0268f1ed3
-  data.tar.gz: dccf84bac2d2ca037df0b4157335fd7451fc2701d90a79df18abc61971725df6
+  metadata.gz: 9e12bb24a84b93822013eef2122021cd5e6a8f90f9e450ac83f7bd5b5f0b7b55
+  data.tar.gz: dfdba626253a34506b99971821378e8579eac7f21a955ddbd7bc0543f770ad51
 SHA512:
-  metadata.gz: 9702ce2c81c56ddf6c56e590c7f30509149d75fbd6ee8e01da4bb5e0405381fae39da688ec30ab0686ff987cdc4eee06992d7c4b365a32f8bc2d773ea23e3b05
-  data.tar.gz: 4d1a2dfa58fffa6dd037ef07463056ccc70d09261bb0720f238332c07284347993c94e96ef5d18bb9a7f1f75d71b72ed2fdfe72202320f8de489624ac9084edc
+  metadata.gz: d489317bc86659858e1215aca4f35441aa123f59affb4f35fe9fce1ec04f220f3856f5d203d686a1091a7a1652b746a9453ce598eb684910b1ded8717fc1552b
+  data.tar.gz: 10c31c53aab7d5a8905c6448f66dcacb01c98b952c9934ae1e5236437e583d37aa607161f38946754938c9fc655c876064cc268a93d73d8746667d69d69f684b

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+### 4.18.2.4
+
+- Tetris scoring
+- Tetris eliminated Line tracking
+- Tetris level tracking and speed-ups
+- Tetris preview upcoming tetromino shape
+- Added parent_proxy to CustomWidget and CustomShell classes
+- Update CustomShell#center and ShellProxy#center to center_within_display to avoid clash with `row_layout` center property
+- Fixed issue with shell/dialog/custom-shell not maintaining parent when not passed
+- Fix Tetris sideways edge detection
+
 ### 4.18.2.3
 
 - Added Tetris 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.18.2.3
+# [<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.4
 ## 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)
@@ -226,6 +226,11 @@ Glimmer App:
 
 [![Math Bowling App Screenshot](https://raw.githubusercontent.com/AndyObtiva/MathBowling/master/Math-Bowling-Screenshot.png)](https://github.com/AndyObtiva/MathBowling)
 
+**Note:** I offer Glimmer as an open-source project that represents my interests in Ruby Programming, Desktop GUI application development with SWT, Object Oriented Design, Design Patterns, and Software Architecture.
+Additionally, I am sharing my professional experience and expertise in Eclipse SWT given that I am an [EclipseCon](http://andymaleh.blogspot.com/2007/03/eclipsecon-2007-day-3.html)/[EclipseWorld](http://andymaleh.blogspot.com/2008/11/eclipseworld-2008-highlights.html) presenter and have built professional applications in SWT/JFace/RCP for Obtiva and the Pampered Chef in the past. This is also done in the hopes that it would indirectly bring me work in a field I am extremely passionate about.
+That said, please keep in mind that I myself am learning topics in Software Engineering too everyday, including newer editions of SWT and JRuby, which seem to pop up every quarter.
+If you see anything that needs to be improved, please do not hesitate to contact me on [Gitter](https://gitter.im/AndyObtiva/glimmer) or submit [Issues](https://github.com/AndyObtiva/glimmer-dsl-swt/issues)/[Pull-Requests](https://github.com/AndyObtiva/glimmer-dsl-swt/pulls).
+
 ## Table of contents
 
 - [Glimmer (JRuby Desktop Development GUI Framework)](#jruby-desktop-development-gui-framework)
@@ -301,7 +306,7 @@ Glimmer App:
       - [Custom Widget API](#custom-widget-api)
       - [Content/Options Example](#contentoptions-example)
       - [Gotcha](#gotcha)
-      - [Final Notes](#final-notes)
+      - [Custom Widget Final Notes](#custom-widget-final-notes)
     - [Custom Shells](#custom-shells)
     - [Drag and Drop](#drag-and-drop)
     - [Miscellaneous](#miscellaneous)
@@ -453,7 +458,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.2.3
+jgem install glimmer-dsl-swt -v 4.18.2.4
 
 
 ```
@@ -473,7 +478,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.3
+gem 'glimmer-dsl-swt', '~> 4.18.2.4
 '
 ```
 
@@ -532,7 +537,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.3
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.2.4
 
 
       
@@ -1013,7 +1018,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.3
+  Swt    glimmer-dsl-swt    4.18.2.4
 
   AndyMaleh    Glimmer DSL for SWT
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk
@@ -2340,25 +2345,33 @@ Example (you may copy/paste in [`girb`](#girb-glimmer-irb-command)):
 ```ruby
 include Glimmer
 
+# image object has to be declared outside the canvas and shell to avoid confusing with canvas image property
+image_object = image(File.expand_path('./icons/scaffold_app.png'), width: 100)
+
 shell {
   text 'Canvas Example'
   minimum_size 320, 400
 
   canvas {
-    background :yellow
+    background :dark_yellow
     rectangle(0, 0, 220, 400, fill: true) {
-      background :red
+      background :dark_red
     }
     rectangle(50, 20, 300, 150, 30, 50, round: true, fill: true) {
-      background :magenta
+      background :yellow
     }
     rectangle(150, 200, 100, 70, true, gradient: true) {
-      background :dark_magenta
+      background :dark_red
       foreground :yellow
     }
+    text('Glimmer', 208, 83) {
+      font height: 25, style: :bold
+    }
     rectangle(200, 80, 108, 36) {
-      foreground color(:dark_blue)
+      foreground :black
+      line_width 3
     }
+    image(image_object, 70, 50)
   }
 }.open
 ```
@@ -2400,7 +2413,11 @@ shell {
 }.open
 ```
 
-In any case, if there is anything missing you would like added to the Glimmer Shape DSL that you saw available in the SWT APIs, you may [report an issue](https://github.com/AndyObtiva/glimmer-dsl-swt/issues) or implement yourself and [contribute](#contributing) via a Pull Request.
+In any case, if there is anything missing you would like added to the Glimmer Shape DSL that you saw available in the SWT APIs, you may [report an issue](https://github.com/AndyObtiva/glimmer-dsl-swt/issues) or implement yourself and [contribute](#contributing) via a [Pull Request](https://github.com/AndyObtiva/glimmer-dsl-swt/pulls).
+
+#### Shapes inside a Widget
+
+Keep in mind that the Shape DSL can be used inside any widget, not just `canvas`. Unlike shapes on a `canvas`, which are standalone graphics, when included in a widget, which already has its own look and feel, shapes are used as a decorative add-on that complements its look by getting painted on top of it. For example, shapes were used to decorate `composite` blocks in the [Tetris](#tetris) sample to have a more bevel look. In summary, Shapes can be used in a hybrid approach (shapes inside a widget), not just standalone in a `canvas`.
 
 ### Canvas Animation DSL
 
@@ -2944,7 +2961,7 @@ If you need a better widget with the ability to customize the date format patter
 
 ### Observer
 
-Glimmer comes with `Observer` module, which is used internally for data-binding, but can also be used externally for custom use of the Observer Pattern. It is hidden when observing widgets, and used explicitly when observing models.
+Glimmer comes with the `Observer` mixin module, which is used internally for data-binding, but can also be used externally for custom use of the Observer Pattern. It is hidden when observing widgets, and used explicitly when observing models. In bidirectional data-binding, `Observer` is automatically unregistered from models once a widget is disposed to avoid memory leaks and worrying about managing them yourself.
 
 #### Observing Widgets
 
@@ -3310,7 +3327,7 @@ body {
 
 The `text` method invoked in the custom widget body will call the one you defined above it. To avoid this gotcha, simply name the text property above something else, like `custom_text`.
 
-#### Final Notes
+#### Custom Widget Final Notes
 
 This [Eclipse guide](https://www.eclipse.org/articles/Article-Writing%20Your%20Own%20Widget/Writing%20Your%20Own%20Widget.htm) for how to write custom SWT widgets is also applicable to Glimmer Custom Widgets written in Ruby. I recommend reading it:
 [https://www.eclipse.org/articles/Article-Writing%20Your%20Own%20Widget/Writing%20Your%20Own%20Widget.htm](https://www.eclipse.org/articles/Article-Writing%20Your%20Own%20Widget/Writing%20Your%20Own%20Widget.htm)
@@ -4640,10 +4657,12 @@ This sample demonstrates how to build an interactive animated game with MVC arch
 
 Code:
 
-[samples/elaborate/tic_tac_toe.rb](samples/elaborate/tetris.rb)
+[samples/elaborate/tetris.rb](samples/elaborate/tetris.rb)
 
 ![Tetris](images/glimmer-tetris.png)
 
+![Tetris Game Over](images/glimmer-tetris-game-over.png)
+
 ### External Samples
 
 #### Glimmer Calculator
@@ -4697,6 +4716,8 @@ If you have a Glimmer app you would like referenced here, please mention in a Pu
 
 Note: this section mostly applies to Mac and Windows. On Linux, you can just run `glimmer package:gem` and after installing the gem, you get an executable matching the name of the app/custom-shell-gem you are building (e.g. `calculator` command becomes available after installing the [glimmer-cs-calculator](https://github.com/AndyObtiva/glimmer-cs-calculator) gem)
 
+Note 2: Glimmer packaging has a strong dependency on JDK8 at the moment. JDK9 & JDK10 might work, but JDK11 and onward definitely won't since they dropped javapackager, which later came back as jpackage in JDK14, but it's not ready for prime time yet. Just stick to JDK8 for now, strongly supported by Oracle for the next 6 years at least.
+
 Glimmer simplifies the process of native-executable packaging and distribution on Mac and Windows via a single `glimmer package` command:
 
 ```

data/VERSION

@@ -1 +1 @@
-4.18.2.3
+4.18.2.4

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.3 ruby lib
+# stub: glimmer-dsl-swt 4.18.2.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.2.3"
+  s.version = "4.18.2.4"
 
   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-23"
+  s.date = "2021-01-24"
   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]
@@ -137,7 +137,9 @@ Gem::Specification.new do |s|
     "samples/elaborate/tetris/model/game.rb",
     "samples/elaborate/tetris/model/tetromino.rb",
     "samples/elaborate/tetris/view/block.rb",
+    "samples/elaborate/tetris/view/game_over_dialog.rb",
     "samples/elaborate/tetris/view/playfield.rb",
+    "samples/elaborate/tetris/view/score_lane.rb",
     "samples/elaborate/tic_tac_toe.rb",
     "samples/elaborate/tic_tac_toe/board.rb",
     "samples/elaborate/tic_tac_toe/cell.rb",

data/lib/glimmer/swt/layout_data_proxy.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/swt/shell_proxy.rb

@@ -46,6 +46,7 @@ module Glimmer
           @swt_widget = swt_widget
         else
           if args.first.is_a?(ShellProxy)
+            @parent_proxy = args[0]
             args[0] = args[0].swt_widget
           end
           style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
@@ -78,7 +79,7 @@ module Glimmer
       end
 
       # Centers shell within monitor it is in
-      def center
+      def center_within_display
         primary_monitor = @display.getPrimaryMonitor()
         monitor_bounds = primary_monitor.getBounds()
         shell_bounds = @swt_widget.getBounds()
@@ -101,7 +102,7 @@ module Glimmer
         else
           @opened_before = true
           @swt_widget.pack
-          center
+          center_within_display
           @swt_widget.open
         end
       end

data/lib/glimmer/swt/widget_proxy.rb

@@ -158,7 +158,7 @@ module Glimmer
           underscored_widget_name = self.class.underscored_widget_name(@swt_widget)
           parent_proxy_class = self.class.widget_proxy_class(self.class.underscored_widget_name(@swt_widget.parent))
           parent = swt_widget.parent
-          @parent_proxy = parent.get_data('proxy') || parent_proxy_class.new(swt_widget: parent)
+          @parent_proxy = parent&.get_data('proxy') || parent_proxy_class.new(swt_widget: parent)
         end
         if @swt_widget&.get_data('proxy').nil?
           @swt_widget.set_data('proxy', self)

data/lib/glimmer/ui/custom_shell.rb

@@ -68,8 +68,8 @@ module Glimmer
         body_root.visible?
       end
 
-      def center
-        body_root.center
+      def center_within_display
+        body_root.center_within_display
       end
 
       def start_event_loop

data/lib/glimmer/ui/custom_widget.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
@@ -141,10 +141,9 @@ module Glimmer
         end
       end
 
-      attr_reader :body_root, :swt_widget, :parent, :swt_style, :options
+      attr_reader :body_root, :swt_widget, :parent, :parent_proxy, :swt_style, :options
 
       def initialize(parent, *swt_constants, options, &content)
-        @parent = parent
         @swt_style = SWT::SWTProxy[*swt_constants]
         options ||= {}
         @options = self.class.options.merge(options)
@@ -156,6 +155,9 @@ module Glimmer
         raise Glimmer::Error, 'Invalid custom widget for having an empty body! Please fill body block!' if @body_root.nil?
         @swt_widget = @body_root.swt_widget
         @swt_widget.set_data('custom_widget', self)
+        @parent = parent
+        @parent ||= @swt_widget.parent
+        @parent_proxy ||= @parent&.get_data('proxy')
         execute_hooks('after_body')
       end
       
@@ -211,10 +213,10 @@ module Glimmer
 
       # This method ensures it has an instance method not coming from Glimmer DSL
       def has_instance_method?(method_name)
-        respond_to?(method_name) and 
+        respond_to?(method_name) and
           !swt_widget&.respond_to?(method_name) and
           (method(method_name) rescue nil) and
-          !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb') and 
+          !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb') and
           !method(method_name)&.source_location&.first&.include?('glimmer/swt/widget_proxy.rb')
       end
 
@@ -265,13 +267,13 @@ module Glimmer
         end
       end
 
-      alias local_respond_to? respond_to?      
+      alias local_respond_to? respond_to?
       def respond_to?(method, *args, &block)
         super or
           can_handle_observation_request?(method) or
           body_root.respond_to?(method, *args, &block)
       end
-
+      
       private
 
       def execute_hooks(hook_name)

data/samples/elaborate/tetris.rb

@@ -24,6 +24,8 @@
 require_relative 'tetris/model/game'
 
 require_relative 'tetris/view/playfield'
+require_relative 'tetris/view/score_lane'
+require_relative 'tetris/view/game_over_dialog'
 
 class Tetris
   include Glimmer::UI::CustomShell
@@ -31,58 +33,50 @@ class Tetris
   BLOCK_SIZE = 25
   PLAYFIELD_WIDTH = 10
   PLAYFIELD_HEIGHT = 20
+  PREVIEW_PLAYFIELD_WIDTH = 4
+  PREVIEW_PLAYFIELD_HEIGHT = 2
   
   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)
+        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)
-          when 'a'.bytes.first
+          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
       }
     }
+    
+    Model::Game.configure_beeper do
+      async_exec {
+        display.beep
+      }
+    end
   }
   
   after_body {
+    Model::Game.start
+    
     Thread.new {
       loop {
-        sleep(0.9)
+        sleep(Model::Game.delay)
         sync_exec {
-          unless @game_over
+          unless Model::Game.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
+            game_over_dialog(parent_shell: body_root).open if Model::Game.current_tetromino.row <= 0 && Model::Game.current_tetromino.stopped?
           end
         }
       }
@@ -91,10 +85,22 @@ class Tetris
   
   body {
     shell(:no_resize) {
+      grid_layout {
+        num_columns 2
+        make_columns_equal_width false
+        margin_width 0
+        margin_height 0
+        horizontal_spacing 0
+      }
+      
       text 'Glimmer Tetris'
       background :gray
+            
+      playfield(game_playfield: Model::Game.playfield, playfield_width: PLAYFIELD_WIDTH, playfield_height: PLAYFIELD_HEIGHT, block_size: BLOCK_SIZE)
       
-      playfield(playfield_width: PLAYFIELD_WIDTH, playfield_height: PLAYFIELD_HEIGHT, block_size: BLOCK_SIZE)
+      score_lane(block_size: BLOCK_SIZE) {
+        layout_data(:fill, :fill, false, true)
+      }
     }
   }
 end

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

@@ -31,6 +31,7 @@ class Tetris
         @color = color
       end
       
+      # Clears block color. `quietly` option indicates if it should not notify observers by setting value quietly via variable not attribute writer.
       def clear
         self.color = COLOR_CLEAR
       end
@@ -45,4 +46,3 @@ class Tetris
     end
   end
 end
-

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

@@ -25,10 +25,16 @@ require_relative 'tetromino'
 class Tetris
   module Model
     class Game
+      SCORE_MULTIPLIER = {1 => 40, 2 => 100, 3 => 300, 4 => 1200}
+      
       class << self
+        attr_accessor :game_over, :preview_tetromino, :lines, :score, :level
+        alias game_over? game_over
+        
         def consider_adding_tetromino
           if tetrominoes.empty? || Game.current_tetromino.stopped?
-            tetrominoes << Tetromino.new
+            preview_tetromino.launch!
+            preview_next_tetromino!
           end
         end
         
@@ -42,22 +48,70 @@ class Tetris
         
         # Returns blocks in the playfield
         def playfield
-          @playfield ||= PLAYFIELD_HEIGHT.times.map {
+          @playfield ||= @original_playfield = PLAYFIELD_HEIGHT.times.map {
             PLAYFIELD_WIDTH.times.map {
               Block.new
             }
           }
         end
         
+        def hypothetical(&block)
+          @playfield = hypothetical_playfield
+          block.call
+          @playfield = @original_playfield
+        end
+        
+        def hypothetical?
+          @playfield != @original_playfield
+        end
+        
+        def hypothetical_playfield
+          PLAYFIELD_HEIGHT.times.map { |row|
+            PLAYFIELD_WIDTH.times.map { |column|
+              playfield[row][column].clone
+            }
+          }
+        end
+        
+        def preview_playfield
+          @preview_playfield ||= PREVIEW_PLAYFIELD_HEIGHT.times.map {|row|
+            PREVIEW_PLAYFIELD_WIDTH.times.map {|column|
+              Block.new
+            }
+          }
+        end
+        
+        def preview_next_tetromino!
+          self.preview_tetromino = Tetromino.new
+        end
+        
+        def calculate_score!(eliminated_lines)
+          new_score = SCORE_MULTIPLIER[eliminated_lines] * (level + 1)
+          self.score += new_score
+        end
+        
+        def level_up!
+          self.level += 1 if lines >= self.level*10
+        end
+        
+        def delay
+          [1.1 - (level.to_i * 0.1), 0.001].max
+        end
+        
         def consider_eliminating_lines
-          cleared_line = false
+          eliminated_lines = 0
           playfield.each_with_index do |row, playfield_row|
             if row.all? {|block| !block.clear?}
-              cleared_line = true
+              eliminated_lines += 1
               shift_blocks_down_above_row(playfield_row)
             end
           end
-          beep if cleared_line
+          if eliminated_lines > 0
+            beep
+            self.lines += eliminated_lines
+            level_up!
+            calculate_score!(eliminated_lines)
+          end
         end
         
         def beep
@@ -79,14 +133,21 @@ class Tetris
           playfield[0].each(&:clear)
         end
         
-        def restart
+        def start
+          self.level = 1
+          self.score = 0
+          self.lines = @previoius_lines = 0
           reset_playfield
+          reset_preview_playfield
           reset_tetrominoes
+          preview_next_tetromino!
+          consider_adding_tetromino
+          self.game_over = false
         end
-        alias start restart
+        alias restart start
         
         def reset_tetrominoes
-          @tetrominoes = [Tetromino.new]
+          @tetrominoes = []
         end
         
         def reset_playfield
@@ -97,14 +158,22 @@ class Tetris
           end
         end
         
+        def reset_preview_playfield
+          preview_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])
+                (bottom_most_block = tetromino.bottom_most_block_for_column(playfield_column)).nil? ||
+                (playfield_row > tetromino.row + bottom_most_block[:row])
               )
             end || [nil, PLAYFIELD_HEIGHT])[1]
           end.to_a

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

@@ -38,16 +38,31 @@ class Tetris
         Z: :red,
       }
       
-      attr_reader :letter
+      attr_reader :letter, :preview
+      alias preview? preview
       attr_accessor :orientation, :blocks, :row, :column
       
       def initialize
         @letter = LETTER_COLORS.keys.sample
         @orientation = :north
         @blocks = default_blocks
+        @preview = true
+        new_row = 0
+        new_column = (PREVIEW_PLAYFIELD_WIDTH - width)/2
+        update_playfield(new_row, new_column)
+      end
+      
+      def playfield
+        @preview ? Game.preview_playfield : Game.playfield
+      end
+      
+      def launch!
+        remove_from_playfield
+        @preview = false
         new_row = 1 - height
         new_column = (PLAYFIELD_WIDTH - width)/2
         update_playfield(new_row, new_column)
+        Game.tetrominoes << self
       end
       
       def update_playfield(new_row = nil, new_column = nil)
@@ -61,58 +76,101 @@ class Tetris
       
       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?
+          playfield[playfield_row][playfield_column].color = blocks[row_index][column_index].color if playfield_row >= 0 && 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
+          playfield[playfield_row][playfield_column].clear if playfield_row >= 0 && !blocks[row_index][column_index].clear? && playfield[playfield_row][playfield_column]&.color == color
         end
       end
       
-      def stopped?(blocks: nil)
-        blocks ||= @blocks
+      def stopped?
+        return true if @stopped || @preview
         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
+        result = bottom_most_blocks.any? do |bottom_most_block|
+          playfield_column = @column + bottom_most_block[:column_index]
+            playfield_remaining_heights[playfield_column] &&
+            @row + bottom_most_block[:row] >= playfield_remaining_heights[playfield_column] - 1
+        end
+        if result && !Game.hypothetical?
+          @stopped = result
+          Game.consider_eliminating_lines
+          Model::Game.consider_adding_tetromino
         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
+      # Returns bottom-most blocks of a tetromino, which could be from multiple rows depending on shape (e.g. T)
+      def bottom_most_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]
+          bottom_most_block = row_blocks_with_row_index[0][column_index]
+          bottom_most_block_row = row_blocks_with_row_index[1]
           {
-            block: bottom_block,
-            row: bottom_block_row,
+            block: bottom_most_block,
+            row: bottom_most_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}
+      def bottom_most_block_for_column(column)
+        bottom_most_blocks.detect {|bottom_most_block| (@column + bottom_most_block[:column_index]) == column}
       end
       
       def right_blocked?
-        (@column == PLAYFIELD_WIDTH - width) || Game.playfield[row][column + width].occupied?
+        (@column == PLAYFIELD_WIDTH - width) ||
+          right_most_blocks.any? { |right_most_block|
+            playfield[@row + right_most_block[:row_index]][@column + right_most_block[:column_index] + 1].occupied?
+          }
       end
       
-      def left_blocked?
-        (@column == 0) || Game.playfield[row][column - 1].occupied?
+      # Returns right-most blocks of a tetromino, which could be from multiple columns depending on shape (e.g. T)
+      def right_most_blocks
+        @blocks.each_with_index.map do |row_blocks, row_index|
+          column_block_with_column_index = row_blocks.each_with_index.to_a.reverse.detect do |column_block, column_index|
+            !column_block.clear?
+          end
+          if column_block_with_column_index
+            right_most_block = column_block_with_column_index[0]
+            {
+              block: right_most_block,
+              row_index: row_index,
+              column_index: column_block_with_column_index[1]
+            }
+          end
+        end.compact
       end
       
+      def left_blocked?
+        (@column == 0) ||
+          left_most_blocks.any? { |left_most_block|
+            playfield[@row + left_most_block[:row_index]][@column + left_most_block[:column_index] - 1].occupied?
+          }
+      end
+
+      # Returns right-most blocks of a tetromino, which could be from multiple columns depending on shape (e.g. T)
+      def left_most_blocks
+        @blocks.each_with_index.map do |row_blocks, row_index|
+          column_block_with_column_index = row_blocks.each_with_index.to_a.detect do |column_block, column_index|
+            !column_block.clear?
+          end
+          if column_block_with_column_index
+            left_most_block = column_block_with_column_index[0]
+            {
+              block: left_most_block,
+              row_index: row_index,
+              column_index: column_block_with_column_index[1]
+            }
+          end
+        end.compact
+      end
+            
       def width
         @blocks[0].size
       end
@@ -122,6 +180,7 @@ class Tetris
       end
       
       def down
+        launch! if preview?
         unless stopped?
           new_row = @row + 1
           update_playfield(new_row, @column)
@@ -145,20 +204,42 @@ class Tetris
       # 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
+        can_rotate = nil
+        new_blocks = nil
+        Game.hypothetical do
+          hypothetical_rotated_tetromino = hypothetical_tetromino
+          new_blocks = hypothetical_rotated_tetromino.rotate_blocks(direction)
+          can_rotate = !hypothetical_rotated_tetromino.stopped? && !hypothetical_rotated_tetromino.right_blocked? && !hypothetical_rotated_tetromino.left_blocked?
         end
-        new_blocks = Matrix[*new_blocks].to_a
-        unless stopped?(blocks: new_blocks) || right_blocked? || left_blocked?
+        if can_rotate
           remove_from_playfield
+          self.orientation = ORIENTATIONS[ORIENTATIONS.rotate(direction == :right ? -1 : 1).index(@orientation)]
           self.blocks = new_blocks
           update_playfield(@row, @column)
         end
+      rescue => e
+        puts e.full_message
+      end
+      
+      def rotate_blocks(direction)
+          new_blocks = Matrix[*@blocks].transpose.to_a
+          if direction == :right
+            new_blocks = new_blocks.map(&:reverse)
+          else
+            new_blocks = new_blocks.reverse
+          end
+          Matrix[*new_blocks].to_a
+      end
+      
+      def hypothetical_tetromino
+        clone.tap do |hypo_clone|
+          remove_from_playfield
+          hypo_clone.blocks = @blocks.map do |row_blocks|
+            row_blocks.map do |column_block|
+              column_block.clone
+            end
+          end
+        end
       end
       
       def default_blocks
@@ -204,6 +285,10 @@ class Tetris
         LETTER_COLORS[@letter]
       end
       
+      def include_block?(block)
+        @blocks.flatten.include?(block)
+      end
+      
       private
       
       def block

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

@@ -24,16 +24,13 @@ class Tetris
     class Block
       include Glimmer::UI::CustomWidget
   
-      options :block_size, :row, :column
+      options :game_playfield, :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)
+          background bind(game_playfield[row][column], :color)
+          # TODO improve shapes to have a bevel look
           rectangle(0, 0, block_size, block_size)
           rectangle(3, 3, block_size - 6, block_size - 6) {
             foreground :gray

data/samples/elaborate/tetris/view/game_over_dialog.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 Tetris
+  module View
+    class GameOverDialog
+      include Glimmer::UI::CustomShell
+  
+      options :parent_shell
+      
+      body {
+        dialog(parent_shell) {
+          row_layout {
+            type :vertical
+            center true
+          }
+          text 'Tetris'
+          
+          label(:center) {
+            text 'Game Over!'
+            font name: 'Menlo', height: 30, style: :bold
+          }
+          label # filler
+          button {
+            text 'Play Again?'
+            
+            on_widget_selected {
+              Model::Game.restart
+              
+              body_root.close
+            }
+          }
+          
+          on_shell_activated {
+            Model::Game.game_over = true
+            display.beep
+          }
+          
+          on_shell_closed {
+            exit_game
+          }
+          
+          on_key_pressed { |event|
+            exit_game if event.keyCode == swt(:cr)
+          }
+        }
+      }
+      
+      def exit_game
+        display.dispose if Model::Game.game_over?
+      end
+    end
+  end
+end

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

@@ -26,20 +26,27 @@ class Tetris
     class Playfield
       include Glimmer::UI::CustomWidget
   
-      options :playfield_width, :playfield_height, :block_size
+      options :game_playfield, :playfield_width, :playfield_height, :block_size
   
       body {
         composite {
-          grid_layout(playfield_width, true) {
+          grid_layout {
+            num_columns playfield_width
+            make_columns_equal_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)
+              block(game_playfield: game_playfield, block_size: block_size, row: row, column: column) {
+                layout_data {
+                  width_hint block_size
+                  height_hint block_size
+                }
+              }
             }
           }
         }

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

@@ -0,0 +1,87 @@
+# 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 'playfield'
+
+class Tetris
+  module View
+    class ScoreLane
+      include Glimmer::UI::CustomWidget
+  
+      options :block_size
+      
+      before_body {
+        @font_name = 'Menlo'
+        @font_height = 32
+      }
+  
+      body {
+        composite {
+          row_layout {
+            type :vertical
+            center true
+            fill true
+            margin_width 0
+            margin_right block_size
+            margin_height block_size
+          }
+          label(:center) {
+            text 'Next'
+            font name: @font_name, height: @font_height, style: :bold
+          }
+          playfield(game_playfield: Model::Game.preview_playfield, playfield_width: PREVIEW_PLAYFIELD_WIDTH, playfield_height: PREVIEW_PLAYFIELD_HEIGHT, block_size: BLOCK_SIZE)
+
+          label(:center) {
+            text 'Score'
+            font name: @font_name, height: @font_height, style: :bold
+          }
+          label(:center) {
+            text bind(Model::Game, :score)
+            font height: @font_height
+          }
+          
+          label # spacer
+          
+          label(:center) {
+            text 'Lines'
+            font name: @font_name, height: @font_height, style: :bold
+          }
+          label(:center) {
+            text bind(Model::Game, :lines)
+            font height: @font_height
+          }
+          
+          label # spacer
+          
+          label(:center) {
+            text 'Level'
+            font name: @font_name, height: @font_height, style: :bold
+          }
+          label(:center) {
+            text bind(Model::Game, :level)
+            font height: @font_height
+          }
+        }
+      }
+    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.3
+  version: 4.18.2.4
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-23 00:00:00.000000000 Z
+date: 2021-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -470,7 +470,9 @@ files:
 - samples/elaborate/tetris/model/game.rb
 - samples/elaborate/tetris/model/tetromino.rb
 - samples/elaborate/tetris/view/block.rb
+- samples/elaborate/tetris/view/game_over_dialog.rb
 - samples/elaborate/tetris/view/playfield.rb
+- samples/elaborate/tetris/view/score_lane.rb
 - samples/elaborate/tic_tac_toe.rb
 - samples/elaborate/tic_tac_toe/board.rb
 - samples/elaborate/tic_tac_toe/cell.rb