glimmer-dsl-swt 4.18.5.1 → 4.18.6.0

data/lib/glimmer/swt/custom/shape/rectangle.rb

@@ -34,6 +34,7 @@ module Glimmer
       class Shape
         class Rectangle < Shape
           def parameter_names
+            # TODO consider optimizing just like text where it is set upon updating attribute and here you just return a variable
             if @args.to_a.size >= 6
               rectangle_round_parameter_names
             elsif @args.to_a.size == 5
@@ -80,6 +81,24 @@ module Glimmer
             end
           end
           
+          def point_xy_array
+            [[x, y], [x + calculated_width, y], [x + calculated_width, y + calculated_height], [x, y + calculated_height]]
+          end
+          
+          def absolute_point_xy_array
+            [[absolute_x, absolute_y], [absolute_x + calculated_width, absolute_y], [absolute_x + calculated_width, absolute_y + calculated_height], [absolute_x, absolute_y + calculated_height]]
+          end
+          
+          # checks if drawn or filled rectangle includes the point denoted by x and y (if drawn, it only returns true if point lies on the edge)
+          def include?(x, y)
+            if filled?
+              contain?(x, y)
+            else
+              comparison_lines = absolute_point_xy_array.zip(absolute_point_xy_array.rotate(1))
+              comparison_lines.any? {|line| Line.include?(line.first.first, line.first.last, line.last.first, line.last.last, x, y)}
+            end
+          end
+          
         end
       end
     end

data/lib/glimmer/swt/custom/shape/text.rb

@@ -43,15 +43,15 @@ module Glimmer
           end
           
           def text_parameter_names
-            [:text, :x, :y]
+            [:string, :x, :y]
           end
           
           def text_transparent_parameter_names
-            [:text, :x, :y, :is_transparent]
+            [:string, :x, :y, :is_transparent]
           end
           
           def text_flags_parameter_names
-            [:text, :x, :y, :flags]
+            [:string, :x, :y, :flags]
           end
           
           def set_parameter_attribute(attribute_name, *args)
@@ -66,7 +66,17 @@ module Glimmer
             super
           end
           
+          def width
+            @extent&.x
+          end
+          
+          def height
+            @extent&.y
+          end
+          
         end
+        
+        String = Text
       end
     end
   end

data/lib/glimmer/swt/dialog_proxy.rb

@@ -52,6 +52,10 @@ module Glimmer
         def dialog_class(keyword)
           the_class = eval(keyword.camelcase(:upper))
           the_class if the_class.ancestors.include?(org.eclipse.swt.widgets.Dialog)
+        rescue => e
+          Glimmer::Config.logger.debug {"Dialog for keyword #{keyword} not found!"}
+          Glimmer::Config.logger.debug { e.full_message }
+          nil
         end
       end
 

data/lib/glimmer/swt/proxy_properties.rb

@@ -73,7 +73,7 @@ module Glimmer
         Glimmer::SWT::DisplayProxy.instance.auto_exec do
           result = if proxy_source_object&.respond_to?(attribute_setter(attribute_name))
             swt_widget_operation = true
-            proxy_source_object&.send(attribute_setter(attribute_name), *args) unless proxy_source_object&.send(attribute_getter(attribute_name)) == args.first
+            proxy_source_object&.send(attribute_setter(attribute_name), *args) unless (proxy_source_object&.respond_to?(attribute_getter(attribute_name)) && proxy_source_object&.send(attribute_getter(attribute_name))) == args.first
           elsif proxy_source_object&.respond_to?(ruby_attribute_setter(attribute_name))
             swt_widget_operation = true
             proxy_source_object&.send(ruby_attribute_setter(attribute_name), args)

data/lib/glimmer/swt/transform_proxy.rb

@@ -20,7 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/swt/display_proxy'
-require 'glimmer/swt/properties'
+require 'glimmer/swt/proxy_properties'
 require 'glimmer/swt/custom/shape'
 
 module Glimmer
