glimmer-dsl-swt 4.18.5.2 → 4.18.5.3

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

@@ -46,9 +46,55 @@ module Glimmer
             [:x1, :y1, :x2, :y2]
           end
           
+          def location_parameter_names
+            parameter_names
+          end
+          
+          # Logical x coordinate. Always assumes the first point in the line to be the x coordinate.
+          def x
+            x1
+          end
+          
+          # Logical y coordinate. Always assumes the first point in the line to be the y coordinate.
+          def y
+            y1
+          end
+          
+          def absolute_x1
+            if parent.is_a?(Shape)
+              parent.absolute_x + x1
+            else
+              x1
+            end
+          end
+          
+          def absolute_y1
+            if parent.is_a?(Shape)
+              parent.absolute_y + y1
+            else
+              y1
+            end
+          end
+          
+          def absolute_x2
+            if parent.is_a?(Shape)
+              parent.absolute_x + x2
+            else
+              x2
+            end
+          end
+          
+          def absolute_y2
+            if parent.is_a?(Shape)
+              parent.absolute_y + y1
+            else
+              y2
+            end
+          end
+          
           def include?(x, y)
             # TODO must account for line width
-            Line.include?(x1, y1, x2, y2, x, y)
+            Line.include?(absolute_x1, absolute_y1, absolute_x2, absolute_y2, x, y)
           end
           alias contain? include?
             

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

@@ -39,7 +39,7 @@ module Glimmer
           
           # checks if shape contains the point denoted by x and y
           def contain?(x, y)
-            shape_geometry = java.awt.geom.Ellipse2D::Double.new(self.x, self.y, width, height)
+            shape_geometry = java.awt.geom.Ellipse2D::Double.new(self.absolute_x, self.absolute_y, width, height)
             shape_geometry.contains(x, y)
           end
           
@@ -49,8 +49,8 @@ module Glimmer
               contain?(x, y)
             else
               # give it some fuzz to allow a larger region around the drawn oval to accept including a point (helps with mouse clickability on a shape)
-              outer_shape_geometry = java.awt.geom.Ellipse2D::Double.new(self.x - 3, self.y - 3, width + 6, height + 6)
-              inner_shape_geometry = java.awt.geom.Ellipse2D::Double.new(self.x + 3, self.y + 3, width - 6, height - 6)
+              outer_shape_geometry = java.awt.geom.Ellipse2D::Double.new(self.absolute_x - 3, self.absolute_y - 3, width + 6, height + 6)
+              inner_shape_geometry = java.awt.geom.Ellipse2D::Double.new(self.absolute_x + 3, self.absolute_y + 3, width - 6, height - 6)
               outer_shape_geometry.contains(x, y) && !inner_shape_geometry.contains(x, y)
             end
           end

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

@@ -39,14 +39,9 @@ module Glimmer
           
           def include?(x, y)
             # give it some fuzz (helps makes mouse clicking easier)
-            x.to_i.between?(self.x.to_i - 2, self.x.to_i + 2) && y.to_i.between?(self.y.to_i - 2, self.y.to_i + 2)
+            x.to_i.between?(self.absolute_x.to_i - 2, self.absolute_x.to_i + 2) && y.to_i.between?(self.absolute_y.to_i - 2, self.absolute_y.to_i + 2)
           end
           alias contain? include?
-          
-          def move_by(x_delta, y_delta)
-            self.x += x_delta
-            self.y += y_delta
-          end
         end
       end
     end

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

@@ -37,6 +37,10 @@ module Glimmer
             [:point_array]
           end
           
+          def location_parameter_names
+            parameter_names
+          end
+          
           def point_count
             point_array.count / 2
           end
@@ -58,10 +62,47 @@ module Glimmer
             x_array.zip(y_array)
           end
           
