glimmer-dsl-swing 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0ffbe12ad885326f61aa37073604e1df424e538d33bd6a05653598c017c4c78
-  data.tar.gz: cbef6588edb062f6079fd55b1af4f4de8dd691fbe3c4a350176c3d179c2e4e5e
+  metadata.gz: 839a9058d2f94757fbe185bb825a23a10fd840a0588b9e5f4fc44ede4ca4d511
+  data.tar.gz: efd4e9dead40a0076b3d3647657fe27642101f498b7381efe7cf554a3d440d51
 SHA512:
-  metadata.gz: 87b6a0d7b707ad99af3ca49a769edd5376a75d961190c87a4677cf9d5d8ba11b2b47cfd19f19b1391e381a13158783d88d7507711c2cb8bbc5d11c4ec03512fb
-  data.tar.gz: 7daff7909124ea6303d905821868116c91c15db4e2a467f47c2f6e9d729877316d9bbee340a3930c401a57184e38235f4b8af49356dd6820325e98fb25cf499c
+  metadata.gz: 88bb15d31a9186a28d5e321f35080ff97bcdd055747f815e672c481e549dfd2076d9202f905e76d18528aead464ef8b5e920dd65a90736debedbc986a0cfecc7
+  data.tar.gz: 1bda4d359a7974c9f8ee4fa4ca21ef30d6f833038b200dc0de8acd7e8dae7b9ac717a15d984a48d7e8c4cb7d600b440259b57e3f8d9dde23c50cc745c4716d0c

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 0.0.4
+
+- Support setting `stroke` attribute in shapes
+- Rename `draw_color` and `fill_color` to `draw_paint` and `fill_paint` to be consistent with `java.awt.Graphics2D` terminology (while keeping older syntax as an alias/alternative)
+- Enable antialiasing by default on Java 2D graphics
+- Update Hello, Shapes! to take advantage of `stroke`
+
 ## 0.0.3
 
 - Support `observe` keyword for observing model attributes to update the View

data/README.md

@@ -1,11 +1,11 @@
-# [<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 Swing 0.0.3
+# [<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 Swing 0.0.4
 ## JRuby Swing Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swing.svg)](http://badge.fury.io/rb/glimmer-dsl-swing)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 [Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [Swing](https://docs.oracle.com/javase/tutorial/uiswing/) enables building desktop applications with [Java Swing](https://docs.oracle.com/javase/tutorial/uiswing/), [Java AWT](https://docs.oracle.com/javase/8/docs/technotes/guides/awt/index.html), [Java Foundation Classes](https://docs.oracle.com/javase/tutorial/uiswing/start/about.html) and [Java 2D](https://docs.oracle.com/javase/tutorial/2d/index.html) via [JRuby](https://www.jruby.org/).
 