@@ -29,7 +29,7 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class TransformProxy
-      include Properties
+      include ProxyProperties
       
       include_package 'org.eclipse.swt.graphics'
       include_package 'org.eclipse.swt.widgets'
@@ -80,12 +80,28 @@ module Glimmer
         @swt_transform
       end
       
+      def has_attribute?(attribute_name, *args)
+        Glimmer::SWT::DisplayProxy.instance.auto_exec { @swt_transform.respond_to?(attribute_name) } || super
+      end
+
+      def set_attribute(attribute_name, *args)
+        if @swt_transform.respond_to?(attribute_name)
+          Glimmer::SWT::DisplayProxy.instance.auto_exec { @swt_transform.send(attribute_name, *args) }
+        else
+          super
+        end
+      end
+      
       def method_missing(method_name, *args, &block)
         result = Glimmer::SWT::DisplayProxy.instance.auto_exec { @swt_transform.send(method_name, *args, &block) }
         result.nil? ? self : result
       rescue => e
-        Glimmer::Config.logger.debug {"Neither MessageBoxProxy nor #{@swt_transform.class.name} can handle the method ##{method}"}
-        super
+        begin
+          super
+        rescue Exception => inner_e
+          Glimmer::Config.logger.error {"Neither TransformProxy nor #{@swt_transform.class.name} can handle the method ##{method}"}
+          Glimmer::Config.logger.error {e.full_message}
+        end
       end
       
       def respond_to?(method, *args, &block)

data/lib/glimmer/swt/widget_proxy.rb

@@ -50,7 +50,7 @@ module Glimmer
       DEFAULT_STYLES = {
         'arrow'               => [:arrow],
         'button'              => [:push],
-        'canvas'              => ([:double_buffered] if OS.windows?),
+        'canvas'              => ([:double_buffered] unless OS.mac?),
         'checkbox'            => [:check],
         'check'               => [:check],
         'drag_source'         => [:drop_copy],
@@ -291,6 +291,22 @@ module Glimmer
           @swt_widget.removeControlListener(listener.swt_listener)
         end
       end
+      
+      def x
+        bounds.x
+      end
+
+      def y
+        bounds.y
+      end
+      
+      def width
+        bounds.width
+      end
+
+      def height
+        bounds.height
+      end
 
       # these work in tandem with the property_type_converters
       # sometimes, they are specified in subclasses instead

data/samples/elaborate/contact_manager.rb

@@ -19,6 +19,8 @@
 # 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_relative "contact_manager/contact_manager_presenter"
 
 class ContactManager

data/samples/elaborate/login.rb

@@ -19,6 +19,8 @@
 # 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 LoginPresenter
 
   attr_accessor :user_name

data/samples/elaborate/mandelbrot_fractal.rb

@@ -19,6 +19,7 @@
 # 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 'complex'
 require 'concurrent-ruby'
 
@@ -378,7 +379,7 @@ class MandelbrotFractal
       image @mandelbrot_image
     }
     @canvas.set_size @mandelbrot_image.bounds.width, @mandelbrot_image.bounds.height
-    @scrolled_composite.swt_widget.set_min_size(Point.new(@mandelbrot_image.bounds.width, @mandelbrot_image.bounds.height))
+    @scrolled_composite.set_min_size(Point.new(@mandelbrot_image.bounds.width, @mandelbrot_image.bounds.height))
     if @location_x && @location_y
       # center on mouse click location
       factor = (zoom / last_zoom)

data/samples/elaborate/meta_sample.rb

@@ -19,6 +19,7 @@
 # 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 'fileutils'
 
 class Sample

data/samples/elaborate/tetris.rb

@@ -19,7 +19,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# Tetris App View Custom Shell (represents `tetris` keyword)
+require 'glimmer-dsl-swt'
 
 require_relative 'tetris/model/game'
 
