glimmer-dsl-swt 4.24.1.1 → 4.24.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb2e6b29d0e22472197125558b15c5907bb8cd0f14435a5394e50e988d246e60
-  data.tar.gz: fb077b4b726a322ba57a3bc18e5feb8356d25eac9f8919cd3fccabd8cb3220a6
+  metadata.gz: 4958a72683334de9b8f0ca8a213eabce1dbf93031ea249dd760abea934d704d6
+  data.tar.gz: ec7566aee8c9a16a757fc639cb64a3a3b96ba83b7abb92d92a83bc64221631a8
 SHA512:
-  metadata.gz: be47b7d1ed562c8a086f6d4f58df9f669597fe0726f7befc15632ee21ba326514978a6622b6daeb3c35da6fdaaf104a55c316ee1b8fd22841697999eddedb193
-  data.tar.gz: bd6f034024917f91b7b15b54010c37c17b9b10a85d82ae9b41ad7f5605935217ca381a98f15f4f96f874684a3fb1f6b62e6bb19fb7a354af4c98d30a746daa47
+  metadata.gz: 0fcf51949b0e6231e92b1d0603c530f69272ccd5a3a18631d3a386a140bffb5e41bca9eda858ff6f5481aeb60351e8fcef04f0ce30ec835cdd50898e149cadf8
+  data.tar.gz: 75a92e8793f5c7782dd9d18359a1693d80dc35de3ad7eea51268a316f382ed1c88bf5e451865975ffe881134ff041fc343697e1c4f933fb77e3fd6fac22ba70e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 4.24.1.2
+
+- Fix issue where you cannot call `tab_item_proxy.text` or `tab_item_proxy.text = 'new text'` because its `swt_widget` is the contained `composite`
+- Refactor Parking sample to clarify rotation details
+
 ## 4.24.1.1
 
 - Fix `jar-dependencies` gem version to v0.4.1 in scaffolded applications to avoid issue encountered in newly released v0.4.2

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.24.1.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.24.1.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)
@@ -19,7 +19,7 @@ Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) an
 
 ![Eclipse SWT RCP NASA Mars Rover](/images/glimmer-eclipse-swt-rcp-nasa-mars-rover.png)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.24.1.1 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. 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.24.1.2 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. 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.
 
 **Starting in version 4.20.0.0, [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) comes with the new [***Shine***](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#shine) syntax** for highly intuitive and visually expressive View/Model Attribute Mapping, relying on `<=>` for bidirectional (two-way) data-binding and `<=` for unidirectional (one-way) data-binding, providing an alternative to the `bind` keyword. That was [originally conceived back in 2007](https://andymaleh.blogspot.com/2007/12/data-shining-in-glimmer.html).
 
@@ -304,9 +304,9 @@ https://www.eclipse.org/swt/faq.php
 
 ## Pre-requisites
 
-- JDK 18 is recommended / Minimum is JDK 16 on x64 platforms and Linux AARCH64, and JDK 17 on Mac ARM64 (find at https://www.oracle.com/java/technologies/downloads / Ensure `PATH` env var includes Java bin directory for `jpackage` command to work when packaging Glimmer applications / Preferably setup `JAVA_HOME` env var too to point to JDK home directory before installing JRuby)
+- JDK 18 is required on Mac/Linux / JDK 16 is required on Windows (find at https://www.oracle.com/java/technologies/downloads / Ensure `PATH` env var includes Java bin directory for `jpackage` command to work when packaging Glimmer applications / Preferably setup `JAVA_HOME` env var too to point to JDK home directory before installing JRuby)
 - [RVM](http://rvm.io) on Mac & Linux (not needed on Windows)
-- JRuby 9.3.6.0 (supporting Ruby 2.6.x syntax) (get via [RVM](http://rvm.io) on Mac and Linux by running `rvm install jruby-9.3.6.0`; On Windows, find at [https://www.jruby.org/download](https://www.jruby.org/download))
+- JRuby 9.3.6.0 is required on Mac/Linux / JRuby 9.3.4.0 is required on Windows (supporting Ruby 2.6.x syntax) (get via [RVM](http://rvm.io) on Mac and Linux by running `rvm install jruby-9.3.6.0`; On Windows, find at [https://www.jruby.org/download](https://www.jruby.org/download))
 - SWT 4.24 (already included in the [glimmer-dsl-swt](https://rubygems.org/gems/glimmer-dsl-swt) gem). Note that SWT supports ARM64/AARCH64 on Mac and Linux since version 4.20
 - Git (comes with Mac and Linux. Install on Windows: https://git-scm.com/download/win )
 
@@ -336,7 +336,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.24.1.1
+jgem install glimmer-dsl-swt -v 4.24.1.2
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -364,7 +364,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.24.1.1'
+gem 'glimmer-dsl-swt', '~> 4.24.1.2'
 ```
 
 And, then run:
@@ -387,7 +387,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.1.1
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.1.2
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/VERSION

@@ -1 +1 @@
-4.24.1.1
+4.24.1.2

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -78,6 +78,23 @@ module Glimmer
         end
       end
       
+      ATTRIBUTES.each do |attribute|
+        define_method(attribute) do
+          auto_exec do
+            widget_proxy.send(attribute)
+          end
+        end
+        
+        define_method("#{attribute}=") do |value|
+          value.tap do
+            auto_exec do
+              widget_proxy.send("#{attribute}=", value)
+              shell_proxy.pack_same_size
+            end
+          end
+        end
+      end
+      
       def dispose
         auto_exec do
           swt_tab_item.setControl(nil)

data/samples/elaborate/parking.rb

@@ -26,10 +26,10 @@ require_relative 'parking/model/parking_presenter'
 class Parking
   include Glimmer::UI::CustomShell
     
+  CANVAS_LENGTH = 600
   FLOOR_COUNT = 4
   
   before_body do
-    @parking_spots = Model::ParkingSpot::LETTERS.clone
     @parking_presenter = Model::ParkingPresenter.new(FLOOR_COUNT)
   end
 
@@ -56,7 +56,6 @@ class Parking
         selection <=> [@parking_presenter, :selected_floor]
         
         on_widget_selected do
-          @parking_spots = Model::ParkingSpot::LETTERS.clone
           @canvas.dispose_shapes
           @canvas.content {
             parking_floor
@@ -65,8 +64,8 @@ class Parking
       }
       @canvas = canvas {
         layout_data {
-          width 600
-          height 600
+          width CANVAS_LENGTH
+          height CANVAS_LENGTH
         }
         
         background :dark_gray
@@ -77,42 +76,33 @@ class Parking
   }
   
   def parking_floor
-    parking_quad(67.5, 0, 125)
-    parking_quad(67.5, 0, 125) { |shp|
-      shp.rotate(90)
-    }
-    parking_quad(67.5, 0, 125) { |shp|
-      shp.rotate(180)
-    }
-    parking_quad(67.5, 0, 125) { |shp|
-      shp.rotate(270)
-    }
+    parking_quad(67.5, 0, 125, 0)
+    parking_quad(67.5, 0, 125, 90)
+    parking_quad(67.5, 0, 125, 180)
+    parking_quad(67.5, 0, 125, 270)
   end
         
-  def parking_quad(location_x, location_y, length, &block)
+  def parking_quad(location_x, location_y, length, angle)
     distance = (1.0/3)*length
-    parking_spot(location_x, location_y, length, &block)
-    parking_spot(location_x + distance, location_y, length, &block)
-    parking_spot(location_x + 2*distance, location_y, length, &block)
-    parking_spot(location_x + 3*distance, location_y, length, &block)
+    parking_spot(location_x, location_y, length, angle)
+    parking_spot(location_x + distance, location_y, length, angle)
+    parking_spot(location_x + 2*distance, location_y, length, angle)
+    parking_spot(location_x + 3*distance, location_y, length, angle)
   end
       
-  def parking_spot(location_x, location_y, length, &block)
-    parking_spot_letter = @parking_spots.shift
+  def parking_spot(location_x, location_y, length, angle)
+    parking_spot_letter = next_parking_spot_letter
     height = length
     width = (2.0/3)*length
-    shape(location_x, location_y) { |the_shape|
+    
+    shape(location_x, location_y) {
       line_width (1.0/15)*length
       foreground :white
   
-      block&.call(the_shape)
-    
       rectangle(location_x, location_y, width, height) {
-        background <= [
-          @parking_presenter.floors[@parking_presenter.selected_floor - 1].parking_spots[parking_spot_letter],
-          :booked,
-          on_read: ->(b) {b ? :red : :dark_gray}
-        ]
+        background <= [parking_spot_for(parking_spot_letter), :booked,
+                        on_read: ->(value) {value ? :red : :dark_gray}
+                      ]
         
         text {
           x :default
@@ -123,7 +113,8 @@ class Parking
         
         on_mouse_up do
           begin
-            @parking_presenter.floors[@parking_presenter.selected_floor - 1].book!(parking_spot_letter)
+            selected_parking_floor.book!(parking_spot_letter)
+            
             message_box {
               text 'Parking Booked!'
               message "Floor #{@parking_presenter.selected_floor} Parking Spot #{parking_spot_letter} Is Booked!"
@@ -138,8 +129,29 @@ class Parking
       line(location_x, location_y, location_x + width, location_y)
       line(location_x + width, location_y, location_x + width, location_y + height)
       
+      # Rotate around the canvas center point
+      transform {
+        translation CANVAS_LENGTH/2.0, CANVAS_LENGTH/2.0
+        rotation angle
+        translation -CANVAS_LENGTH/2.0, -CANVAS_LENGTH/2.0
+      }
     }
   end
+  
+  def parking_spot_for(parking_spot_letter)
+    selected_parking_floor.parking_spots[parking_spot_letter]
+  end
+  
+  def selected_parking_floor
+    @parking_presenter.floors[@parking_presenter.selected_floor - 1]
+  end
+  
+  private
+  
+  def next_parking_spot_letter
+    @parking_spot_letters = Model::ParkingSpot::LETTERS.clone if @parking_spot_letters.nil? || @parking_spot_letters.empty?
+    @parking_spot_letters.shift
+  end
 end
   
 Parking.launch

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.24.1.1
+  version: 4.24.1.2
 platform: ruby
 authors:
 - Andy Maleh