glimmer-dsl-swt 4.18.7.1 → 4.18.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c03c6efd05eba6fe6eec003225d5058e15ff231c888bf6858e1ba5a24bbe632
-  data.tar.gz: 2a093d8817f965994c0d10830b9ef7f78820992b9cdc81a13455a03b859b1b9e
+  metadata.gz: 91d53b49c974e0ce9b4f3d0a715ab59785d2b23fde0abe4bda5ad20de58e68a7
+  data.tar.gz: db8c3d1030700bda5faed413c1719336e12e110fd65c154b5650d2b69e3d7eee
 SHA512:
-  metadata.gz: 03c8cf962cbfdee80d1b308c2c0d33a1ba721bb6c9b765b45764c47f14eeee24f0a3034998f843097e016d7c44353e0541cea1d01c702a037622c64580ee22c8
-  data.tar.gz: 27dfa02af89e29c5481ca00cf68a095701fc6bfdde523e574512a52ff5906560546364eab798facf244b81da9446becd3c15a9e037570c80b03af971bcc449b3
+  metadata.gz: 9630530911bcd671a335cef7a1911db6150382532d03b85cd8e6629d02c6d10c44e7901fe40ee48f114c73465c56efff53d13b984cf53393999a449e83c394ca
+  data.tar.gz: 0d07793e4f0a79b75a1eaf073a39dad0af872c19e6c325bd9d4632ce3b9cf53f0735d1bf7e9a2a1e7a46a7d95ebe202e38626400c128cff78d88a5c15d0154a3

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+### 4.18.7.2
+
+- Enable defining custom shapes with direct args just like basic shapes (alternative to using keyword arg options)
+- Fix interpretation of `:max`/`:default` `width`/`height` values in Canvas Shape DSL
+
 ### 4.18.7.1
 
 - Hello, Canvas Animation Data Binding! 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.7.1
+# [<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.7.2
 ## 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)
