glimmer-dsl-swt 4.18.2.4 → 4.18.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e12bb24a84b93822013eef2122021cd5e6a8f90f9e450ac83f7bd5b5f0b7b55
-  data.tar.gz: dfdba626253a34506b99971821378e8579eac7f21a955ddbd7bc0543f770ad51
+  metadata.gz: 6d0dbd3170cb9c04be90cd8d7cfa83a68c491eaa89d3752d2ab5ac8d1e5f22c4
+  data.tar.gz: 368a549d962ecd554a02c2257c05e476f7b6b3843193b5a7197a9725ed74e9aa
 SHA512:
-  metadata.gz: d489317bc86659858e1215aca4f35441aa123f59affb4f35fe9fce1ec04f220f3856f5d203d686a1091a7a1652b746a9453ce598eb684910b1ded8717fc1552b
-  data.tar.gz: 10c31c53aab7d5a8905c6448f66dcacb01c98b952c9934ae1e5236437e583d37aa607161f38946754938c9fc655c876064cc268a93d73d8746667d69d69f684b
+  metadata.gz: 18ce78d054b799add79df4a7536237a863b1a9b408498af4d78e899575f2784921b15af7364f287921ddfe5223810845d1ec4b6b39b02f55106ea27ad6a9041a
+  data.tar.gz: be2ad49fabf44c811eb153293bf26b6dbb922ad0a757b06f110bbe014b6f9a2a87a5f4ac5a263f8ed11f125bd4754685ec07c6e1bfeef10dd2b4d66338db8814

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+### 4.18.2.5
+
+- ColorProxy args now are automatically fit into 0..255 bounds upon use of the `color`/`rgb`/`rgba` keywords
+- Canvas Shape DSL (Property) Data-Binding support (No Argument Data-Binding support yet)
+- Add a more bevel 3D look to Tetris blocks
+- Use flyweight pattern with colors
+- Use flyweight pattern with widget classes
+- Use flyweight pattern with custom widget classes
+- Optimized performance of Canvas Shape DSL
+- Optimized performance of Tetris game
+- Fixed issue with top-level sync_exec/async_exec use randomly bombing
+
 ### 4.18.2.4
 
 - Tetris scoring

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.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.5
 ## 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)
@@ -458,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.4
+jgem install glimmer-dsl-swt -v 4.18.2.5
 
 
 ```
@@ -478,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.4
+gem 'glimmer-dsl-swt', '~> 4.18.2.5
 '
 ```
 
@@ -537,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.4
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.2.5
 
 
       
@@ -1018,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.4
+  Swt    glimmer-dsl-swt    4.18.2.5
 
   AndyMaleh    Glimmer DSL for SWT
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk

data/VERSION

@@ -1 +1 @@
-4.18.2.4
+4.18.2.5

data/glimmer-dsl-swt.gemspec

@@ -2,11 +2,11 @@
 # 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.4 ruby lib
+# stub: glimmer-dsl-swt 4.18.2.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.2.4"
+  s.version = "4.18.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -190,7 +190,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.8"])
+      s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.9"])
       s.add_runtime_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
       s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
       s.add_runtime_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
@@ -209,7 +209,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
       s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
     else
-      s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.8"])
+      s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.9"])
       s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
       s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
       s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])
@@ -229,7 +229,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
     end
   else
-    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.8"])
+    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.9"])
     s.add_dependency(%q<super_module>.freeze, [">= 1.4.1", "< 2.0.0"])
     s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, [">= 0.3.0", "< 2.0.0"])
     s.add_dependency(%q<puts_debuggerer>.freeze, [">= 0.11.0", "< 2.0.0"])

data/lib/glimmer/dsl/swt/color_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
@@ -32,7 +32,7 @@ module Glimmer
         include_package 'org.eclipse.swt.widgets'
   
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::ColorProxy.new(*args)
+          Glimmer::SWT::ColorProxy.flyweight(*args)
         end
       end
     end

data/lib/glimmer/dsl/swt/data_binding_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/dsl/swt/shape_expression.rb

@@ -23,6 +23,7 @@ require 'glimmer/dsl/expression'
 require 'glimmer/dsl/parent_expression'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/custom/shape'
+require 'glimmer/swt/custom/drawable'
 
 module Glimmer
   module DSL
@@ -31,10 +32,7 @@ module Glimmer
         include ParentExpression
         
         def can_interpret?(parent, keyword, *args, &block)
-          (
-            (parent.respond_to?(:swt_widget) and parent.swt_widget.is_a?(org.eclipse.swt.graphics.Drawable)) or
-            (parent.respond_to?(:swt_display) and parent.swt_display.is_a?(org.eclipse.swt.graphics.Drawable))
-          ) and
+          parent.is_a?(Glimmer::SWT::Custom::Drawable) and
             Glimmer::SWT::Custom::Shape.valid?(parent, keyword, *args, &block)
         end
         

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

@@ -22,6 +22,7 @@
 require 'glimmer'
 require 'glimmer/dsl/expression'
 require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/custom/shape'
 
 module Glimmer
   module DSL
@@ -29,7 +30,7 @@ module Glimmer
       class WidgetExpression < Expression
         include ParentExpression
 
-        EXCLUDED_KEYWORDS = %w[shell display tab_item]
+        EXCLUDED_KEYWORDS = %w[shell display tab_item] + Glimmer::SWT::Custom::Shape.keywords - ['text']
 
         def can_interpret?(parent, keyword, *args, &block)
           result = !EXCLUDED_KEYWORDS.include?(keyword) &&

data/lib/glimmer/swt/color_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
@@ -28,9 +28,20 @@ module Glimmer
     #
     # Invoking `#swt_color` returns the SWT Color object wrapped by this proxy
     #
-    # Follows the Proxy Design Pattern
+    # Follows the Proxy Design Pattern and Flyweight Design Pattern (caching memoization)
     class ColorProxy
       include_package 'org.eclipse.swt.graphics'
+      
+      class << self
+        def flyweight(*args)
+          flyweight_color_proxies[args] ||= new(*args)
+        end
+        
+        # Flyweight Design Pattern memoization cache. Can be cleared if memory is needed.
+        def flyweight_color_proxies
+          @flyweight_color_proxies ||= {}
+        end
+      end
 
       # Initializes a proxy for an SWT Color object
       #
@@ -49,6 +60,7 @@ module Glimmer
       #
       def initialize(*args)
         @args = args
+        ensure_arg_values_within_valid_bounds
       end
 
       def swt_color
@@ -64,7 +76,7 @@ module Glimmer
             end
           when 3..4
             red, green, blue, alpha = @args
-            @swt_color = Color.new(DisplayProxy.instance.swt_display, *[red, green, blue, alpha].compact)
+            @swt_color = Color.new(*[red, green, blue, alpha].compact)
           end
         end
         @swt_color
@@ -79,7 +91,17 @@ module Glimmer
       
       def respond_to?(method, *args, &block)
         super || swt_color.respond_to?(method, *args, &block)
-      end      
+      end
+      
+      private
+      
+      def ensure_arg_values_within_valid_bounds
+        if @args.to_a.size >= 3
+          @args = @args.map do |value|
+            [[value, 255].min, 0].max
+          end
+        end
+      end
     end
   end
 end

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

@@ -34,6 +34,14 @@ module Glimmer
             shapes.delete(shape)
           end
         end
+        
+        def resetup_shape_paint_listeners
+          # TODO consider performance optimizations relating to order of shape rendering (affecting only further shapes not previous ones)
+          shapes.each do |shape|
+            shape.paint_listener_proxy&.unregister
+            shape.setup_paint_listener
+          end
+        end
       end
       
     end

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

@@ -43,7 +43,17 @@ module Glimmer
           end
           
           def gc_instance_methods
-            org.eclipse.swt.graphics.GC.instance_methods.map(&:to_s)
+            @gc_instance_methods ||= org.eclipse.swt.graphics.GC.instance_methods.map(&:to_s)
+          end
+          
+          def keywords
+            @keywords ||= gc_instance_methods.select do |method_name|
+              !method_name.end_with?('=') && (method_name.start_with?('draw_') || method_name.start_with?('fill_'))
+            end.reject do |method_name|
+              gc_instance_methods.include?("#{method_name}=") || gc_instance_methods.include?("set_#{method_name}")
+            end.map do |method_name|
+              method_name.gsub(/(draw|fill|gradient|round)_/, '')
+            end.uniq.compact.to_a
           end
           
           def arg_options(args, extract: false)
@@ -53,11 +63,19 @@ module Glimmer
           end
           
           def method_name(keyword, args)
-            keyword = keyword.to_s
-            gradient = 'gradient_' if arg_options(args)[:gradient]
-            round = 'round_' if arg_options(args)[:round]
-            gc_instance_method_name_prefix = !['polyline', 'point', 'image', 'focus'].include?(keyword) && (arg_options(args)[:fill] || arg_options(args)[:gradient]) ? 'fill_' : 'draw_'
-            "#{gc_instance_method_name_prefix}#{gradient}#{round}#{keyword}"
+            method_arg_options = arg_options(args)
+            unless flyweight_method_names.keys.include?([keyword, method_arg_options])
+              keyword = keyword.to_s
+              gradient = 'gradient_' if method_arg_options[:gradient]
+              round = 'round_' if method_arg_options[:round]
+              gc_instance_method_name_prefix = !['polyline', 'point', 'image', 'focus'].include?(keyword) && (method_arg_options[:fill] || method_arg_options[:gradient]) ? 'fill_' : 'draw_'
+              flyweight_method_names[[keyword, method_arg_options]] = "#{gc_instance_method_name_prefix}#{gradient}#{round}#{keyword}"
+            end
+            flyweight_method_names[[keyword, method_arg_options]]
+          end
+          
+          def flyweight_method_names
+            @flyweight_method_names ||= {}
           end
         end
         
@@ -92,27 +110,11 @@ module Glimmer
         end
         
         def post_add_content
-          event_handler = lambda do |event|
-            @properties['background'] = [@parent.background] if fill? && !@properties.keys.map(&:to_s).include?('background')
-            @properties['foreground'] = [@parent.foreground] if draw? && !@properties.keys.map(&:to_s).include?('foreground')
-            @properties.each do |property, args|
-              method_name = attribute_setter(property)
-              apply_property_arg_conversions(method_name, args)
-              event.gc.send(method_name, *args)
-            end
-            apply_shape_arg_conversions(@method_name, @args)
-            apply_shape_arg_defaults(@method_name, @args)
-            tolerate_shape_extra_args(@method_name, @args)
-            event.gc.send(@method_name, *@args)
-          end
-          if parent.respond_to?(:swt_display)
-            @paint_listener_proxy = @parent.on_swt_paint(&event_handler)
-          else
-            @paint_listener_proxy = @parent.on_paint_control(&event_handler)
-          end
+          setup_paint_listener
+          @content_added = true
         end
         
-        def apply_property_arg_conversions(method_name, args)
+        def apply_property_arg_conversions(method_name, property, args)
           the_java_method = org.eclipse.swt.graphics.GC.java_class.declared_instance_methods.detect {|m| m.name == method_name}
           if (args.first.is_a?(Symbol) || args.first.is_a?(String))
             if the_java_method.parameter_types.first == Color.java_class
@@ -143,6 +145,7 @@ module Glimmer
             args[0] = org.eclipse.swt.graphics.Pattern.new(*new_args)
             args[1..-1] = []
           end
+          @properties[property] = args
         end
         
         def apply_shape_arg_conversions(method_name, args)
@@ -185,11 +188,38 @@ module Glimmer
   
         def set_attribute(attribute_name, *args)
           @properties[attribute_name] = args
+          if @content_added
+            @parent.resetup_shape_paint_listeners
+            @parent.redraw
+          end
         end
   
         def get_attribute(attribute_name)
           @properties.symbolize_keys[attribute_name.to_s.to_sym]
         end
+        
+        def setup_paint_listener
+          if parent.respond_to?(:swt_display)
+            @paint_listener_proxy = @parent.on_swt_paint(&method(:paint))
+          else
+            @paint_listener_proxy = @parent.on_paint_control(&method(:paint))
+          end
+        end
+        
+        def paint(paint_event)
+          @properties['background'] = [@parent.background] if fill? && !@properties.keys.map(&:to_s).include?('background')
+          @properties['foreground'] = [@parent.foreground] if draw? && !@properties.keys.map(&:to_s).include?('foreground')
+          @properties['font'] = [@parent.font] if draw? && !@properties.keys.map(&:to_s).include?('font')
+          @properties.each do |property, args|
+            method_name = attribute_setter(property)
+            apply_property_arg_conversions(method_name, property, args)
+            paint_event.gc.send(method_name, *args)
+          end
+          apply_shape_arg_conversions(@method_name, @args)
+          apply_shape_arg_defaults(@method_name, @args)
+          tolerate_shape_extra_args(@method_name, @args)
+          paint_event.gc.send(@method_name, *@args)
+        end
     
       end
       

data/lib/glimmer/swt/shell_proxy.rb

@@ -108,7 +108,7 @@ module Glimmer
       end
       
       def nested?
-        !parent.nil?
+        !swt_widget&.parent.nil?
       end
 
       def hide

data/lib/glimmer/swt/widget_proxy.rb