@@ -28,6 +28,7 @@ require_relative 'tetris/view/score_lane'
 require_relative 'tetris/view/high_score_dialog'
 require_relative 'tetris/view/tetris_menu_bar'
 
+# Tetris App View Custom Shell (represents `tetris` keyword)
 class Tetris
   include Glimmer::UI::CustomShell
   

data/samples/elaborate/tic_tac_toe.rb

@@ -19,6 +19,8 @@
 # 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_relative "tic_tac_toe/board"
 
 class TicTacToe

data/samples/elaborate/user_profile.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -19,6 +19,8 @@
 # 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'
+
 include Glimmer
 
 shell {
@@ -32,21 +34,21 @@ shell {
       grid_layout 2, false
       layout_data :fill, :fill, true, true
       label {text "First"}; text {text "Bullet"}
-      label {text "Last"}; text {text "Tooth"}  
+      label {text "Last"}; text {text "Tooth"}
     }
 
     group {
       layout_data :fill, :fill, true, true
       text "Gender"
       radio {text "Male"; selection true}
-      radio {text "Female"}  
+      radio {text "Female"}
     }
 
     group {
       layout_data :fill, :fill, true, true
       text "Role"
       check {text "Student"; selection true}
-      check {text "Employee"; selection true}  
+      check {text "Employee"; selection true}
     }
 
     group {
@@ -59,11 +61,11 @@ shell {
     button {
       text "save"
       layout_data :right, :center, true, true
-      on_widget_selected { 
+      on_widget_selected {
         message_box {
           text 'Profile Saved!'
           message 'User profile has been saved!'
-        }.open 
+        }.open
       }
     }
 

data/samples/hello/hello_browser.rb

@@ -19,6 +19,8 @@
 # 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'
+
 include Glimmer
 
 shell {

data/samples/hello/hello_button.rb

@@ -19,6 +19,8 @@
 # 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 HelloButton
   include Glimmer::UI::CustomShell
   

data/samples/hello/hello_canvas.rb

@@ -19,13 +19,26 @@
 # 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 HelloCanvas
   include Glimmer::UI::CustomShell
   
   attr_accessor :selected_shape
+  attr_accessor :artist
   
   before_body {
     @image_object = image(File.expand_path('../../icons/scaffold_app.png', __dir__), width: 50)
+    @artist = ''
+  }
+  
+  after_body {
+    Thread.new {
+      'Picasso'.chars.each do |character|
+        sleep(1)
+        self.artist += character
+      end
+    }
   }
   
   body {
@@ -36,12 +49,36 @@ class HelloCanvas
       @canvas = canvas {
         background :yellow
         rectangle(0, 0, 220, 400) {
-          transform {
-          }
-          background :red
+          background rgb(255, 0, 0)
         }
         rectangle(50, 20, 300, 150, 30, 50) {
           background :magenta
+          rectangle([:default, -70], :default, :default, [:default, 1]) {
+            foreground :cyan
+            text {
+              string bind(self, :artist)
+              x :default, 1 # add 1 pixel to default x (shape centered within parent horizontally)
+              y :default, 1 # add 1 pixel to default y (shape centered within parent vertically)
+              background :yellow
+              foreground :dark_magenta
+              font name: 'Courier', height: 30
+            }
+          }
+          rectangle(155, 30) { # width and height are assumed to be the default (calculated from children)
+            foreground :yellow
+            3.times { |n|
+              line(45, 70 + n*10, 65 + n*10, 30 + n*10) {
+                foreground :yellow
+              }
+            }
+            10.times {|n|
+              point(15 + n*5, 50 + n*5) {
+                foreground :yellow
+              }
+            }
+            polyline(45, 60, 55, 20, 65, 60, 85, 80, 45, 60)
+            image(@image_object, 0, 5)
+          }
         }
         rectangle(150, 200, 100, 70, true) {
           background :dark_magenta
@@ -51,14 +88,6 @@ class HelloCanvas
           background :magenta
           foreground :dark_blue
         }
-        rectangle(205, 50, 88, 96) {
-          foreground :yellow
-        }
-        text('Picasso', 60, 80) {
-          background :yellow
-          foreground :dark_magenta
-          font name: 'Courier', height: 30
-        }
         oval(110, 310, 100, 100) {
           # patterns provide a differnet way to make gradients
           background_pattern 0, 0, 105, 0, :yellow, rgb(128, 138, 248)
@@ -69,18 +98,6 @@ class HelloCanvas
         polygon(250, 210, 260, 170, 270, 210, 290, 230) {
           background :dark_yellow
         }
-        polyline(250, 110, 260, 70, 270, 110, 290, 130, 250, 110)
-        3.times { |n|
-          line(250, 120 + n*10, 270 + n*10, 80 + n*10) {
-            foreground :yellow
-          }
-        }
-        10.times {|n|
-          point(220 + n*5, 100 + n*5) {
-            foreground :yellow
-          }
-        }
-        image(@image_object, 205, 55)
       
         menu {
           menu_item {

data/samples/hello/hello_canvas_animation.rb

@@ -19,6 +19,8 @@
 # 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'
+
 include Glimmer
 
 shell {

data/samples/hello/hello_canvas_path.rb

@@ -0,0 +1,223 @@
+# 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'
+
+# This Sample is an Early Alpha (New Canvas Path DSL Feature)
+
+class HelloCanvasPath
+  class Stock
+    class << self
+      attr_writer :stock_price_min, :stock_price_max
+      
+      def stock_price_min
+        @stock_price_min ||= 1
+      end
+      
+      def stock_price_max
+        @stock_price_max ||= 600
+      end
+    end
+    
+    attr_reader :name, :stock_prices
+    attr_accessor :stock_price
+    
+    def initialize(name, stock_price)
+      @name = name
+      @stock_price = stock_price
+      @stock_prices = [@stock_price]
+      @delta_sign = 1
+      start_new_trend!
+    end
+    
+    def tick!
+      @tick_count = @tick_count.to_i + 1
+      delta = @tick_count%@trend_length
+      if delta == 0
+        @delta_sign *= -1
+        start_new_trend!
+      end
+      stock_prices << self.stock_price = [[@stock_price + @delta_sign*delta, Stock.stock_price_min].max, Stock.stock_price_max].min
+    end
+    
+    def start_new_trend!
+      @trend_length = (rand*25).to_i + 1
+    end
+  end
+  
+  include Glimmer::UI::CustomShell
+  
+  before_body {
+    @stocks = [
+      Stock.new('AAPL', 121),
+      Stock.new('MSFT', 232),
+    ]
+    @stock_colors = [:red, :dark_green, :blue, :magenta]
+    max_stock_name_width = 0
+    left_margin = 5
+    @tabs = ['Cubic Bezier Curves', 'Quadratic Bezier Curves', 'Lines', 'Points'].map {|title| {title: title, paths: [], transforms: []}}
+    @stocks.each_with_index do |stock, i|
+      x = 0
+      observe(stock, :stock_price) do |new_price|
+        begin
+          @tabs.each do |tab|
+            new_x = x
+            new_y = @tabs.first[:canvas].bounds.height - new_price - 1
+            max_stock_name_width = tab[:text]&.bounds&.width if tab[:text]&.bounds&.width.to_f > max_stock_name_width
+            if new_x > 0
+              case tab[:title]
+              when 'Cubic Bezier Curves'
+                if stock.stock_prices[i] && stock.stock_prices[i - 1] && stock.stock_prices[i - 2]
+                  tab[:paths][i].content {
+                    cubic(new_x - 2, @tabs.first[:canvas].bounds.height - stock.stock_prices[i - 2] - 1, new_x - 1, @tabs.first[:canvas].bounds.height - stock.stock_prices[i - 1] - 1, new_x, new_y)
+                    tab[:transforms][i] ||= transform {
+                      translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
+                    }
+                  }
+                end
+              when 'Quadratic Bezier Curves'
+                if stock.stock_prices[i] && stock.stock_prices[i - 1]
+                  tab[:paths][i].content {
+                    quad(new_x - 1, @tabs.first[:canvas].bounds.height - stock.stock_prices[i - 1] - 1, new_x, new_y)
+                    tab[:transforms][i] ||= transform {
+                      translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
+                    }
+                  }
+                end
+              when 'Lines'
+                tab[:paths][i].content {
+                  line(new_x, new_y)
+                  tab[:transforms][i] ||= transform {
+                    translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
+                  }
+                }
+              when 'Points'
+                tab[:paths][i].content {
+                  point(new_x, new_y)
+                  tab[:transforms][i] ||= transform {
+                    translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
+                  }
+                }
+              end
+              new_x_location = new_x + max_stock_name_width + 5 + left_margin + 5
+              canvas_width = tab[:canvas].bounds.width
+              if new_x_location > canvas_width
+                tab[:canvas].set_size(new_x_location, @tabs.first[:canvas].bounds.height)
+                tab[:canvas].cursor = :hand
+                tab[:scrolled_composite].set_min_size(new_x_location, @tabs.first[:canvas].bounds.height)
+                tab[:scrolled_composite].set_origin(tab[:scrolled_composite].origin.x + 1, tab[:scrolled_composite].origin.y) if (tab[:scrolled_composite].origin.x + tab[:scrolled_composite].client_area.width) == canvas_width
+              end
+            else
+              tab[:canvas].content {
+                tab[:text] = text(stock.name, new_x + left_margin, new_y) {
+                  foreground @stock_colors[i]
+                }
+              }
+            end
+          end
+          x += 1
+        rescue => e
+          Glimmer::Config.logger.error {e.full_message}
+        end
+      end
+    end
+  }
+  
+  after_body {
+    @thread = Thread.new {
+      loop {
+        @stocks.each(&:tick!)
+        sleep(0.01)
+      }
+    }
+  }
+  
+  body {
+    shell {
+      fill_layout {
+        margin_width 15
+        margin_height 15
+      }
+      text 'Hello, Canvas Path!'
+      minimum_size 650, 650
+      background :white
+      
+      tab_folder {
+        @tabs.each do |tab|
+          tab_item {
+            fill_layout {
+              margin_width 0
+              margin_height 0
+            }
+            text tab[:title]
+            
+            tab[:scrolled_composite] = scrolled_composite {
+              tab[:canvas] = canvas {
+                background :white
+                
+                @stocks.count.times do |n|
+                  tab[:paths][n] = path {
+                    foreground @stock_colors[n]
+                  }
+                end
+                
+                on_mouse_down {
+                  @drag_detected = false
+                }
+                
+                on_drag_detected { |drag_detect_event|
+                  @drag_detected = true
+                  @drag_start_x = drag_detect_event.x
+                  @drag_start_y = drag_detect_event.y
+                }
+                
+                on_mouse_move { |mouse_event|
+                  if @drag_detected
+                    origin = tab[:scrolled_composite].origin
+                    new_x = origin.x - (mouse_event.x - @drag_start_x)
+                    new_y = origin.y - (mouse_event.y - @drag_start_y)
+                    tab[:scrolled_composite].set_origin(new_x, new_y)
+                  end
+                }
+                
+                on_mouse_up { |mouse_event|
+                  @drag_detected = false
+                }
+              }
+            }
+          }
+        end
+      }
+    
+      on_swt_show {
+        Stock.stock_price_min = 25
+        Stock.stock_price_max = @tabs.first[:canvas].bounds.height - 6
+      }
+      
+      on_widget_disposed {
+        @thread.kill # safe to kill as memory is in data only
+      }
+    }
+  }
+end
+
+HelloCanvasPath.launch
+