@@ -13,7 +13,7 @@
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.18.7.1 includes [SWT 4.18](https://download.eclipse.org/eclipse/downloads/drops4/R-4.18-202012021800/), which was released on December 2, 2020. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT.
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.18.7.2 includes [SWT 4.18](https://download.eclipse.org/eclipse/downloads/drops4/R-4.18-202012021800/), which was released on December 2, 2020. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT.
 
 [Glimmer DSL for SWT receives two updates per month](https://rubygems.org/gems/glimmer-dsl-swt/versions). You can trust [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) with your Ruby desktop GUI development needs! [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) brings great ideas to the table, such as declarative programming via domain specific languages, currently under-utilized in the GUI domain. That said, it may not be feature complete enough for everybody's needs, so please help make [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) even better by providing feedback and [contributing](#contributing) when possible. The project is very active, so any feature suggestions that are accepted could be implemented within weeks if not days. Also, you are welcome to [hire me](#hire-me) full-time if you want long-term development of [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) for your project needs.
 
@@ -340,7 +340,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.7.1
+jgem install glimmer-dsl-swt -v 4.18.7.2
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -358,7 +358,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.7.1'
+gem 'glimmer-dsl-swt', '~> 4.18.7.2'
 ```
 
 And, then run:

data/VERSION

@@ -1 +1 @@
-4.18.7.1
+4.18.7.2

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -1485,6 +1485,8 @@ Screenshot:
 
 If you specify the x and y coordinates as `:default`, `nil`, or leave them out, they get calculated automatically by centering the shape within its parent `canvas`.
 
+If you specify the `width` and `height` parameters as `:max`, they get calculated from the parent's size, filling the parent maximally.
+
 Note that you could shift a shape off its centered position within its parent `canvas` by setting `x` to `[:default, x_delta]` and `y` to `[:default, y_delta]`
 
 The round and gradient options could be dropped since Glimmer DSL for SWT supports auto-inference of them based on shape parameters.
@@ -1644,7 +1646,9 @@ As such, if you move the parent, it moves all its children with it.
 
 If you specify the `x` and `y` coordinates as `:default`, `nil`, or leave them out, they get calculated automatically by centering the shape within its parent shape relatively.
 
-If you specify the `width` and `height` parameters as `:default`, `nil`, or leave them out, they get calculated automatically from the shape's nested children shapes (e.g calculating the dimensions of a text from its extent according to its font size).
+If you specify the `width` and `height` parameters as `:default`, `nil`, or leave them out, they get calculated automatically from the shape's nested children shapes if any (e.g calculating the dimensions of a text from its extent according to its font size) or from the parent's size otherwise.
+
+If you specify the `width` and `height` parameters as `:max`, they get calculated from the parent's size, filling the parent maximally.
 
 Note that you could shift a shape off its centered position within its parent shape by setting `x` to `[:default, x_delta]` and `y` to `[:default, y_delta]`
 
@@ -1801,6 +1805,8 @@ They are implemented with the help of the highly robust Java built-in shape geom
 - `Shape#height` : static (including `:default`) or derived height for shape (including irregular geometric shapes like Polygon)
 - `Shape#default_width?` : whether `:default` or `[:default, delta]` is set for static width
 - `Shape#default_height?` : whether `:default` or `[:default, delta]` is set for static height
+- `Shape#max_width?` : whether `:max` or `[:max, delta]` is set for static width
+- `Shape#max_height?` : whether `:max` or `[:max, delta]` is set for static height
 - `Shape#calculated_width` : calculated width for shape when set to :default to indicate it is sized by its children (e.g. in the case of containing text with a specific font size not knowing its width/height dimensions in advance)
 - `Shape#calculated_height` : calculated height for shape when set to :default to indicate it is sized by its children (e.g. in the case of containing text with a specific font size not knowing its width/height dimensions in advance)
 - `Shape#x` : top-left corner x position, static or `:default` (could be relative if shape is nested within another shape)

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.1 ruby lib
+# stub: glimmer-dsl-swt 4.18.7.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.7.1"
+  s.version = "4.18.7.2"
 
   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-05"
+  s.date = "2021-03-06"
   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/swt/custom/shape.rb

@@ -214,12 +214,12 @@ module Glimmer
         def move_by(x_delta, y_delta)
           if respond_to?(:x) && respond_to?(:y) && respond_to?(:x=) && respond_to?(:y=)
             if default_x?
-              self.default_x_delta += x_delta
+              self.x_delta += x_delta
             else
               self.x += x_delta
             end
             if default_y?
-              self.default_y_delta += y_delta
+              self.y_delta += y_delta
             else
               self.y += y_delta
             end
@@ -483,6 +483,21 @@ module Glimmer
           end
         end
         
+        # Sets data just like SWT widgets
+        def set_data(key=nil, value)
+          @data ||= {}
+          @data[key] = value
+        end
+        alias setData set_data # for compatibility with SWT APIs
+  
+        # Gets data just like SWT widgets
+        def get_data(key=nil)
+          @data ||= {}
+          @data[key]
+        end
+        alias getData get_data # for compatibility with SWT APIs
+        alias data get_data # for compatibility with SWT APIs
+  
         def method_missing(method_name, *args, &block)
           if method_name.to_s.end_with?('=')
             set_attribute(method_name, *args)
@@ -676,7 +691,7 @@ module Glimmer
                 
         # args translated to absolute coordinates
         def calculated_args
-          return @args if !default_x? && !default_y? && !default_width? && !default_height? && parent.is_a?(Drawable)
+          return @args if !default_x? && !default_y? && !default_width? && !default_height? && !max_width? && !max_height? && parent.is_a?(Drawable)
           # Note: Must set x and move_by because not all shapes have a real x and some must translate all their points with move_by
           # TODO change that by setting a bounding box for all shapes with a calculated top-left x, y and
           # a setter that does the moving inside them instead so that I could rely on absolute_x and absolute_y
@@ -708,11 +723,11 @@ module Glimmer
           end
           if default_x?
             original_x = x
-            self.x = default_x + default_x_delta
+            self.x = default_x + self.x_delta
           end
           if default_y?
             original_y = y
-            self.y = default_y + default_y_delta
+            self.y = default_y + self.y_delta
           end
           if parent.is_a?(Shape)
             move_by(@parent_absolute_x, @parent_absolute_y)
@@ -792,7 +807,9 @@ module Glimmer
               shape_x + shape_width
             end
           end
-          if shapes.size == 1 && shapes.first.max_width?
+          if shapes.empty?
+            max_width
+          elsif shapes.size == 1 && shapes.first.max_width?
             self.parent.size.x
           else
             x_ends.max.to_f
@@ -810,7 +827,9 @@ module Glimmer
               shape_y + shape_height
             end
           end
-          if shapes.size == 1 && shapes.first.max_height?
+          if shapes.empty?
+            max_height
+          elsif shapes.size == 1 && shapes.first.max_height?
             self.parent.size.y
           else
             y_ends.max.to_f
@@ -841,55 +860,59 @@ module Glimmer
           result_height
         end
         
-        def default_x_delta
+        def x_delta
           return 0 unless default_x? && x.is_a?(Array)
           x[1].to_f
         end
         
-        def default_y_delta
+        def y_delta
           return 0 unless default_y? && y.is_a?(Array)
           y[1].to_f
         end
         
         def width_delta
-          return 0 unless default_width? && width.is_a?(Array)
+          return 0 unless (default_width? || max_width?) && width.is_a?(Array)
           width[1].to_f
         end
         
         def height_delta
-          return 0 unless default_height? && height.is_a?(Array)
+          return 0 unless (default_height? || max_height?) && height.is_a?(Array)
           height[1].to_f
         end
         
-        def default_x_delta=(delta)
+        def x_delta=(delta)
           return unless default_x?
-          self.x = [:default, delta]
+          symbol = x.is_a?(Array) ? x.first : x
+          self.x = [symbol, delta]
         end
         
-        def default_y_delta=(delta)
+        def y_delta=(delta)
           return unless default_y?
-          self.y = [:default, delta]
+          symbol = y.is_a?(Array) ? y.first : y
+          self.y = [symbol, delta]
         end
         
         def width_delta=(delta)
           return unless default_width?
-          self.width = [:default, delta]
+          symbol = width.is_a?(Array) ? width.first : width
+          self.width = [symbol, delta]
         end
         
         def height_delta=(delta)
           return unless default_height?
-          self.height = [:default, delta]
+          symbol = height.is_a?(Array) ? height.first : height
+          self.height = [symbol, delta]
         end
         
         def calculated_x
           result = default_x? ? default_x : self.x
-          result += default_x_delta
+          result += self.x_delta
           result
         end
         
         def calculated_y
           result = default_y? ? default_y : self.y
-          result += default_y_delta
+          result += self.y_delta
           result
         end
         

data/lib/glimmer/ui/custom_shape.rb

@@ -253,7 +253,7 @@ module Glimmer
           @content
         end
       end
-
+      
       def method_missing(method, *args, &block)
         # TODO Consider supporting a glimmer error silencing option for methods defined here
         # but fail the glimmer DSL for the right reason to avoid seeing noise in the log output

data/samples/elaborate/meta_sample.rb

@@ -215,7 +215,7 @@ class MetaSampleApplication
             
           expand_bar {
             layout_data(:fill, :fill, true, true)
-            font height: 30
+            font height: 25
                         
             SampleDirectory.sample_directories.each { |sample_directory|
               expand_item {
@@ -227,7 +227,7 @@ class MetaSampleApplication
                     fill true
                   }
                   selection bind(sample_directory, :selected_sample_name)
-                  font height: 24
+                  font height: 20
                 }
               }
             }
@@ -236,12 +236,12 @@ class MetaSampleApplication
           composite {
             fill_layout
             layout_data(:fill, :center, true, false) {
-              height_hint 120
+              height_hint 96
             }
             
             button {
               text 'Launch'
-              font height: 30
+              font height: 25
               enabled bind(SampleDirectory, 'selected_sample.launchable')
               
               on_widget_selected {
@@ -254,7 +254,7 @@ class MetaSampleApplication
             }
             button {
               text 'Reset'
-              font height: 30
+              font height: 25
               enabled bind(SampleDirectory, 'selected_sample.editable')
               
               on_widget_selected {

data/samples/elaborate/metronome.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'glimmer-dsl-swt'
 
 class Metronome
@@ -92,13 +113,15 @@ class Metronome
   
   def beat_container
     composite {
-      grid_layout(@rhythm.beat_count, true) {
-        margin_left 10
-      }
+      grid_layout(@rhythm.beat_count, true)
       
       @rhythm.beat_count.times { |n|
         canvas {
-          rectangle(0, 0, 50, 50, 36, 36) {
+          layout_data {
+            width_hint 50
+            height_hint 50
+          }
+          rectangle(0, 0, :default, :default, 36, 36) {
             background bind(self, "rhythm.beats[#{n}].on") {|on| on ? :red : :yellow}
           }
         }

data/samples/hello/hello_canvas_animation_data_binding.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'glimmer-dsl-swt'
 require 'bigdecimal'
 

data/samples/hello/hello_custom_shape.rb

@@ -61,11 +61,11 @@ class HelloCustomShape
         background :white
         
         15.times { |n|
-          x_location = (rand*WIDTH/2).to_i%WIDTH + (rand*25).to_i
-          y_location = (rand*HEIGHT/2).to_i%HEIGHT + (rand*25).to_i
+          x_location = (rand*WIDTH/2).to_i%WIDTH + (rand*15).to_i
+          y_location = (rand*HEIGHT/2).to_i%HEIGHT + (rand*15).to_i
           foreground_color = rgb(rand*255, rand*255, rand*255)
           
-          stick_figure(x: x_location, y: y_location, width: 50, height: 50) {
+          stick_figure(x: x_location, y: y_location, width: 35+n*2, height: 35+n*2) {
             foreground foreground_color
           }
         }

data/samples/hello/hello_shape.rb

@@ -33,11 +33,11 @@ class HelloShape
         background :white
         
         15.times { |n|
-          x_location = (rand*125).to_i%200 + (rand*25).to_i
-          y_location = (rand*125).to_i%200 + (rand*25).to_i
+          x_location = (rand*125).to_i%200 + (rand*15).to_i
+          y_location = (rand*125).to_i%200 + (rand*15).to_i
           foreground_color = rgb(rand*255, rand*255, rand*255)
           
-          stick_figure(x_location, y_location, 50, 50) {
+          stick_figure(x_location, y_location, 35+n*2, 35+n*2) {
             foreground foreground_color
           }
         }

metadata

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