@@ -497,26 +497,37 @@ module Glimmer
 
       # This supports widgets in and out of basic SWT
       def self.swt_widget_class_for(underscored_widget_name)
-        underscored_widget_name = KEYWORD_ALIASES[underscored_widget_name] if KEYWORD_ALIASES[underscored_widget_name]
-        swt_widget_name = underscored_widget_name.camelcase(:upper)
-        swt_widget_class = eval(swt_widget_name)
-        # TODO fix issue with not detecting DateTime because it's conflicting with the Ruby DateTime
-        unless swt_widget_class.ancestors.include?(org.eclipse.swt.widgets.Widget)
-          swt_widget_class = swt_widget_class_manual_entries[underscored_widget_name]
-          if swt_widget_class.nil?
-            Glimmer::Config.logger.debug {"Class #{swt_widget_class} matching #{underscored_widget_name} is not a subclass of org.eclipse.swt.widgets.Widget"}
-            return nil
+        # TODO clear memoization for a keyword if a custom widget was defined with that keyword
+        unless flyweight_swt_widget_classes.keys.include?(underscored_widget_name)
+          begin
+            underscored_widget_name = KEYWORD_ALIASES[underscored_widget_name] if KEYWORD_ALIASES[underscored_widget_name]
+            swt_widget_name = underscored_widget_name.camelcase(:upper)
+            swt_widget_class = eval(swt_widget_name)
+            # TODO fix issue with not detecting DateTime because it's conflicting with the Ruby DateTime
+            unless swt_widget_class.ancestors.include?(org.eclipse.swt.widgets.Widget)
+              swt_widget_class = swt_widget_class_manual_entries[underscored_widget_name]
+              if swt_widget_class.nil?
+                Glimmer::Config.logger.debug {"Class #{swt_widget_class} matching #{underscored_widget_name} is not a subclass of org.eclipse.swt.widgets.Widget"}
+                return nil
+              end
+            end
+            flyweight_swt_widget_classes[underscored_widget_name] = swt_widget_class
+          rescue SyntaxError, NameError => e
+            Glimmer::Config.logger.debug {e.full_message}
+            # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
+            nil
+          rescue => e
+            Glimmer::Config.logger.debug {e.full_message}
+            # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
+            nil
           end
         end
-        swt_widget_class
-      rescue SyntaxError, NameError => e
-        Glimmer::Config.logger.debug {e.full_message}
-        # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
-        nil
-      rescue => e
-        Glimmer::Config.logger.debug {e.full_message}
-        # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
-        nil
+        flyweight_swt_widget_classes[underscored_widget_name]
+      end
+      
+      # Flyweight Design Pattern memoization cache. Can be cleared if memory is needed.
+      def self.flyweight_swt_widget_classes
+        @flyweight_swt_widget_classes ||= {}
       end
 
       def async_exec(&block)

data/lib/glimmer/ui/custom_widget.rb

@@ -34,37 +34,48 @@ module Glimmer
       include DataBinding::ObservableModel
 
       super_module_included do |klass|
+        # TODO clear memoization of WidgetProxy.swt_widget_class_for for a keyword if a custom widget was defined with that keyword
         klass.include(Glimmer) unless klass.name.include?('Glimmer::UI::CustomShell')
         Glimmer::UI::CustomWidget.add_custom_widget_namespaces_for(klass) unless klass.name.include?('Glimmer::UI::CustomShell')
       end
 
       class << self
         def for(underscored_custom_widget_name)
-          extracted_namespaces = underscored_custom_widget_name.
-            to_s.
-            split(/__/).map do |namespace|
-              namespace.camelcase(:upper)
-            end
-          custom_widget_namespaces.each do |base|
-            extracted_namespaces.reduce(base) do |result, namespace|
-              if !result.constants.include?(namespace)
-                namespace = result.constants.detect {|c| c.to_s.upcase == namespace.to_s.upcase } || namespace
-              end
-              begin
-                constant = result.const_get(namespace)
-                return constant if constant.ancestors.include?(Glimmer::UI::CustomWidget)
-                constant
-              rescue => e
-                # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
-                result
+          unless flyweight_custom_widget_classes.keys.include?(underscored_custom_widget_name)
+            begin
+              extracted_namespaces = underscored_custom_widget_name.
+                to_s.
+                split(/__/).map do |namespace|
+                  namespace.camelcase(:upper)
+                end
+              custom_widget_namespaces.each do |base|
+                extracted_namespaces.reduce(base) do |result, namespace|
+                  if !result.constants.include?(namespace)
+                    namespace = result.constants.detect {|c| c.to_s.upcase == namespace.to_s.upcase } || namespace
+                  end
+                  begin
+                    flyweight_custom_widget_classes[underscored_custom_widget_name] = constant = result.const_get(namespace)
+                    return constant if constant.ancestors.include?(Glimmer::UI::CustomWidget)
+                    flyweight_custom_widget_classes[underscored_custom_widget_name] = constant
+                  rescue => e
+                    # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
+                    flyweight_custom_widget_classes[underscored_custom_widget_name] = result
+                  end
+                end
               end
