glimmer-dsl-libui 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a198df8af13246ffee6aa56434bfa89740e9211e19da28fb0dddb1705000eec
-  data.tar.gz: cb4c0b685980983fb17cc3f501165d8fa788a56ce4da9ced03630a78329045af
+  metadata.gz: a21485d1722dad246e40058c46dc14b63103e93b1243db1c0ae49bc3b96f96ab
+  data.tar.gz: 390bac7628f29d016bfac073d926011d5fd91d10e7c23a95cae8b59c0bb4a55f
 SHA512:
-  metadata.gz: 3809a094cb6cd607d94c0d37c10f67213c3bab4cc3d74d7d8d3c4d49514da75e3ae2b99328d09291f4905b7d3c85aea14f6935f22d3cac249edf533eff5e575d
-  data.tar.gz: 3efefe3c53b4520b077165df099f9427f112c7cc1acafed0d878fe187d65657264b6317de470e6330a12c63bde1edd4694455bc675be87f8e374ee0113235ae0
+  metadata.gz: 43aa1f65c47353b9ce340ff18264edaf6d9e6c09ee700919e3661b56d2bc8db00f1b31dd365b0a62ae7e39323dc07ba247bb0d06da24f51b01e477ceefa99a34
+  data.tar.gz: c58efb32bc59359ec84cc804eec113004191fa0031676f0af7224c91b8271fb4851939ea761ddbecbc9ca912065bd4616869c76c05c95306991e5e0c68c73bf3

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.5.10
+
+- Support nesting area mouse and keyboard listeners underneath shapes directly given the newly added support for the `include?(x, y)` method, which can be used to detect if a mouse or keyboard event fired for a specific shape
+- examples/shape_coloring.rb
+
 ## 0.5.9
 
 - Upgrade to glimmer v2.7.3

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 LibUI 0.5.9
+# [<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 LibUI 0.5.10
 ## Prerequisite-Free Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-libui.svg)](http://badge.fury.io/rb/glimmer-dsl-libui)
 [![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)
@@ -428,6 +428,7 @@ DSL | Platforms | Native? | Vector Graphics? | Pros | Cons | Prereqs
       - [Tetris](#tetris)
       - [Tic Tac Toe](#tic-tac-toe)
       - [Timer](#timer)
+      - [Shape Coloring](#shape-coloring)
   - [Applications](#applications)
     - [Manga2PDF](#manga2pdf)
     - [Befunge98 GUI](#befunge98-gui)
@@ -578,7 +579,7 @@ gem install glimmer-dsl-libui
 Or install via Bundler `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-libui', '~> 0.5.9'
+gem 'glimmer-dsl-libui', '~> 0.5.10'
 ```
 
 Test that installation worked by running the [Meta-Example](#examples):
@@ -1392,6 +1393,10 @@ In general, it is recommended to use declarative stable paths whenever feasible
 
 #### Area Listeners
 
+`area` supports a number of keyboard and mouse listeners to enable observing the control for user interaction to execute some logic.
+
+The same listeners can be nested directly under `area` shapes like `rectangle` and `circle`, and [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) will automatically detect when the mouse lands within those shapes to constrain triggering the listeners by the shape regions.
+
 `area` supported listeners are:
 - `on_key_event {|area_key_event| ...}`: general catch-all key event (recommend using fine-grained key events below instead)
 - `on_key_down {|area_key_event| ...}`
@@ -11016,6 +11021,125 @@ end
 Timer.new
 ```
 
+#### Shape Coloring
+
+This example demonstrates being able to nest a listener within shapes directly, and [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) will automatically detect when the mouse lands inside a shape to notify listener.
+
+[examples/shape_coloring.rb](examples/shape_coloring.rb)
+
+Run with this command from the root of the project if you cloned the project:
+
+```
+ruby -r './lib/glimmer-dsl-libui' examples/shape_coloring.rb
+```
+
+Run with this command if you installed the [Ruby gem](https://rubygems.org/gems/glimmer-dsl-libui):
+
+```
+ruby -r glimmer-dsl-libui -e "require 'examples/shape_coloring'"
+```
+
+![glimmer-dsl-libui-mac-shape-coloring.png](images/glimmer-dsl-libui-mac-shape-coloring.png)
+![glimmer-dsl-libui-mac-shape-coloring-color-dialog.png](images/glimmer-dsl-libui-mac-shape-coloring-color-dialog.png)
+
+New [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui) Version:
+
+```ruby
+require 'glimmer-dsl-libui'
+
+class ShapeColoring
+  include Glimmer::LibUI::Application
+  
+  COLOR_SELECTION = Glimmer::LibUI.interpret_color(:red)
+  
+  before_body {
+    @shapes = []
+  }
+  
+  body {
+    window('Shape Coloring', 200, 200) {
+      margined false
+      
+      grid {
+        label("Click a shape to select and\nchange color via color button") {
+          left 0
+          top 0
+          hexpand true
+          halign :center
+          vexpand false
+        }
+        
+        color_button { |cb|
+          left 0
+          top 1
+          hexpand true
+          vexpand false
+          
+          on_changed do
+            @selected_shape&.fill = cb.color
+          end
+        }
+      
+        area {
+          left 0
+          top 2
+          hexpand true
+          vexpand true
+          
+          rectangle(0, 0, 600, 400) { # background shape
+            fill :white
+          }
+          
+          @shapes << colorable(:rectangle, 20, 20, 40, 20) { |shape|
+            fill :lime
+          }
+          
+          @shapes << colorable(:square, 80, 20, 20) { |shape|
+            fill :blue
+          }
+          
+          @shapes << colorable(:circle, 75, 70, 20, 20) { |shape|
+            fill :green
+          }
+          
+          @shapes << colorable(:arc, 120, 70, 40, 0, 145) { |shape|
+            fill :orange
+          }
+          
+          @shapes << colorable(:polygon, 120, 10, 120, 50, 150, 10, 150, 50) {
+            fill :cyan
+          }
+          
+          @shapes << colorable(:polybezier, 20, 40,
+                     30, 100, 50, 80, 80, 110,
+                     40, 120, 20, 120, 30, 91) {
+            fill :pink
+          }
+        }
+      }
+    }
+  }
+  
+  def colorable(shape_symbol, *args, &content)
+    send(shape_symbol, *args) do |shape|
+      on_mouse_up do |area_mouse_event|
+        old_stroke = Glimmer::LibUI.interpret_color(shape.stroke).slice(:r, :g, :b)
+        @shapes.each {|sh| sh.stroke = nil}
+        @selected_shape = nil
+        unless old_stroke == COLOR_SELECTION
+          shape.stroke = COLOR_SELECTION.merge(thickness: 2)
+          @selected_shape = shape
+        end
+      end
+      
+      content.call(shape)
+    end
+  end
+end
+
+ShapeColoring.launch
+```
+
 ## Applications
 
 Here are some applications built with [Glimmer DSL for LibUI](https://rubygems.org/gems/glimmer-dsl-libui)

data/VERSION

@@ -1 +1 @@
-0.5.9
+0.5.10

data/examples/shape_coloring.rb

@@ -0,0 +1,93 @@
+require 'glimmer-dsl-libui'
+
+class ShapeColoring
+  include Glimmer::LibUI::Application
+  
+  COLOR_SELECTION = Glimmer::LibUI.interpret_color(:red)
+  
+  before_body {
+    @shapes = []
+  }
+  
+  body {
+    window('Shape Coloring', 200, 200) {
+      margined false
+      
+      grid {
+        label("Click a shape to select and\nchange color via color button") {
+          left 0
+          top 0
+          hexpand true
+          halign :center
+          vexpand false
+        }
+        
+        color_button { |cb|
+          left 0
+          top 1
+          hexpand true
+          vexpand false
+          
+          on_changed do
+            @selected_shape&.fill = cb.color
+          end
+        }
+      
+        area {
+          left 0
+          top 2
+          hexpand true
+          vexpand true
+          
+          rectangle(0, 0, 600, 400) { # background shape
+            fill :white
+          }
+          
+          @shapes << colorable(:rectangle, 20, 20, 40, 20) { |shape|
+            fill :lime
+          }
+          
+          @shapes << colorable(:square, 80, 20, 20) { |shape|
+            fill :blue
+          }
+          
+          @shapes << colorable(:circle, 75, 70, 20, 20) { |shape|
+            fill :green
+          }
+          
+          @shapes << colorable(:arc, 120, 70, 40, 0, 145) { |shape|
+            fill :orange
+          }
+          
+          @shapes << colorable(:polygon, 120, 10, 120, 50, 150, 10, 150, 50) {
+            fill :cyan
+          }
+          
+          @shapes << colorable(:polybezier, 20, 40,
+                     30, 100, 50, 80, 80, 110,
+                     40, 120, 20, 120, 30, 91) {
+            fill :pink
+          }
+        }
+      }
+    }
+  }
+  
+  def colorable(shape_symbol, *args, &content)
+    send(shape_symbol, *args) do |shape|
+      on_mouse_up do |area_mouse_event|
+        old_stroke = Glimmer::LibUI.interpret_color(shape.stroke).slice(:r, :g, :b)
+        @shapes.each {|sh| sh.stroke = nil}
+        @selected_shape = nil
+        unless old_stroke == COLOR_SELECTION
+          shape.stroke = COLOR_SELECTION.merge(thickness: 2)
+          @selected_shape = shape
+        end
+      end
+      
+      content.call(shape)
+    end
+  end
+end
+
+ShapeColoring.launch

data/lib/glimmer/dsl/libui/listener_expression.rb

@@ -27,7 +27,7 @@ module Glimmer
     module Libui
       class ListenerExpression < Expression
         def can_interpret?(parent, keyword, *args, &block)
-          parent.is_a?(Glimmer::LibUI::ControlProxy) and
+          (parent.is_a?(Glimmer::LibUI::ControlProxy) or parent.is_a?(Glimmer::LibUI::Shape)) and
             block_given? and
             parent.can_handle_listener?(keyword)
         end

data/lib/glimmer/libui/shape.rb

@@ -147,6 +147,16 @@ module Glimmer
       end
       alias transform= transform
       alias set_transform transform
+      
+      def can_handle_listener?(listener_name)
+        area_proxy.can_handle_listener?(listener_name)
+      end
+      
+      def handle_listener(listener_name, &listener)
+        area_proxy.handle_listener(listener_name) do |event|
+          listener.call(event) if include?(event[:x], event[:y])
+        end
+      end
 
       def respond_to?(method_name, *args, &block)
         self.class.parameters.include?(method_name.to_s.sub(/=$/, '').sub(/^set_/, '').to_sym) or

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -355,6 +355,7 @@ files:
 - examples/midi_player.rb
 - examples/midi_player2.rb
 - examples/midi_player3.rb
+- examples/shape_coloring.rb
 - examples/simple_notepad.rb
 - examples/snake.rb
 - examples/snake/model/apple.rb