glimmer-dsl-swt 4.18.7.3 → 4.18.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98ad3496a7f7eec9bebe867be21b6fefd3764baf67b8336a2177086826fc6e0c
-  data.tar.gz: 6093daa8c240d0e02f43078590f84eb77c9cdba070c2c8ba5c7e665fb4455338
+  metadata.gz: a27a28f23a9ca77db7405be0a2789396423d3634e42523440f92b3a86b33df9f
+  data.tar.gz: c6f3b4a9badd95f13c190772537ff0bfae688253573d3d11230f7935721aa9a9
 SHA512:
-  metadata.gz: 43d3ffa17ae9ad9fae4f867d483439116d0e08055614f83c2ef59f87a38268472ace3821ee6b2521588d02fda8da6a6f009ff9ea93085dc60170835cb6aa4aff
-  data.tar.gz: 0f4bb8712916ddb9ee5cd25ded0bdce6b5fc008f2ab23a53ccac07f19eac556daf4eb3594944e91c3a47efd3df3794012abd572fb6ea17ed74357622a67a5253
+  metadata.gz: 93e62d4d5abe0c8c15f27363bbfc52d1e7ebb89ee090e4f6c494c0fda3b0e033928991f9d6898b585848a442b5411aa1d39f476b3d9124a1fa7d81f43f91f839
+  data.tar.gz: 1436f547b6ce8313a432b88e4758cebcd59c8da9f785487d04f96209b1a2b56aeffd6ed74e7942f676a1085efe7d491dfcac3e13c2499e1d0f7b8f8687117db3

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+### 4.18.7.4
+
+- Add `glimmer scaffold:customshape[name,namespace]` command
+- Add `glimmer scaffold:gem:customshape[name,namespace]` command
+- Add `glimmer list:gems:customshape[keyword]` command
+- Support automatic inference of `fill: true` for `path` just like other shapes
+- Support `filled: true` alternative for `fill: true` Canvas Shape DSL option
+- Fix issue with having to pass base_color to `bevel` custom shape in Tetris before data-binding instead of data-binding being sufficient
+
 ### 4.18.7.3
 
 - Support the ability for nested shapes to override their parent `shape` common shared properties

data/VERSION

@@ -1 +1 @@
-4.18.7.3
+4.18.7.4

data/docs/reference/GLIMMER_COMMAND.md

@@ -67,6 +67,7 @@ Tasks are run via rake. Some tasks take arguments in square brackets.
 Available tasks are below (if you do not see any, please add `require 'glimmer/rake_task'` to Rakefile and rerun or run rake -T):
 
 Select a Glimmer task to run: (Press ↑/↓ arrow to move, Enter to select and letters to filter)
+  glimmer list:gems:customshape[query]                       # List Glimmer custom shape gems available at rubygems.org (query is optional) [alt: list:gems:cp]
 ‣ glimmer list:gems:customshell[query]                       # List Glimmer custom shell gems available at rubygems.org (query is optional) [alt: list:gems:cs]
   glimmer list:gems:customwidget[query]                      # List Glimmer custom widget gems available at rubygems.org (query is optional) [alt: list:gems:cw]
   glimmer list:gems:dsl[query]                               # List Glimmer DSL gems available at rubygems.org (query is optional)
@@ -81,8 +82,11 @@ Select a Glimmer task to run: (Press ↑/↓ arrow to move, Enter to select and
   glimmer run[app_path]                                      # Runs Glimmer app or custom shell gem in the current directory, unless app_path is specified, then runs it instead (app_path is optional)
   glimmer samples                                            # Brings up the Glimmer Meta-Sample app to allow browsing, running, and viewing code of Glimmer samples
   glimmer scaffold[app_name]                                 # Scaffold Glimmer application directory structure to build a new app
+  glimmer scaffold:customshape[name,namespace]               # Scaffold Glimmer::UI::CustomShape subclass (part of a view) under app/views (namespace is optional) [alt: scaffold:cp]
   glimmer scaffold:customshell[name,namespace]               # Scaffold Glimmer::UI::CustomShell subclass (full window view) under app/views (namespace is optional) [alt: scaffold:cs]
   glimmer scaffold:customwidget[name,namespace]              # Scaffold Glimmer::UI::CustomWidget subclass (part of a view) under app/views (namespace is optional) [alt: scaffold:cw]
+  glimmer scaffold:desktopify[app_name,website]              # Desktopify a web app
+  glimmer scaffold:gem:customshape[name,namespace]           # Scaffold Glimmer::UI::CustomShape subclass (part of a view) under its own Ruby gem project (namespace is required) [alt: scaffold:gem:cp]
   glimmer scaffold:gem:customshell[name,namespace]           # Scaffold Glimmer::UI::CustomShell subclass (full window view) under its own Ruby gem + app project (namespace is required) [alt: scaffold:ge...
   glimmer scaffold:gem:customwidget[name,namespace]          # Scaffold Glimmer::UI::CustomWidget subclass (part of a view) under its own Ruby gem project (namespace is required) [alt: scaffold:gem:cw]
 ```
@@ -333,7 +337,7 @@ glimmer scaffold:cs[name]
 
 #### Custom Widget
 
-To scaffold a Glimmer [custom widget](#custom-widgets) (part of a view) for an existing Glimmer app, run the following command:
+To scaffold a Glimmer [custom widget](GLIMMER_GUI_DSL_SYNTAX.md#custom-widgets) (part of a view) for an existing Glimmer app, run the following command:
 
 ```
 glimmer scaffold:customwidget[name]
@@ -345,6 +349,20 @@ Or the following alternative abbreviation:
 glimmer scaffold:cw[name]
 ```
 
+#### Custom Shape
+
+To scaffold a Glimmer [custom shape](GLIMMER_GUI_DSL_SYNTAX.md#custom-shapes) (a composite or customized shape) for an existing Glimmer app, run the following command:
+
+```
+glimmer scaffold:customshape[name]
+```
+
+Or the following alternative abbreviation:
+
+```
+glimmer scaffold:cp[name]
+```
+
 #### Custom Shell Gem
 
 Custom shell gems are self-contained Glimmer apps as well as reusable [custom shells](#custom-shells).
@@ -382,7 +400,7 @@ Examples:
 
 #### Custom Widget Gem
 
-To scaffold a Glimmer [custom widget](#custom-widgets) gem (part of a view distributed as a Ruby gem), run the following command:
+To scaffold a Glimmer [custom widget](GLIMMER_GUI_DSL_SYNTAX.md#custom-widgets) gem (part of a view distributed as a Ruby gem), run the following command:
 
 ```
 glimmer scaffold:gem:customwidget[name,namespace]
@@ -397,7 +415,7 @@ glimmer scaffold:gem:cw[name,namespace]
 
 It is important to specify a namespace to avoid having your gem clash with existing gems.
 
-The Ruby gem name will follow the convention "glimmer-cw-customwidgetname-namespace" (the 'cw' is for Custom Widget)
+The Ruby gem name will follow the convention "glimmer-cw-customwidgetname-namespace" (the 'cw' is for Custom Widget; name words are not separated)
 
 Only official Glimmer gems created by the Glimmer project committers will have no namespace (e.g. [glimmer-cw-video](https://rubygems.org/gems/glimmer-cw-video) Ruby gem)
 
@@ -406,6 +424,31 @@ Examples:
 - [glimmer-cw-video](https://github.com/AndyObtiva/glimmer-cw-video): Video Widget
 - [glimmer-cw-cdatetime-nebula](https://github.com/AndyObtiva/glimmer-cw-cdatetime-nebula): Nebula CDateTime Widget
 
+#### Custom Shape Gem
+
+To scaffold a Glimmer [custom shape](GLIMMER_GUI_DSL_SYNTAX.md#custom-shapes) gem (part of a view distributed as a Ruby gem), run the following command:
+
+```
+glimmer scaffold:gem:customshape[name,namespace]
+```
+
+Or the following alternative abbreviation:
+
+```
+glimmer scaffold:gem:cp[name,namespace]
+```
+
+
+It is important to specify a namespace to avoid having your gem clash with existing gems.
+
+The Ruby gem name will follow the convention "glimmer-cp-customshapename-namespace" (the 'cp' is for Custom Shape; name words are not separated)
+
+Only official Glimmer gems created by the Glimmer project committers will have no namespace (e.g. [glimmer-cp-bevel](https://rubygems.org/gems/glimmer-cp-bevel) Ruby gem)
+
+Examples:
+
+- [glimmer-cp-bevel](https://github.com/AndyObtiva/glimmer-cp-bevel): Bevel
+
 ### Gem Listing
 
 The `glimmer` command comes with tasks for listing Glimmer related gems to make it easy to find Glimmer [Custom Shells](#custom-shells), [Custom Widgets](#custom-widgets), and DSLs published by others in the Glimmer community on [rubygems.org](http://www.rubygems.org).

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -1416,7 +1416,7 @@ Shape keywords and their args (including defaults) are listed below (they basica
 - `text(string, x, y, is_transparent = true)` text with optional is_transparent to indicate if background is transparent (default is true)
 - `text(string, x, y, flags)` text with optional flags (flag format is `swt(comma_separated_flags)` where flags can be `:draw_delimiter` (i.e. new lines), `:draw_tab`, `:draw_mnemonic`, and `:draw_transparent` as explained in [GC API](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/GC.html))
 
-Shape keywords that can be filled with color can take a keyword argument `fill: true`. Defaults to false when not specified unless background is set with no foreground (or foreground is set with no background), in which case a smart default is applied.
+Shape keywords that can be filled with color can take a keyword argument `fill: true` (or `filled: true`). Defaults to false when not specified unless background is set with no foreground (or foreground is set with no background), in which case a smart default is applied.
 Smart defaults can be applied to automatically infer `gradient: true` (rectangle with both foreground and background) and `round: true` (rectangle with more than 4 args, the extra args are numeric) as well.
 
 Optionally, a shape keyword takes a block that can set any attributes from [org.eclipse.swt.graphics.GC](https://help.eclipse.org/2020-12/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/graphics/GC.html) (methods starting with `set`), which enable setting the `background` for filling and `foreground` for drawing.

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.7.3 ruby lib
+# stub: glimmer-dsl-swt 4.18.7.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.7.3"
+  s.version = "4.18.7.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-03-09"
+  s.date = "2021-03-10"
   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]

data/lib/glimmer/rake_task.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
@@ -54,7 +54,7 @@ namespace :glimmer do
     if args[:app_path].nil?
       require 'fileutils'
       current_directory_name = File.basename(FileUtils.pwd)
-      assumed_shell_script = File.join('.', 'bin', current_directory_name)      
+      assumed_shell_script = File.join('.', 'bin', current_directory_name)
       assumed_shell_script = Dir.glob('./bin/*').detect {|f| File.file?(f)} if !File.exist?(assumed_shell_script)
       Glimmer::Launcher.new([assumed_shell_script]).launch
     else
@@ -145,6 +145,16 @@ namespace :glimmer do
     task :custom_widget, [:name, :namespace] => :customwidget
     task :"custom-widget", [:name, :namespace] => :customwidget
     
+    desc 'Scaffold Glimmer::UI::CustomShape subclass (part of a view) under app/views (namespace is optional) [alt: scaffold:cp]'
+    task :customshape, [:name, :namespace] do |t, args|
+      require_relative 'rake_task/scaffold'
+      Glimmer::RakeTask::Scaffold.custom_shape(args[:name], args[:namespace])
+    end
+    
+    task :cp, [:name, :namespace] => :customshape
+    task :custom_shape, [:name, :namespace] => :customshape
+    task :"custom-shape", [:name, :namespace] => :customshape
+    
     desc 'Desktopify a web app'
     task :desktopify, [:app_name, :website] do |t, args|
       require_relative 'rake_task/scaffold'
@@ -170,13 +180,24 @@ namespace :glimmer do
     
       task :cw, [:name, :namespace] => :customwidget
       task :custom_widget, [:name, :namespace] => :customwidget
-      task :"custom-widget", [:name, :namespace] => :customwidget      
+      task :"custom-widget", [:name, :namespace] => :customwidget
+      
+      desc 'Scaffold Glimmer::UI::CustomShape subclass (part of a view) under its own Ruby gem project (namespace is required) [alt: scaffold:gem:cp]'
+      task :customshape, [:name, :namespace] do |t, args|
+        require_relative 'rake_task/scaffold'
+        Glimmer::RakeTask::Scaffold.custom_shape_gem(args[:name], args[:namespace])
+      end
+    
+      task :cp, [:name, :namespace] => :customshape
+      task :custom_shape, [:name, :namespace] => :customshape
+      task :"custom-shape", [:name, :namespace] => :customshape
     end
     
     # legacy support
     
     task :custom_shell_gem, [:name, :namespace] => 'gem:customshell'
     task :custom_widget_gem, [:name, :namespace] => 'gem:customwidget'
+    task :custom_shape_gem, [:name, :namespace] => 'gem:customshape'
     
   end
   
@@ -204,6 +225,15 @@ namespace :glimmer do
       task :custom_shell, [:query] => :customshell
       task :"custom-shell", [:query] => :customshell
       
+      desc 'List Glimmer custom shape gems available at rubygems.org (query is optional) [alt: list:gems:cp]'
+      task :customshape, [:query] => :list_require do |t, args|
+        Glimmer::RakeTask::List.custom_shape_gems(args[:query])
+      end
+      
+      task :cp, [:query] => :customshape
+      task :custom_shape, [:query] => :customshape
+      task :"custom-shape", [:query] => :customshape
+      
       desc 'List Glimmer DSL gems available at rubygems.org (query is optional)'
       task :dsl, [:query] => :list_require do |t, args|
         Glimmer::RakeTask::List.dsl_gems(args[:query])
@@ -214,7 +244,7 @@ namespace :glimmer do
     # legacy support
     
     task :custom_shell_gems, [:name, :namespace] => 'gems:customshell'
-    task :custom_widget_gems, [:name, :namespace] => 'gems:customwidget'    
+    task :custom_widget_gems, [:name, :namespace] => 'gems:customwidget'
     
   end
 end

data/lib/glimmer/rake_task/list.rb

@@ -45,6 +45,14 @@ module Glimmer
           end
         end
 
+        def custom_shape_gems(query=nil)
+          list_gems('glimmer-cp-', query) do |result|
+            puts
+            puts "  Glimmer Custom Shape Gems#{" matching [#{query}]" if query} at rubygems.org:"
+            puts result
+          end
+        end
+
         def dsl_gems(query=nil)
           list_gems('glimmer-dsl-', query) do |result|
             puts

data/lib/glimmer/rake_task/scaffold.rb

@@ -215,6 +215,15 @@ module Glimmer
           write "#{parent_dir}/#{file_name(custom_widget_name)}.rb", custom_widget_file(custom_widget_name, namespace)
         end
     
+        def custom_shape(custom_shape_name, namespace)
+          namespace ||= current_dir_name
+          root_dir = File.exists?('app') ? 'app' : 'lib'
+          parent_dir = "#{root_dir}/views/#{file_name(namespace)}"
+          return puts("The file '#{parent_dir}/#{file_name(custom_shape_name)}.rb' already exists. Please either remove or pick a different name.") if File.exist?("#{parent_dir}/#{file_name(custom_shape_name)}.rb")
+          mkdir_p parent_dir unless File.exists?(parent_dir)
+          write "#{parent_dir}/#{file_name(custom_shape_name)}.rb", custom_shape_file(custom_shape_name, namespace)
+        end
+    
         def custom_shell_gem(custom_shell_name, namespace)
           gem_name = "glimmer-cs-#{compact_name(custom_shell_name)}"
           gem_summary = "#{human_name(custom_shell_name)} - Glimmer Custom Shell"
@@ -334,6 +343,45 @@ module Glimmer
           puts 'Run `rake release` to release into rubygems.org once ready.'
         end
     
+        def custom_shape_gem(custom_shape_name, namespace)
+          return puts('Namespace is required! Usage: glimmer scaffold:custom_shape_gem[custom_shape_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
+          gem_name = "glimmer-cp-#{compact_name(custom_shape_name)}"
+          gem_summary = "#{human_name(custom_shape_name)} - Glimmer Custom Shape"
+          if namespace
+            gem_name += "-#{compact_name(namespace)}"
+            gem_summary += " (#{human_name(namespace)})"
+          else
+            namespace = 'glimmer'
+          end
+          
+          return puts("The directory '#{gem_name}' already exists. Please either remove or pick a different name.") if Dir.exist?(gem_name)
+          system "jruby -S gem install juwelier -v2.4.9 --no-document" unless juwelier_exists?
+          system "jruby -S juwelier --markdown --rspec --summary '#{gem_summary}' --description '#{gem_summary}' #{gem_name}"
+          return puts('Your Git user.name and/or github.user are missing! Please add in for Juwelier to help Glimmer with Scaffolding.') if `git config --get github.user`.strip.empty? && `git config --get user.name`.strip.empty?
+          cd gem_name
+          write '.gitignore', GITIGNORE
+          write '.ruby-version', RUBY_VERSION
+          write '.ruby-gemset', gem_name
+          write 'VERSION', '1.0.0'
+          write 'Gemfile', GEMFILE
+          write 'Rakefile', gem_rakefile
+          append "lib/#{gem_name}.rb", gem_main_file(custom_shape_name, namespace)
+          mkdir 'lib/views'
+          custom_shape(custom_shape_name, namespace)
+          if OS.windows?
+            system "bundle"
+            system "rspec --init"
+          else
+            system "bash -c '#{RVM_FUNCTION}\n cd .\n bundle\n rspec --init\n'"
+          end
+          write 'spec/spec_helper.rb', spec_helper_file
+          puts "Finished creating #{gem_name} Ruby gem."
+          puts 'Edit Rakefile to configure gem details.'
+          puts 'Run `rake` to execute specs.'
+          puts 'Run `rake build` to build gem.'
+          puts 'Run `rake release` to release into rubygems.org once ready.'
+        end
+    
         private
         
         def juwelier_exists?
@@ -762,7 +810,62 @@ module Glimmer
             end
           MULTI_LINE_STRING
         end
+        
+        def custom_shape_file(custom_shape_name, namespace)
+          namespace_type = class_name(namespace) == class_name(current_dir_name) ? 'class' : 'module'
+    
+          <<~MULTI_LINE_STRING
+            #{namespace_type} #{class_name(namespace)}
+              class #{class_name(custom_shape_name)}
+                include Glimmer::UI::CustomShape
+            
+                ## Add options like the following to configure CustomShape by outside consumers
+                #
+                # options :option1, option2, option3
+                option :background_color, default: :red
+                option :size_width, default: 100
+                option :size_height, default: 100
+                option :location_x, default: 0
+                option :location_y, default: 0
+            
+                ## Use before_body block to pre-initialize variables to use in body
+                #
+                #
+                # before_body {
+                #
+                # }
+            
+                ## Use after_body block to setup observers for shapes in body
+                #
+                # after_body {
+                #
+                # }
+            
+                ## Add shape content under custom shape body
+                #
+                body {
+                  # Replace example content below with custom shape content
+                  shape(location_x, location_y) {
+                    path {
+                      background background_color
+                      cubic size_width - size_width*0.66, size_height/2 - size_height*0.33, size_width*0.65 - size_width*0.66, 0 - size_height*0.33, size_width/2 - size_width*0.66, size_height*0.75 - size_height*0.33, size_width - size_width*0.66, size_height - size_height*0.33
+                    }
+                    path {
+                      background background_color
+                      cubic size_width - size_width*0.66, size_height/2 - size_height*0.33, size_width*1.35 - size_width*0.66, 0 - size_height*0.33, size_width*1.5 - size_width*0.66, size_height*0.75 - size_height*0.33, size_width - size_width*0.66, size_height - size_height*0.33
+                    }
+                  }
+                }
+            
+              end
+            end
+          MULTI_LINE_STRING
+        end
+        
       end
+      
     end
+    
   end
+  
 end

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

@@ -94,8 +94,10 @@ module Glimmer
           
           def arg_options(args, extract: false)
             arg_options_method = extract ? :pop : :last
-            options = args.send(arg_options_method) if args.last.is_a?(Hash)
-            options.nil? ? {} : options.symbolize_keys
+            options = args.send(arg_options_method).symbolize_keys if args.last.is_a?(Hash)
+            # normalize :filled option as an alias to :fill
+#             options[:fill] = options.delete(:filled) if options&.keys&.include?(:filled)
+            options.nil? ? {} : options
           end
           
           def method_name(keyword, method_arg_options)
@@ -400,7 +402,7 @@ module Glimmer
         def amend_method_name_options_based_on_properties!
           @original_method_name = @method_name
           return if @name == 'point'
-          if @name != 'text' && @name != 'string' && has_some_background? && !has_some_foreground?
+          if (@name != 'text' && @name != 'string' && has_some_background? && !has_some_foreground?) || (@name == 'path' && has_some_background?)
             @options[:fill] = true
           elsif !has_some_background? && has_some_foreground?
             @options[:fill] = false
@@ -474,7 +476,9 @@ module Glimmer
             # TODO consider this optimization of preconverting args (removing conversion from other methods) to reject equal args
             args = apply_property_arg_conversions(ruby_attribute_getter_name, args)
             return if @properties[ruby_attribute_getter_name] == args
+            new_property = !@properties.keys.include?(ruby_attribute_getter_name)
             @properties[ruby_attribute_getter_name] = args
+            amend_method_name_options_based_on_properties! if @content_added && new_property
             property_change = true
           end
           if @content_added && perform_redraw && !drawable.is_disposed

data/samples/elaborate/tetris.rb

@@ -156,10 +156,7 @@ class Tetris
           color = colored ? color(([:white] + Model::Tetromino::LETTER_COLORS.values).sample) : color(:white)
           x = column * icon_block_size
           y = row * icon_block_size
-          rectangle(x, y, icon_block_size, icon_block_size) {
-            background color
-            bevel(base_color: color, size: icon_block_size)
-          }
+          bevel(x: x, y: y, base_color: color, size: icon_block_size)
         }
       }
     }

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

@@ -26,13 +26,16 @@ class Tetris
       include Glimmer::UI::CustomShape
       
       options :base_color, :size, :bevel_pixel_size
+      option :x, default: 0
+      option :y, default: 0
       
       before_body {
         self.bevel_pixel_size = 0.16*size.to_f if bevel_pixel_size.nil?
       }
       
       body {
-        shape(0, 0, size, size) {
+        rectangle(x, y, size, size) {
+          background bind(self, :base_color)
           polygon(0, 0, size, 0, size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size, bevel_pixel_size) {
             background bind(self, :base_color) { |color_value|
               unless color_value.nil?

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

@@ -30,9 +30,7 @@ class Tetris
   
       body {
         canvas { |canvas_proxy|
-          background bind(game_playfield[row][column], :color)
-          
-          bevel(base_color: game_playfield[row][column].color, size: block_size) {
+          bevel(size: block_size) {
             base_color bind(game_playfield[row][column], :color)
           }
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.7.3
+  version: 4.18.7.4
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement