glimmer-dsl-swt 4.18.5.0 → 4.18.5.5

data/lib/glimmer/swt/widget_proxy.rb

@@ -26,7 +26,7 @@ require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/dnd_proxy'
 require 'glimmer/swt/image_proxy'
-require 'glimmer/swt/properties'
+require 'glimmer/swt/proxy_properties'
 require 'glimmer/swt/custom/drawable'
 
 # TODO refactor to make file smaller and extract sub-widget-proxies out of this
@@ -44,13 +44,13 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class WidgetProxy
       include Packages
-      include Properties
+      include ProxyProperties
       include Custom::Drawable
 
       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],
@@ -223,23 +223,11 @@ module Glimmer
           [args, extra_options]
         end
       end
-
-      def has_attribute_getter?(attribute_getter_name, *args)
-        attribute_getter_name = attribute_getter_name.to_s.underscore
-        return false unless !attribute_getter_name.end_with?('=') && !attribute_getter_name.start_with?('set_')
-        auto_exec do
-          args.empty? && swt_widget.respond_to?(attribute_getter_name)
-        end
-      end
       
-      def has_attribute_setter?(attribute_setter_name, *args)
-        attribute_setter_name = attribute_setter_name.to_s
-        underscored_attribute_setter_name = attribute_setter_name.underscore
-        return false unless attribute_setter_name.end_with?('=') || (attribute_setter_name.start_with?('set_') && !args.empty?)
-        attribute_name = underscored_attribute_setter_name.sub(/^set_/, '').sub(/=$/, '')
-        has_attribute?(attribute_name, *args)
+      def proxy_source_object
+        @swt_widget
       end
-      
+
       def has_attribute?(attribute_name, *args)
         # TODO test that attribute getter responds too
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
@@ -247,7 +235,7 @@ module Glimmer
           if widget_custom_attribute
             @swt_widget.respond_to?(widget_custom_attribute[:setter][:name])
           else
-            @swt_widget.respond_to?(attribute_setter(attribute_name), args) || respond_to?(ruby_attribute_setter(attribute_name), args)
+            super
           end
         end
       end
@@ -264,17 +252,9 @@ module Glimmer
           result = if widget_custom_attribute
             swt_widget_operation = true
             widget_custom_attribute[:setter][:invoker].call(@swt_widget, args)
-          elsif @swt_widget.respond_to?(attribute_setter(attribute_name))
-            swt_widget_operation = true
-            @swt_widget.send(attribute_setter(attribute_name), *args) unless @swt_widget.send(attribute_getter(attribute_name)) == args.first
-          elsif @swt_widget.respond_to?(ruby_attribute_setter(attribute_name))
-            swt_widget_operation = true
-            @swt_widget.send(ruby_attribute_setter(attribute_name), args)
           end
         end
-        unless swt_widget_operation
-          result = send(ruby_attribute_setter(attribute_name), args)
-        end
+        result = super unless swt_widget_operation
         result
       end
 
@@ -290,24 +270,9 @@ module Glimmer
             else
               @swt_widget.send(widget_custom_attribute[:getter][:name])
             end
-          elsif @swt_widget.respond_to?(attribute_getter(attribute_name))
-            swt_widget_operation = true
-            @swt_widget.send(attribute_getter(attribute_name))
-          elsif @swt_widget.respond_to?(ruby_attribute_getter(attribute_name))
-            swt_widget_operation = true
-            @swt_widget.send(ruby_attribute_getter(attribute_name))
-          elsif @swt_widget.respond_to?(attribute_name)
-            swt_widget_operation = true
-            @swt_widget.send(attribute_name)
-          end
-        end
-        unless swt_widget_operation
-          result = if respond_to?(ruby_attribute_getter(attribute_name))
-            send(ruby_attribute_getter(attribute_name))
-          else
-            send(attribute_name)
           end
         end
+        result = super unless swt_widget_operation
         result
       end
 
