glimmer-dsl-swt 4.18.5.3 → 4.18.6.2

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
@@ -81,11 +82,11 @@ module Glimmer
           end
           
           def point_xy_array
-            [[x, y], [x + width, y], [x + width, y + height], [x, y + height]]
+            [[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 + width, absolute_y], [absolute_x + width, absolute_y + height], [absolute_x, absolute_y + height]]
+            [[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)

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

@@ -33,8 +33,6 @@ module Glimmer
       # That is because Shape is drawn on a parent as graphics and doesn't have an SWT widget for itself
       class Shape
         class Text < Shape
-          attr_accessor :extent
-        
           def parameter_names
             @parameter_names || text_parameter_names
           end
@@ -69,11 +67,11 @@ module Glimmer
           end
           
           def width
-            extent&.x
+            @extent&.x
           end
           
           def height
-            extent&.y
+            @extent&.y
           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/samples/elaborate/mandelbrot_fractal.rb

@@ -379,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/stock_ticker.rb

@@ -0,0 +1,220 @@
+# 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 StockTicker
+  class Stock
+    class << self
+      attr_writer :price_min, :price_max
+      
+      def price_min
+        @price_min ||= 1
+      end
+      
+      def price_max
+        @price_max ||= 600
+      end
+    end
+    
+    attr_reader :name, :prices
+    attr_accessor :price
+    
+    def initialize(name, price)
+      @name = name
+      @price = price
+      @prices = [@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
+      prices << self.price = [[@price + @delta_sign*delta, Stock.price_min].max, Stock.price_max].min
+    end
+    
+    def start_new_trend!
+      @trend_length = (rand*12).to_i + 1
+    end
+  end
+  
+  include Glimmer::UI::CustomShell
+  
+  before_body {
+    @stocks = [
+      Stock.new('DELL', 81),
+      Stock.new('AAPL', 121),
+      Stock.new('MSFT', 232),
+      Stock.new('ADBE', 459),
+    ]
+    @stock_colors = [:red, :dark_green, :blue, :dark_magenta]
+    margin = 5
+    @tabs = ['Lines', 'Quadratic Bezier Curves', 'Cubic Bezier Curves', 'Points'].map {|title| {title: title, stock_paths: []}}
+    @stocks.each_with_index do |stock, stock_index|
+      observe(stock, :price) do |new_price|
+        begin
+          @tabs.each do |tab|
+            new_x = stock.prices.count - 1
+            new_y = @tabs.first[:canvas].bounds.height - new_price - 1
+            if new_x > 0
+              case tab[:title]
+              when 'Cubic Bezier Curves'
+                if new_x%3 == 0 && stock.prices[new_x] && stock.prices[new_x - 1] && stock.prices[new_x - 2]
+                  tab[:stock_paths][stock_index].content {
+                    cubic(new_x - 2 + margin, @tabs.first[:canvas].bounds.height - stock.prices[new_x - 2] - 1, new_x - 1 + margin, @tabs.first[:canvas].bounds.height - stock.prices[new_x - 1] - 1, new_x + margin, new_y)
+                  }
+                end
+              when 'Quadratic Bezier Curves'
+                if new_x%2 == 0 && stock.prices[new_x] && stock.prices[new_x - 1]
+                  tab[:stock_paths][stock_index].content {
+                    quad(new_x - 1 + margin, @tabs.first[:canvas].bounds.height - stock.prices[new_x - 1] - 1, new_x + margin, new_y)
+                  }
+                end
+              when 'Lines'
+                tab[:stock_paths][stock_index].content {
+                  line(new_x + margin, new_y)
+                }
+              when 'Points'
+                tab[:stock_paths][stock_index].content {
+                  point(new_x + margin, new_y)
+                }
+              end
+              new_x_location = new_x + 2*margin
+              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_header].content {
+                text(stock.name, 15, new_y - 10) {
+                  foreground @stock_colors[stock_index]
+                  font height: 14
+                }
+              }
+            end
+          end
+        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 'Stock Ticker'
+      minimum_size 650, 650
+      background :white
+      
+      @tab_folder = tab_folder {
+        @tabs.each do |tab|
+          tab_item {
+            grid_layout(2, false) {
+              margin_width 0
+              margin_height 0
+            }
+            text tab[:title]
+            
+            tab[:canvas_header] = canvas {
+              layout_data(:center, :fill, false, true)
+            }
+            tab[:scrolled_composite] = scrolled_composite {
+              layout_data :fill, :fill, true, true
+              tab[:canvas] = canvas {
+                background :white
+                
+                @stocks.count.times do |stock_index|
+                  tab[:stock_paths][stock_index] = path {
+                    antialias :on
+                    foreground @stock_colors[stock_index]
+                  }
+                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.price_min = 25
+        Stock.price_max = @tabs.first[:canvas].bounds.height - 6
+        # pre-initialize all tabs by selecting them so that they render content when they are later in the background
+        @tab_folder.items.each do |item|
+          @tab_folder.selection = item
+        end
+        @tab_folder.selection = @tab_folder.items.first
+      }
+      
+      on_widget_disposed {
+        @thread.kill # safe to kill as data is in memory only
+      }
+    }
+  }
+end
+
+StockTicker.launch
+        

data/samples/hello/hello_canvas.rb

@@ -25,9 +25,20 @@ 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 {
@@ -38,10 +49,36 @@ class HelloCanvas
       @canvas = canvas {
         background :yellow
         rectangle(0, 0, 220, 400) {
-          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,26 +88,6 @@ class HelloCanvas
           background :magenta
           foreground :dark_blue
         }
-        rectangle(205, 50, 88, 96) {
-          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)
-        }
-        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)

data/samples/hello/hello_canvas_data_binding.rb

@@ -0,0 +1,193 @@
+require 'glimmer-dsl-swt'
+
+class HelloCanvasDataBinding
+  include Glimmer::GUI::CustomWindow
+  
+  CANVAS_WIDTH  = 300
+  CANVAS_HEIGHT = 300
+  
+  attr_accessor :x1_value, :y1_value, :x2_value, :y2_value, :foreground_red, :foreground_green, :foreground_blue, :line_width_value, :line_style_value
+  
+  def foreground_value
+    rgb(foreground_red, foreground_green, foreground_blue)
+  end
+  
+  def line_style_value_options
+    [:line_solid, :line_dash, :line_dot, :line_dashdot, :line_dashdotdot]
+  end
+  
+  before_body {
+    self.x1_value = 0
+    self.y1_value = 0
+    self.x2_value = CANVAS_WIDTH
+    self.y2_value = CANVAS_HEIGHT
+    self.foreground_red = 28
+    self.foreground_green = 128
+    self.foreground_blue = 228
+    self.line_width_value = 3
+    self.line_style_value = :line_dot
+  }
+  
+  body {
+    shell {
+      text 'Hello, Canvas Data-Binding!'
+      
+      tab_folder {
+        tab_item {
+          grid_layout(6, true) {
+            margin_width 0
+            margin_height 0
+            horizontal_spacing 0
+            vertical_spacing 0
+          }
+          text 'line'
+          
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            text 'x1'
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            text 'y1'
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            maximum CANVAS_WIDTH
+            increment 3
+            selection bind(self, :x1_value)
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            maximum CANVAS_HEIGHT
+            increment 3
+            selection bind(self, :y1_value)
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            text 'x2'
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            text 'y2'
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            maximum CANVAS_WIDTH
+            increment 3
+            selection bind(self, :x2_value)
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            maximum CANVAS_HEIGHT
+            increment 3
+            selection bind(self, :y2_value)
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 2
+            }
+            text 'foreground red'
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 2
+            }
+            text 'foreground green'
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 2
+            }
+            text 'foreground blue'
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 2
+            }
+            maximum 255
+            increment 10
+            selection bind(self, :foreground_red)
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 2
+            }
+            maximum 255
+            increment 10
+            selection bind(self, :foreground_green)
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 2
+            }
+            maximum 255
+            increment 10
+            selection bind(self, :foreground_blue)
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            text 'line width'
+          }
+          label {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            text 'line style'
+          }
+          spinner {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            maximum 255
+            selection bind(self, :line_width_value)
+          }
+          combo(:read_only) {
+            layout_data(:fill, :center, false, false) {
+              horizontal_span 3
+            }
+            selection bind(self, :line_style_value)
+          }
+          canvas {
+            layout_data(:center, :center, false, false) {
+              horizontal_span 6
+              width_hint CANVAS_WIDTH
+              height_hint CANVAS_WIDTH
+            }
+            background :white
+            
+            line {
+              x1 bind(self, :x1_value)
+              y1 bind(self, :y1_value)
+              x2 bind(self, :x2_value)
+              y2 bind(self, :y2_value)
+              foreground bind(self, :foreground_value, computed_by: [:foreground_red, :foreground_green, :foreground_blue])
+              line_width bind(self, :line_width_value)
+              line_style bind(self, :line_style_value)
+            }
+          }
+        }
+      }
+    }
+  }
+  
+end
+
+HelloCanvasDataBinding.launch