-There has been a great divide between two big GUI toolkits in Java in the past:
+There has been a great divide between two big GUI toolkits in Java:
 - [Eclipse SWT](https://www.eclipse.org/swt/)
 - [Java Swing/AWT/JFC/2D](https://docs.oracle.com/javase/tutorial/uiswing/)
 
@@ -57,14 +57,14 @@ Note: On the Mac, if you have [Glimmer DSL for SWT](https://github.com/AndyObtiv
 
 Run this command to install directly:
 ```
-gem install glimmer-dsl-swing -v0.0.3
+gem install glimmer-dsl-swing -v0.0.4
 ```
 
 ### Option 2: Bundler
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swing', '0.0.3'
+gem 'glimmer-dsl-swing', '0.0.4'
 ```
 
 And, then run:
@@ -110,7 +110,7 @@ The Glimmer GUI DSL enables development of desktop graphical user interfaces in
 
 1 - Keywords
 
-You may declare any swing/awt component with its keyword, which is the underscored version of the class name. For example, `jframe` is the keyword for `javax.swing.JFrame` (`j_frame` is acceptable too)
+You may declare any [swing](https://docs.oracle.com/javase/8/docs/api/javax/swing/package-summary.html)/[awt](https://docs.oracle.com/javase/8/docs/api/java/awt/package-summary.html) component with its keyword, which is the underscored version of the class name. For example, `jframe` is the keyword for `javax.swing.JFrame` (`j_frame` is acceptable too)
 
 Examples:
 
@@ -124,7 +124,7 @@ jlabel
 
 You may pass any arguments that a [swing](https://docs.oracle.com/javase/8/docs/api/javax/swing/package-summary.html)/[awt](https://docs.oracle.com/javase/8/docs/api/java/awt/package-summary.html) component constructor accepts to its Glimmer keyword.
 
-Example `JFrame`, `JLabel`, and `JButton` have a constructor signature that accepts a string representing title or text:
+Example (`JFrame`, `JButton`, and `JLabel` have a constructor signature that accepts a string representing title or text):
 
 ```ruby
 jframe('Hello, World!')
@@ -148,13 +148,13 @@ jframe('Hello, World!') {
 }
 ```
 
-The recommended style for the content block is to always be curly braces to denote as View nesting code different from the logic in looping/conditional constructs that utilize `do;end` instead.
+The recommended style for the content block is always curly braces `{}` to denote as View nesting code different from looping/conditional logic, which utilizes `do;end` instead.
 
 Property arguments never have parentheses.
 
 4 - Listeners
 
-You may declare listeners with their event method name on the [swing](https://docs.oracle.com/javase/8/docs/api/javax/swing/package-summary.html)/[awt](https://docs.oracle.com/javase/8/docs/api/java/awt/package-summary.html) listener class (these are the classes in the signatures of `AddXYZListener` methods on [swing](https://docs.oracle.com/javase/8/docs/api/javax/swing/package-summary.html)/[awt](https://docs.oracle.com/javase/8/docs/api/java/awt/package-summary.html) component classes).
+You may declare listeners with their `on_`-prefixed event method name on the [swing](https://docs.oracle.com/javase/8/docs/api/javax/swing/package-summary.html)/[awt](https://docs.oracle.com/javase/8/docs/api/java/awt/package-summary.html) listener class (these are the classes in the signatures of `AddXYZListener` methods on [swing](https://docs.oracle.com/javase/8/docs/api/javax/swing/package-summary.html)/[awt](https://docs.oracle.com/javase/8/docs/api/java/awt/package-summary.html) component classes).
 
 For example, `JButton` has an `AddXYZListener` method called `AddActionListener`, which accepts an `ActionListener` class. That class has one event method: `actionPerformed`. In Glimmer, you simply underscore that and prefix with `on_`:
 
@@ -183,7 +183,7 @@ frame1 = jframe('Hello, World!') {
 frame1.show
 ```
 
-Despite `#show` being deprecated in the Java API, it is recommended to use `#show` instead of `visible=` in the Glimmer GUI DSL because it has less awkward syntax (it calls `visible=` behind the scenes to avoid the deprecated API). `#show` also invokes `pack` automatically on first run, and ensures utilizing `SwingUtilities.invokeLater` behind the scenes.
+Despite `#show` being deprecated in the Java API, it is recommended to use `#show` instead of `visible=` in the Glimmer GUI DSL because it has less awkward syntax (it calls `visible=` behind the scenes to avoid the deprecated API). `#show` also invokes `pack` automatically on first run, utilizing `SwingUtilities.invokeLater`.
 
 6 - Observe Model Attributes
 
@@ -249,7 +249,10 @@ For example, `Arc2D` becomes simply `arc`.
 
 Glimmer utilizes the `Double` variation of shape classes.
 
-Additionally, you can set `draw_color` or `fill_color` property as an rgb/rgba hash (e.g. `r: 255, g: 0, b: 0`)
+Additionally, you can set these shape properties:
+- `draw_paint` (alias: `draw_color`): takes [`java.awt.Color`](https://docs.oracle.com/javase/8/docs/api/java/awt/Color.html) rgba arguments to use color for drawing
+- `fill_paint` (alias: `fill_color`): takes [`java.awt.Color`](https://docs.oracle.com/javase/8/docs/api/java/awt/Color.html) rgba arguments to use color for filling
+- `stroke`: takes [`java.awt.BasicStroke`](https://docs.oracle.com/javase/8/docs/api/java/awt/BasicStroke.html) line width and other arguments to use for drawing
 
 Example:
 
@@ -262,45 +265,54 @@ jframe('Hello, Shapes!') {
   minimum_size 400, 400
   
   arc(40, 40, 90, 90, 30, 230, 0) {
-    fill_color r: 255, g: 0, b: 0
-    draw_color r: 0, g: 255, b: 255
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
   }
   
   arc(40, 140, 90, 90, 30, 230, 1) {
-    fill_color r: 255, g: 0, b: 0
-    draw_color r: 0, g: 255, b: 255
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
   }
   
   arc(40, 240, 90, 90, 30, 230, 2) {
-    fill_color r: 255, g: 0, b: 0
-    draw_color r: 0, g: 255, b: 255
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
   }
   
-  ellipse(140, 40, 180, 90) {
-    fill_color r: 0, g: 255, b: 255
-    draw_color r: 255, g: 0, b: 0
+  rectangle(140, 40, 180, 90) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
   }
   
-  rectangle(140, 140, 180, 90) {
-    fill_color r: 0, g: 255, b: 255
-    draw_color r: 255, g: 0, b: 0
-  }
-  
-  round_rectangle(140, 240, 180, 90, 60, 40) {
-    fill_color r: 0, g: 255, b: 255
-    draw_color r: 255, g: 0, b: 0
+  round_rectangle(140, 140, 180, 90, 60, 40) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
   }
 
+  ellipse(140, 240, 180, 90) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
+  }
+  
   line(180, 60, 280, 110) {
-    draw_color r: 0, g: 0, b: 0
+    draw_paint 255, 0, 0
+    stroke 3
   }
   
   quad_curve(170, 60, 180, 90, 220, 100) {
-    draw_color r: 0, g: 0, b: 0
+    draw_paint 0, 255, 0
+    stroke 3
   }
   
   cubic_curve(190, 60, 240, 40, 220, 80, 260, 70) {
-    draw_color r: 0, g: 0, b: 0
+    draw_paint 0, 0, 255
+    stroke 3
   }
 }.show
 ```
@@ -453,45 +465,54 @@ jframe('Hello, Shapes!') {
   minimum_size 400, 400
   
   arc(40, 40, 90, 90, 30, 230, 0) {
-    fill_color r: 255, g: 0, b: 0
-    draw_color r: 0, g: 255, b: 255
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
   }
   
   arc(40, 140, 90, 90, 30, 230, 1) {
-    fill_color r: 255, g: 0, b: 0
-    draw_color r: 0, g: 255, b: 255
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
   }
   
   arc(40, 240, 90, 90, 30, 230, 2) {
-    fill_color r: 255, g: 0, b: 0
-    draw_color r: 0, g: 255, b: 255
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
   }
   
-  ellipse(140, 40, 180, 90) {
-    fill_color r: 0, g: 255, b: 255
-    draw_color r: 255, g: 0, b: 0
+  rectangle(140, 40, 180, 90) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
   }
   
-  rectangle(140, 140, 180, 90) {
-    fill_color r: 0, g: 255, b: 255
-    draw_color r: 255, g: 0, b: 0
-  }
-  
-  round_rectangle(140, 240, 180, 90, 60, 40) {
-    fill_color r: 0, g: 255, b: 255
-    draw_color r: 255, g: 0, b: 0
+  round_rectangle(140, 140, 180, 90, 60, 40) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
   }
 
+  ellipse(140, 240, 180, 90) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
+  }
+  
   line(180, 60, 280, 110) {
-    draw_color r: 0, g: 0, b: 0
+    draw_paint 255, 0, 0
+    stroke 3
   }
   
   quad_curve(170, 60, 180, 90, 220, 100) {
-    draw_color r: 0, g: 0, b: 0
+    draw_paint 0, 255, 0
+    stroke 3
   }
   
   cubic_curve(190, 60, 240, 40, 220, 80, 260, 70) {
-    draw_color r: 0, g: 0, b: 0
+    draw_paint 0, 0, 255
+    stroke 3
   }
 }.show
 ```

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/glimmer/dsl/swing/property_expression.rb

@@ -32,7 +32,7 @@ module Glimmer
             parent.is_a?(Glimmer::Swing::ShapeProxy)
           ) and
             block.nil? and
-            parent.respond_to?(keyword, *args)
+            parent.respond_to?("#{keyword}=", *args)
         end
   
         def interpret(parent, keyword, *args, &block)

data/lib/glimmer/swing/component_proxy.rb

@@ -87,18 +87,23 @@ module Glimmer
                 attr_accessor :shape_proxies
       
                 def paint(g2)
+                  rendering_hints = RenderingHints.new(RenderingHints::KEY_ANTIALIASING, RenderingHints::VALUE_ANTIALIAS_ON)
+                  g2.set_rendering_hints(rendering_hints)
                   super(g2)
                   shape_proxies.each do |shape_proxy|
-                    original_color = g2.get_color
+                    original_paint = g2.get_paint
+                    original_stroke = g2.get_stroke
                     if shape_proxy.fill_color
-                      g2.color = Color.new(shape_proxy.fill_color[:r], shape_proxy.fill_color[:g], shape_proxy.fill_color[:b], shape_proxy.fill_color[:a] || 255)
+                      g2.set_paint shape_proxy.fill_paint
                       g2.fill(shape_proxy)
                     end
                     if shape_proxy.draw_color
-                      g2.color = Color.new(shape_proxy.draw_color[:r], shape_proxy.draw_color[:g], shape_proxy.draw_color[:b], shape_proxy.draw_color[:a] || 255)
+                      g2.set_stroke shape_proxy.stroke unless shape_proxy.stroke.nil?
+                      g2.set_paint shape_proxy.draw_paint
                       g2.draw(shape_proxy)
                     end
-                    g2.color = original_color
+                    g2.set_paint original_paint
+                    g2.set_stroke original_stroke || BasicStroke.new
                   end
                 end
               }

data/lib/glimmer/swing/shape_proxy.rb

@@ -99,7 +99,6 @@ module Glimmer
       end
       
       attr_reader :parent_proxy, :original, :args, :keyword, :block
-      attr_accessor :draw_color, :fill_color
       
       def initialize(parent, keyword, *args, &block)
         @parent_proxy = parent
@@ -149,6 +148,34 @@ module Glimmer
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Swing::ShapeExpression.new, @keyword, &block)
       end
       
+      def stroke=(*args)
+        @stroke = BasicStroke.new(*args)
+      end
+      
+      def stroke
+        @stroke
+      end
+      
+      def draw_paint=(*args)
+        @draw_paint = Color.new(*args)
+      end
+      alias draw_color= draw_paint=
+      
+      def draw_paint
+        @draw_paint
+      end
+      alias draw_color draw_paint
+      
+      def fill_paint=(*args)
+        @fill_paint = Color.new(*args)
+      end
+      alias fill_color= fill_paint=
+      
+      def fill_paint
+        @fill_paint
+      end
+      alias fill_color fill_paint
+      
       private
       
       def build

data/samples/hello/hello_shapes.rb

@@ -6,44 +6,53 @@ jframe('Hello, Shapes!') {
   minimum_size 400, 400
   
   arc(40, 40, 90, 90, 30, 230, 0) {
-    fill_color r: 255, g: 0, b: 0
-    draw_color r: 0, g: 255, b: 255
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
   }
   
   arc(40, 140, 90, 90, 30, 230, 1) {
-    fill_color r: 255, g: 0, b: 0
-    draw_color r: 0, g: 255, b: 255
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
   }
   
   arc(40, 240, 90, 90, 30, 230, 2) {
-    fill_color r: 255, g: 0, b: 0
-    draw_color r: 0, g: 255, b: 255
+    fill_paint 255, 0, 0
+    draw_paint 0, 128, 255
+    stroke 3
   }
   
-  ellipse(140, 40, 180, 90) {
-    fill_color r: 0, g: 255, b: 255
-    draw_color r: 255, g: 0, b: 0
+  rectangle(140, 40, 180, 90) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
   }
   
-  rectangle(140, 140, 180, 90) {
-    fill_color r: 0, g: 255, b: 255
-    draw_color r: 255, g: 0, b: 0
-  }
-  
-  round_rectangle(140, 240, 180, 90, 60, 40) {
-    fill_color r: 0, g: 255, b: 255
-    draw_color r: 255, g: 0, b: 0
+  round_rectangle(140, 140, 180, 90, 60, 40) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
   }
 
+  ellipse(140, 240, 180, 90) {
+    fill_paint 255, 255, 0
+    draw_paint 255, 0, 0
+    stroke 3
+  }
+  
   line(180, 60, 280, 110) {
-    draw_color r: 0, g: 0, b: 0
+    draw_paint 255, 0, 0
+    stroke 3
   }
   
   quad_curve(170, 60, 180, 90, 220, 100) {
-    draw_color r: 0, g: 0, b: 0
+    draw_paint 0, 255, 0
+    stroke 3
   }
   
   cubic_curve(190, 60, 240, 40, 220, 80, 260, 70) {
-    draw_color r: 0, g: 0, b: 0
+    draw_paint 0, 0, 255
+    stroke 3
   }
 }.show

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swing
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2021-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,6 @@ executables:
 - girb
 extensions: []
 extra_rdoc_files:
-- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files:
@@ -252,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for Swing