glimmer-dsl-swt 4.24.0.0 → 4.24.1.0

data/samples/hello/hello_canvas_drag_and_drop.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2007-2022 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 HelloCanvasDragAndDrop
@@ -27,7 +48,9 @@ class HelloCanvasDragAndDrop
         background :white
         
         10.times do |n|
-          an_oval = oval((rand*300).to_i, (rand*200).to_i, 50, 50) {
+          value = rand(10)
+          oval((rand*300).to_i, (rand*200).to_i, 50, 50) {
+            data 'value', value
             background rgb(255, 165, 0)
             
             # declare shape as a drag source, which unlike `drag_and_move true`, it means the shape now
@@ -38,6 +61,12 @@ class HelloCanvasDragAndDrop
             oval(0, 0) {
               foreground :black
             }
+            
+            text {
+              x :default
+              y :default
+              string value.to_s
+            }
           }
         end
                                                           
@@ -70,7 +99,7 @@ class HelloCanvasDragAndDrop
               @number_shape = text {
                 x :default
                 y :default
-                string (ball_count + 1).to_s
+                string (ball_count + drop_event.dragged_shape.get_data('value')).to_s
               }
             }
             drop_event.dragged_shape.dispose

data/samples/hello/hello_canvas_path.rb

@@ -20,101 +20,105 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer-dsl-swt'
-        
-include Glimmer
-  
-shell {
-  grid_layout {
-    margin_width 0
-    margin_height 0
-    margin_top 5
-  }
-  text 'Hello, Canvas Path!'
-  minimum_size 800, 700
-  
-  @button = button {
-    layout_data :center, :center, true, false
-    text 'Regenerate'
-    enabled false
-    
-    on_widget_selected do
-      @regenerate = true
-      @button.enabled = false
-    end
-  }
-  canvas {
-    layout_data :fill, :fill, true, true
-    background :white
-    
-    text('line', 15, 200) {
-      foreground :red
-    }
-    @path1 = path {
-      antialias :on
-      foreground :red
-    }
-    
-    text('quad', 15, 300) {
-      foreground :dark_green
-    }
-    @path2 = path {
-      antialias :on
-      foreground :dark_green
-    }
+
+class HelloCanvasPath
+  include Glimmer::UI::Application
     
-    text('cubic', 15, 400) {
-      foreground :blue
-    }
-    @path3 = path {
-      antialias :on
-      foreground :blue
+  after_body do
+    regenerate
+  end
+  
+  body {
+    shell {
+      grid_layout {
+        margin_width 0
+        margin_height 0
+        margin_top 5
+      }
+      
+      text 'Hello, Canvas Path!'
+      minimum_size 800, 700
+      
+      @button = button {
+        layout_data :center, :center, true, false
+        
+        text 'Regenerate'
+        enabled false
+        
+        on_widget_selected do
+          regenerate
+        end
+      }
+      
+      canvas {
+        layout_data :fill, :fill, true, true
+        background :white
+        
+        text('line', 15, 200) {
+          foreground :red
+        }
+        @path1 = path {
+          antialias :on
+          foreground :red
+        }
+        
+        text('quad', 15, 300) {
+          foreground :dark_green
+        }
+        @path2 = path {
+          antialias :on
+          foreground :dark_green
+        }
+        
+        text('cubic', 15, 400) {
+          foreground :blue
+        }
+        @path3 = path {
+          antialias :on
+          foreground :blue
+        }
+      }
+      
+      on_widget_disposed do
+        # safe to kill thread as data is in memory only, so no risk of data loss
+        @thread.kill
+      end
     }
   }
   
-  on_swt_show do
-    @regenerate = true
+  def regenerate
     @thread = Thread.new do
-      loop do
-        if @regenerate
-          @regenerate = false
-          @path1.clear
-          @path2.clear
-          @path3.clear
-          y1 = y2 = y3 = 300
-          700.times.each do |x|
-            x += 55
-            x1 = x - 2
-            x2 = x - 1
-            x3 = x
-            y1 = y3
-            y2 = y1
-            y3 = [[y3 + (rand*24 - 12), 0].max, 700].min
-            @path1.content {
-              line(x1, y1 - 100)
-            }
-            if x % 2 == 0
-              @path2.content {
-                quad(x1, y1, x2, y2)
-              }
-            end
-            if x % 3 == 0
-              @path3.content {
-                cubic(x1, y1 + 100, x2, y2 + 100, x3, y3 + 100)
-              }
-            end
-            sleep(0.01)
-          end
-          @button.enabled = true
+      @button.enabled = false
+      @path1.clear
+      @path2.clear
+      @path3.clear
+      y1 = y2 = y3 = 300
+      700.times.each do |x|
+        x += 55
+        x1 = x - 2
+        x2 = x - 1
+        x3 = x
+        y1 = y3
+        y2 = y1
+        y3 = [[y3 + (rand*24 - 12), 0].max, 700].min
+        @path1.content {
+          line(x1, y1 - 100)
+        }
+        if x % 2 == 0
+          @path2.content {
+            quad(x1, y1, x2, y2)
+          }
         end
-        sleep(0.1)
+        if x % 3 == 0
+          @path3.content {
+            cubic(x1, y1 + 100, x2, y2 + 100, x3, y3 + 100)
+          }
+        end
+        sleep(0.01)
       end
-            
+      @button.enabled = true
     end
-    
   end
-  
-  on_widget_disposed do
-    @thread.kill # safe to kill since data is in memory only
-  end
-  
-}.open
+end
+        
+HelloCanvasPath.launch

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.24.0.0
+  version: 4.24.1.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-18 00:00:00.000000000 Z
+date: 2022-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -328,6 +328,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.1.cr2
+  name: jruby-openssl
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.1.cr2
 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. It includes SWT 4.22 (released November 24, 2021). Glimmer's