@@ -326,7 +291,25 @@ 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
       def widget_property_listener_installers
         @swt_widget_property_listener_installers ||= {
           Java::OrgEclipseSwtWidgets::Control => {
@@ -734,24 +717,11 @@ module Glimmer
       end
 
       def method_missing(method, *args, &block)
+        # TODO push most of this logic down to Properties (and perhaps create Listeners module as well)
         if can_handle_observation_request?(method)
           handle_observation_request(method, &block)
-        elsif has_attribute_setter?(method, *args)
-          set_attribute(method, *args)
-        elsif has_attribute_getter?(method, *args)
-          get_attribute(method, *args)
         else
-          auto_exec do
-            swt_widget.send(method, *args, &block)
-          end
-        end
-      rescue => e
-        begin
           super
-        rescue Exception => inner_error
-          Glimmer::Config.logger.error { "Neither WidgetProxy nor #{swt_widget.class.name} can handle the method ##{method}" }
-          Glimmer::Config.logger.error { e.full_message }
-          raise inner_error
         end
       end
       
@@ -759,7 +729,7 @@ module Glimmer
         result = super
         return true if result
         auto_exec do
-          can_handle_observation_request?(method) || swt_widget.respond_to?(method, *args, &block)
+          can_handle_observation_request?(method)
         end
       end
       
@@ -946,6 +916,8 @@ module Glimmer
         color_converter = lambda do |value|
           if value.is_a?(Symbol) || value.is_a?(String)
             ColorProxy.new(value).swt_color
+          elsif value.is_a?(RGB)
+            ColorProxy.new(value.red, value.green, value.blue).swt_color
           else
             value
           end
@@ -1015,7 +987,7 @@ module Glimmer
           foreground: color_converter,
           link_foreground: color_converter,
           font: lambda do |value|
-            if value.is_a?(Hash)
+            if value.is_a?(Hash) || value.is_a?(FontData)
               font_properties = value
               FontProxy.new(self, font_properties).swt_font
             else

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'
 

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,87 +19,167 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-include Glimmer
+require 'glimmer-dsl-swt'
 
-image_object = image(File.expand_path('../../icons/scaffold_app.png', __dir__), width: 50)
-
-shell {
-  text 'Hello, Canvas!'
-  minimum_size 320, 400
-
-  @canvas = canvas {
-    background :yellow
-    rectangle(0, 0, 220, 400) {
-      transform {
-      }
-      background :red
-    }
-    rectangle(50, 20, 300, 150, 30, 50) {
-      background :magenta
-    }
-    rectangle(150, 200, 100, 70, true) {
-      background :dark_magenta
-      foreground :yellow
-    }
-    rectangle(50, 200, 30, 70, false) {
-      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)
-    }
-    arc(210, 210, 100, 100, 30, -77) {
-      background :red
-    }
-    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)
+class HelloCanvas
+  include Glimmer::UI::CustomShell
   
-    on_mouse_down { |mouse_event|
-      @drag_detected = false
-      @canvas.cursor = :hand
-      @shape_to_move = @canvas.shape_at_location(mouse_event.x, mouse_event.y)
-    }
-    
-    on_drag_detected { |drag_detect_event|
-      @drag_detected = true
-      @drag_current_x = drag_detect_event.x
-      @drag_current_y = drag_detect_event.y
-    }
-    
-    on_mouse_move { |mouse_event|
-      if @drag_detected
-        @shape_to_move&.move_by(mouse_event.x - @drag_current_x, mouse_event.y - @drag_current_y)
-        @drag_current_x = mouse_event.x
-        @drag_current_y = mouse_event.y
+  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 {
+    shell {
+      text 'Hello, Canvas!'
+      minimum_size 320, 400
     
-    on_mouse_up { |mouse_event|
-      @canvas.cursor = :arrow
-      @drag_detected = false
-      @shape_to_move = nil
+      @canvas = canvas {
+        background :yellow
+        rectangle(0, 0, 220, 400) {
+          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
+          foreground :yellow
+        }
+        rectangle(50, 200, 30, 70, false) {
+          background :magenta
+          foreground :dark_blue
+        }
+        oval(110, 310, 100, 100) {
+          # patterns provide a differnet way to make gradients
+          background_pattern 0, 0, 105, 0, :yellow, rgb(128, 138, 248)
+        }
+        arc(210, 210, 100, 100, 30, -77) {
+          background :red
+        }
+        polygon(250, 210, 260, 170, 270, 210, 290, 230) {
+          background :dark_yellow
+        }
+      
+        menu {
+          menu_item {
+            text 'Change Background Color...'
+            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:background) && shape.background }
+            on_widget_selected {
+              @selected_shape&.background = color_dialog.open
+              self.selected_shape = nil
+            }
+          }
+          menu_item {
+            text 'Change Background Pattern Color 1...'
+            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:background_pattern) && shape.background_pattern }
+            on_widget_selected {
+              if @selected_shape
+                background_pattern_args = @selected_shape.background_pattern_args
+                background_pattern_args[5] = color_dialog.open
+                @selected_shape.background_pattern = background_pattern_args
+                self.selected_shape = nil
+              end
+            }
+          }
+          menu_item {
+            text 'Change Background Pattern Color 2...'
+            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:background_pattern) && shape.background_pattern }
+            on_widget_selected {
+              if @selected_shape
+                background_pattern_args = @selected_shape.background_pattern_args
+                background_pattern_args[6] = color_dialog.open
+                @selected_shape.background_pattern = background_pattern_args
+                self.selected_shape = nil
+              end
+            }
+          }
+          menu_item(:separator)
+          menu_item {
+            text 'Change Foreground Color...'
+            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:foreground) && shape.foreground }
+            on_widget_selected {
+              @selected_shape&.foreground = color_dialog.open
+              self.selected_shape = nil
+            }
+          }
+        }
+      
+        on_mouse_down { |mouse_event|
+          @drag_detected = false
+          @canvas.cursor = :hand
+          self.selected_shape = @canvas.shape_at_location(mouse_event.x, mouse_event.y)
+        }
+        
+        on_drag_detected { |drag_detect_event|
+          @drag_detected = true
+          @drag_current_x = drag_detect_event.x
+          @drag_current_y = drag_detect_event.y
+        }
+        
+        on_mouse_move { |mouse_event|
+          if @drag_detected
+            @selected_shape&.move_by(mouse_event.x - @drag_current_x, mouse_event.y - @drag_current_y)
+            @drag_current_x = mouse_event.x
+            @drag_current_y = mouse_event.y
+          end
+        }
+        
+        on_menu_detected { |menu_detect_event|
+          @menu_detected = true
+        }
+        
+        on_mouse_up { |mouse_event|
+          @canvas.cursor = :arrow
+          @drag_detected = false
+          if @menu_detected
+            @menu_detected = nil
+          else
+            self.selected_shape = nil
+          end
+        }
+      }
     }
   }
-}.open
+end
+
+HelloCanvas.launch
+