+          # Logical x coordinate. Always assumes the first point in the polygon to be the x coordinate.
+          def x
+            x_array.first
+          end
+           
+          # Logical y coordinate. Always assumes the first point in the polygon to be the y coordinate.
+          def y
+            y_array.first
+          end
+          
+          def absolute_point_array
+            if parent.is_a?(Shape)
+              point_array.each_with_index.map do |coordinate, i|
+                if i.even?
+                  parent.absolute_x + coordinate
+                else
+                  parent.absolute_y + coordinate
+                end
+              end
+            else
+              point_array
+            end
+          end
+          
+          def absolute_x_array
+            absolute_point_array.each_with_index.select {|pair| pair.last.even?}.map(&:first)
+          end
+          
+          def absolute_y_array
+            absolute_point_array.each_with_index.select {|pair| pair.last.odd?}.map(&:first)
+          end
+          
+          def absolute_point_xy_array
+            absolute_x_array.zip(absolute_y_array)
+          end
+          
           def include?(x, y)
-            shape_geometry = java.awt.Polygon.new(x_array.to_java(:int), y_array.to_java(:int), point_count)
+            shape_geometry = java.awt.Polygon.new(absolute_x_array.to_java(:int), absolute_y_array.to_java(:int), point_count)
             shape_geometry.contains(x, y)
           end
+          alias contain? include? # TODO make include do an outer/inner check of edge detection only
           
           def move_by(x_delta, y_delta)
             self.point_array = point_array.each_with_index.map {|coordinate, i| i.even? ? coordinate + x_delta : coordinate + y_delta}

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

@@ -37,10 +37,19 @@ module Glimmer
             [:point_array]
           end
           
+          def location_parameter_names
+            parameter_names
+          end
+          
           def point_count
             point_array.count / 2
           end
           
+          def [](index)
+            index = 0 if index == point_count
+            org.eclipse.swt.graphics.Point.new(point_array[index * 2], point_array[index * 2 + 1])
+          end
+          
           def x_array
             point_array.each_with_index.select {|pair| pair.last.even?}.map(&:first)
           end
@@ -53,16 +62,48 @@ module Glimmer
             x_array.zip(y_array)
           end
           
-          def [](index)
-            index = 0 if index == point_count
-            org.eclipse.swt.graphics.Point.new(point_array[index * 2], point_array[index * 2 + 1])
+          # Logical x coordinate. Always assumes the first point in the polyline to be the x coordinate.
+          def x
+            x_array.first
+          end
+           
+          # Logical y coordinate. Always assumes the first point in the polyline to be the y coordinate.
+          def y
+            y_array.first
           end
           
+          def absolute_point_array
+            if parent.is_a?(Shape)
+              point_array.each_with_index.map do |coordinate, i|
+                if i.even?
+                  parent.absolute_x + coordinate
+                else
+                  parent.absolute_y + coordinate
+                end
+              end
+            else
+              point_array
+            end
+          end
+          
+          def absolute_x_array
+            absolute_point_array.each_with_index.select {|pair| pair.last.even?}.map(&:first)
+          end
+          
+          def absolute_y_array
+            absolute_point_array.each_with_index.select {|pair| pair.last.odd?}.map(&:first)
+          end
+          
+          def absolute_point_xy_array
+            absolute_x_array.zip(absolute_y_array)
+          end
+                    
           def include?(x, y)
-            comparison_lines = point_xy_array.zip(point_xy_array.rotate(1))
+            comparison_lines = absolute_point_xy_array.zip(absolute_point_xy_array.rotate(1))
             comparison_lines.pop # ignore last pair since you don't want to compare last point with first point
             comparison_lines.any? {|line| Line.include?(line.first.first, line.first.last, line.last.first, line.last.last, x, y)}
           end
+          alias contain? include?
           
           def move_by(x_delta, y_delta)
             self.point_array = point_array.each_with_index.map {|coordinate, i| i.even? ? coordinate + x_delta : coordinate + y_delta}

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

@@ -84,12 +84,16 @@ module Glimmer
             [[x, y], [x + width, y], [x + width, y + height], [x, y + 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]]
+          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 = point_xy_array.zip(point_xy_array.rotate(1))
+              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

data/lib/glimmer/swt/widget_proxy.rb

@@ -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'
 

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,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 HelloCanvas
   include Glimmer::UI::CustomShell
   
@@ -51,6 +53,18 @@ class HelloCanvas
         }
         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
@@ -67,18 +81,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 {