glimmer-dsl-swt 4.18.4.6 → 4.18.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0074aec37350a556b6078426d3fbeb0e03799f0593158814c6a91439973b07a
-  data.tar.gz: bf615d4a2aed63e654bebbad0055fd62218ad5747f2fc6edfe7a298e2f30d074
+  metadata.gz: 51dc789287aa0203306dc929ed567af49696f266cab8581f5aa4252ec61055a0
+  data.tar.gz: 8c4f4042cb47f7a21b82894160358a70e119c2ddd4bee12ad3318e626c376f23
 SHA512:
-  metadata.gz: 9499a1e9ca375bcf89f1cfaba1573a27e80a32995a53c351872f82c69661305bd4fde1bb6dbe3b5d5354aaf24e74245c353079de59906693a05828b86943ba31
-  data.tar.gz: 471ca571d01081e9c461bb003ebcd3b64cb11193d3cdc2be7ecdc91b94997bcd8591cec6ef49b23d8790cc721bcb827549b1e406b97fa36a9eba0752a81870fd
+  metadata.gz: a0a663e6bec722f38050619d6d9ffe5cd65cc3e7384a19447b2ce83d2ec7a24abb4b591e067c75616df5fa85647886ac78b565fe22f67c51381b09030cbd9ec4
+  data.tar.gz: f31423c8317d5199a1188daadb712b7933277714215a392870056e83d726a9ab27cd8b7b9fcbaf9446bab2c176145149a358049e80762f6b953814238a3d518e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+### 4.18.4.7
+
+- Fixed issue with Tetris breaking with the latest Canvas Shape/Animation DSL performance optimizations
+
 ### 4.18.4.6
 
 - Mandlebrot Fractal 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.4.6
+# [<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.4.7
 ## 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)
@@ -342,7 +342,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.4.6
+jgem install glimmer-dsl-swt -v 4.18.4.7
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -360,7 +360,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.4.6'
+gem 'glimmer-dsl-swt', '~> 4.18.4.7'
 ```
 
 And, then run:
@@ -433,7 +433,7 @@ Glimmer simplifies the process of native-executable packaging and distribution o
 
 ## App Updates
 
-Glimmer should already support automatic (and manual) app updates via the Mac App Store for Mac apps (though I haven't personally tried. Be my guest if you want to call shotgun on this, and share your experience with us). Simply run the `glimmer package` command with the Mac App Store keys configured as per [Mac Application Distribution](mac-application-distribution) instructions and you get automatic (and manual) app update support courtesy of the Mac App Store.
+Glimmer already supports automatic (and manual) app updates via the Mac App Store for Mac apps. Simply run the `glimmer package` command with the Mac App Store keys configured as per [Mac Application Distribution](mac-application-distribution) instructions and you get automatic (and manual) app update support courtesy of the Mac App Store.
 
 ## Glimmer Supporting Libraries
 

data/VERSION

@@ -1 +1 @@
-4.18.4.6
+4.18.4.7

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -1282,6 +1282,8 @@ https://help.eclipse.org/2019-12/nftopic/org.eclipse.platform.doc.isv/reference/
 
 Glimmer supports drawing graphics directly on a `canvas` widget via SWT (or any widget for that matter though `canvas` is recommended for drawing).
 
+`canvas` has the `:double_buffered` SWT style by default to ensure flicker-free rendering. If you need to disable it for whatever reason, just pass the `:none` SWT style instead (e.g. `canvas(:none)`)
+
 This is accomplished via the Shape DSL a sub-DSL of the Glimmer GUI DSL, which makes it possible to draw graphics declaratively with very understandable and maintainable syntax.
 
 Shape keywords and their args (including defaults) are listed below (they basically match method names and arguments on [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) minus the `draw` or `fill` prefix in downcase):
@@ -1367,9 +1369,31 @@ Screenshot:
 
 Learn more at the [Hello, Canvas! Sample](#hello-canvas).
 
-If you get extremely stuck, remember that you could always default to direct [SWT GC usage]([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) and learn more at the [SWT Graphics Guide](https://www.eclipse.org/articles/Article-SWT-graphics/SWT_graphics.html) and [SWT Image Guide](https://www.eclipse.org/articles/Article-SWT-images/graphics-resources.html#Saving%20Images).
+#### Pixel Graphics
+
+**(Early Alpha Feature)**
 
-Example of manually doing the same things as in the above example without relying on the declarative Glimmer Shape DSL:
+If you need to paint pixel graphics, use the optimized `pixel` keyword alternative to `point`, which takes foreground as a hash argument and bypasses the [Glimmer DSL Engine chain of responsibility](https://github.com/AndyObtiva/glimmer#dsl-engine), thus rendering faster when having very large pixel numbers.
+
+Example (you may copy/paste in [`girb`](GLIMMER_GIRB.md)):
+
+```ruby
+shell {
+  minimum_size 250, 265
+  
+  canvas {
+    250.times {|y|
+      250.times {|x|
+        pixel(x, y, foreground: color(y%255, x%255, (x+y)%255).swt_color)
+      }
+    }
+  }
+}.open
+```
+
+Remember that you could always default to direct [SWT GC Usage]([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) too for even faster performance (when rarely needed). Learn more at the [SWT Graphics Guide](https://www.eclipse.org/articles/Article-SWT-graphics/SWT_graphics.html) and [SWT Image Guide](https://www.eclipse.org/articles/Article-SWT-images/graphics-resources.html#Saving%20Images).
+
+Example of manually doing the same things as in the Canvas Shape DSL example without relying on the declarative Glimmer Shape DSL:
 
 ```ruby
 image_object = image(File.expand_path('./icons/scaffold_app.png'), width: 100)
@@ -1383,31 +1407,30 @@ shell {
   canvas {
     background :yellow
     
-    on_paint_control { |event|
-      event.gc.set_background(color(:red).swt_color)
-      event.gc.fill_rectangle(0, 0, 220, 400)
+    on_paint_control { |paint_event|
+      gc = paint_event.gc
+      gc.background = color(:red).swt_color
+      gc.fill_rectangle(0, 0, 220, 400)
       
-      event.gc.set_background(color(:magenta).swt_color)
-      event.gc.fill_roundRectangle(50, 20, 300, 150, 30, 50)
+      gc.background = color(:magenta).swt_color
+      gc.fill_roundRectangle(50, 20, 300, 150, 30, 50)
       
-      event.gc.set_background(color(:dark_magenta).swt_color)
-      event.gc.fill_gradientRectangle(150, 200, 100, 70, true)
+      gc.background = color(:dark_magenta).swt_color
+      gc.fill_gradientRectangle(150, 200, 100, 70, true)
       
-      event.gc.set_foreground(color(:dark_blue).swt_color)
-      event.gc.draw_rectangle(200, 80, 108, 36)
+      gc.foreground = color(:dark_blue).swt_color
+      gc.draw_rectangle(200, 80, 108, 36)
       
-      event.gc.set_foreground(color(:black).swt_color)
-      event.gc.set_lineWidth(3)
-      event.gc.draw_rectangle(200, 80, 108, 36)
+      gc.foreground = color(:black).swt_color
+      gc.line_width = 3
+      gc.draw_rectangle(200, 80, 108, 36)
       
-      event.gc.draw_image(image_object.swt_image, 70, 50)
+      gc.draw_image(image_object.swt_image, 70, 50)
     }
   }
 }.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](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`.
@@ -1595,7 +1618,7 @@ Learn more at the [Hello, Canvas Transform! Sample](#hello-canvas-transform).
 
 ### Canvas Animation DSL
 
-**(EARLY ALPHA FEATURE)**
+**(ALPHA FEATURE)**
 
 (note: this is a very new feature of Glimmer. It may change a bit while getting battle tested. As always, you could default to basic SWT usage if needed.)
 
@@ -1605,6 +1628,8 @@ Animations take advantage of multi-threading, automatically running each animati
 
 Multiple simultaneous animations are supported by declaring an animation per `canvas` (or widget) parent.
 
+`canvas` has the `:double_buffered` SWT style by default to ensure flicker-free rendering. If you need to disable it for whatever reason, just pass the `:none` SWT style instead (e.g. `canvas(:none)`)
+
 This example says it all (it moves a tiny red square across a blue background) (you may copy/paste in [`girb`](GLIMMER_GIRB.md)):
 
 ```ruby

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.4.6 ruby lib
+# stub: glimmer-dsl-swt 4.18.4.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.4.6"
+  s.version = "4.18.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

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

@@ -133,7 +133,7 @@ module Glimmer
         
         def post_add_content
           unless @content_added
-            amend_method_name_options_based_on_properties
+            amend_method_name_options_based_on_properties!
             @parent.setup_shape_painting
             @content_added = true
           end
@@ -177,41 +177,41 @@ module Glimmer
           args
         end
         
-        def apply_shape_arg_conversions(method_name, args)
-          if args.size > 1 && (method_name.include?('polygon') || method_name.include?('polyline'))
-            args[0] = args.dup
-            args[1..-1] = []
+        def apply_shape_arg_conversions!
+          if @args.size > 1 && (['polygon', 'polyline'].include?(@name))
+            @args[0] = @args.dup
+            @args[1..-1] = []
           end
         end
         
-        def apply_shape_arg_defaults(method_name, args)
-          if method_name.include?('round_rectangle') && args.size.between?(4, 5)
-            (6 - args.size).times {args << 60}
-          elsif method_name.include?('rectangle') && gradient? && args.size == 4
-            args << true
-          elsif (method_name.include?('text') || method_name.include?('string')) && !@properties.keys.map(&:to_s).include?('background') && args.size == 3
-            args << true
+        def apply_shape_arg_defaults!
+          if @name.include?('rectangle') && round? && @args.size.between?(4, 5)
+            (6 - @args.size).times {@args << 60}
+          elsif @name.include?('rectangle') && gradient? && @args.size == 4
+            @args << true
+          elsif (@name.include?('text') || @name.include?('String')) && !@properties.keys.map(&:to_s).include?('background') && @args.size == 3
+            @args << true
           end
-          if method_name.include?('image') && args.first.is_a?(String)
-            args[0] = ImageProxy.new(args[0])
+          if @name.include?('image') && @args.first.is_a?(String)
+            @args[0] = ImageProxy.new(@args[0])
           end
-          if method_name.include?('image') && args.first.is_a?(ImageProxy)
-            @image = args[0] = args[0].swt_image
+          if @name.include?('image') && @args.first.is_a?(ImageProxy)
+            @image = @args[0] = @args[0].swt_image
           end
         end
                 
         # Tolerates shape extra args added by user by mistake
         # (e.g. happens when switching from round rectangle to a standard one without removing all extra args)
-        def tolerate_shape_extra_args(method_name, args)
+        def tolerate_shape_extra_args!
           the_java_method_arg_count = org.eclipse.swt.graphics.GC.java_class.declared_instance_methods.select do |m|
-            m.name == method_name.camelcase(:lower)
+            m.name == @method_name.camelcase(:lower)
           end.map(&:parameter_types).map(&:size).max
-          if args.size > the_java_method_arg_count
-            args[the_java_method_arg_count..-1] = []
+          if @args.size > the_java_method_arg_count
+            @args[the_java_method_arg_count..-1] = []
           end
         end
         
-        def amend_method_name_options_based_on_properties
+        def amend_method_name_options_based_on_properties!
           return if @name == 'point'
           if has_some_background? && !has_some_foreground?
             @options[:fill] = true
@@ -286,9 +286,9 @@ module Glimmer
               converted_args = apply_property_arg_conversions(method_name, property, args)
               @properties[property] = converted_args
             end
-            apply_shape_arg_conversions(@method_name, @args)
-            apply_shape_arg_defaults(@method_name, @args)
-            tolerate_shape_extra_args(@method_name, @args)
+            apply_shape_arg_conversions!
+            apply_shape_arg_defaults!
+            tolerate_shape_extra_args!
             @calculated_paint_args = true
           end
         end

data/lib/glimmer/swt/widget_proxy.rb

@@ -50,7 +50,7 @@ module Glimmer
       DEFAULT_STYLES = {
         'arrow'               => [:arrow],
         'button'              => [:push],
-        'canvas'              => ([:double_buffered] unless OS.mac?),
+        'canvas'              => [:double_buffered],
         'checkbox'            => [:check],
         'check'               => [:check],
         'drag_source'         => [:drop_copy],

data/samples/elaborate/tetris.rb

@@ -155,19 +155,19 @@ 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, fill: true) {
+          rectangle(x, y, icon_block_size, icon_block_size) {
             background color
           }
-          polygon(x, y, x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size, fill: true) {
+          polygon(x, y, x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size) {
             background rgb(color.red + 4*BEVEL_CONSTANT, color.green + 4*BEVEL_CONSTANT, color.blue + 4*BEVEL_CONSTANT)
           }
-          polygon(x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size, y + icon_block_size, fill: true) {
+          polygon(x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size, y + icon_block_size) {
             background rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
           }
-          polygon(x + icon_block_size, y + icon_block_size, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, fill: true) {
+          polygon(x + icon_block_size, y + icon_block_size, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size) {
             background rgb(color.red - 2*BEVEL_CONSTANT, color.green - 2*BEVEL_CONSTANT, color.blue - 2*BEVEL_CONSTANT)
           }
-          polygon(x, y, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size, fill: true) {
+          polygon(x, y, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size) {
             background rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
           }
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.4.6
+  version: 4.18.4.7
 platform: ruby
 authors:
 - AndyMaleh