+              raise "#{underscored_custom_widget_name} has no custom widget class!"
+            rescue => e
+              Glimmer::Config.logger.debug {e.message}
+              Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
+              flyweight_custom_widget_classes[underscored_custom_widget_name] = nil
             end
           end
-          raise "#{underscored_custom_widget_name} has no custom widget class!"
-        rescue => e
-          Glimmer::Config.logger.debug {e.message}
-          Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
-          nil
+          flyweight_custom_widget_classes[underscored_custom_widget_name]
+        end
+        
+        # Flyweight Design Pattern memoization cache. Can be cleared if memory is needed.
+        def flyweight_custom_widget_classes
+          @flyweight_custom_widget_classes ||= {}
         end
  
         def add_custom_widget_namespaces_for(klass)

data/samples/elaborate/tetris.rb

@@ -61,9 +61,7 @@ class Tetris
     }
     
     Model::Game.configure_beeper do
-      async_exec {
-        display.beep
-      }
+      display.beep
     end
   }
   

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

@@ -33,7 +33,7 @@ class Tetris
       
       # 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
+        self.color = COLOR_CLEAR unless self.color == COLOR_CLEAR
       end
       
       def clear?

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

@@ -127,7 +127,7 @@ class Tetris
              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
+               block.color = previous_block.color unless block.color == previous_block.color
              end
           end
           playfield[0].each(&:clear)

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

@@ -76,7 +76,7 @@ class Tetris
       
       def add_to_playfield
         update_playfield_block do |playfield_row, playfield_column, row_index, column_index|
-          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?
+          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? && playfield[playfield_row][playfield_column].color != blocks[row_index][column_index].color
         end
       end
       

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

@@ -26,14 +26,42 @@ class Tetris
   
       options :game_playfield, :block_size, :row, :column
   
+      before_body {
+        @bevel_constant = 20
+      }
+  
       body {
-        composite {
+        canvas {
           layout nil
           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
+          polygon(0, 0, block_size, 0, block_size - 4, 4, 4, 4, fill: true) {
+            background bind(game_playfield[row][column], :color) { |color_value|
+              color = color(color_value)
+              rgb(color.red + 4*@bevel_constant, color.green + 4*@bevel_constant, color.blue + 4*@bevel_constant)
+            }
+          }
+          polygon(block_size, 0, block_size - 4, 4, block_size - 4, block_size - 4, block_size, block_size, fill: true) {
+            background bind(game_playfield[row][column], :color) { |color_value|
+              color = color(color_value)
+              rgb(color.red - @bevel_constant, color.green - @bevel_constant, color.blue - @bevel_constant)
+            }
+          }
+          polygon(block_size, block_size, 0, block_size, 4, block_size - 4, block_size - 4, block_size - 4, fill: true) {
+            background bind(game_playfield[row][column], :color) { |color_value|
+              color = color(color_value)
+              rgb(color.red - 2*@bevel_constant, color.green - 2*@bevel_constant, color.blue - 2*@bevel_constant)
+            }
+          }
+          polygon(0, 0, 0, block_size, 4, block_size - 4, 4, 4, fill: true) {
+            background bind(game_playfield[row][column], :color) { |color_value|
+              color = color(color_value)
+              rgb(color.red - @bevel_constant, color.green - @bevel_constant, color.blue - @bevel_constant)
+            }
+          }
+          rectangle(0, 0, block_size, block_size) {
+            foreground bind(game_playfield[row][column], :color) { |color_value|
+              color_value == Model::Block::COLOR_CLEAR ? :gray : color_value
+            }
           }
         }
       }

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

@@ -29,7 +29,7 @@ class Tetris
       options :game_playfield, :playfield_width, :playfield_height, :block_size
   
       body {
-        composite {
+        canvas {
           grid_layout {
             num_columns playfield_width
             make_columns_equal_width true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.2.4
+  version: 4.18.2.5
 platform: ruby
 authors:
 - AndyMaleh
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: