glimmer-dsl-swt 4.18.7.2 → 4.18.7.7

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

@@ -34,13 +34,9 @@ module Glimmer
       class Shape
         class Image < Shape
           def parameter_names
-            if @args.to_a.size > 3
-              image_part_parameter_names
-            else
-              image_whole_parameter_names
-            end
+            @parameter_names || image_whole_parameter_names
           end
-          
+        
           def possible_parameter_names
             (image_part_parameter_names + image_whole_parameter_names).uniq
           end
@@ -53,13 +49,15 @@ module Glimmer
             [:image, :x, :y]
           end
           
-          def parameter_index(attribute_name)
+          def set_parameter_attribute(attribute_name, *args)
+            return super if @parameter_names.to_a.map(&:to_s).include?(attribute_name.to_s)
             ####TODO refactor and improve this method through meta-programming (and share across other shapes)
             if image_part_parameter_names.map(&:to_s).include?(attribute_name.to_s)
-              image_part_parameter_names.map(&:to_s).index(attribute_name.to_s)
+              @parameter_names = image_part_parameter_names
             elsif image_whole_parameter_names.map(&:to_s).include?(attribute_name.to_s)
-              image_whole_parameter_names.map(&:to_s).index(attribute_name.to_s)
+              @parameter_names = image_whole_parameter_names
             end
+            super
           end
           
           def x

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

@@ -112,11 +112,7 @@ module Glimmer
             end
           end
           
-          def calculated_args_changed!(children: true)
-            super
-          end
-          
-          def calculated_args
+          def calculate_args!
             new_swt_path = @swt_path.nil? || !@calculated_paint_args || !@calculated_path_args
             if new_swt_path
               Glimmer::SWT::DisplayProxy.instance.auto_exec do

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

@@ -119,16 +119,28 @@ module Glimmer
           
           # Logical x coordinate relative to parent
           def x
-            x_value = bounds.x
-            x_value -= parent.absolute_x if parent.is_a?(Shape)
-            x_value
+            x_dependencies = [bounds.x, parent.is_a?(Shape) && parent.absolute_x]
+            if x_dependencies != @x_dependencies
+              # avoid recalculating values
+              bounds_x, parent_absolute_x = @x_dependencies = x_dependencies
+              x_value = bounds_x
+              x_value -= parent_absolute_x if parent.is_a?(Shape)
+              @x = x_value
+            end
+            @x
           end
           
           # Logical y coordinate relative to parent
           def y
-            y_value = bounds.y
-            y_value -= parent.absolute_y if parent.is_a?(Shape)
-            y_value
+            y_dependencies = [bounds.y, parent.is_a?(Shape) && parent.absolute_y]
+            if y_dependencies != @y_dependencies
+              # avoid recalculating values
+              bounds_y, parent_absolute_y = @y_dependencies = y_dependencies
+              y_value = bounds_y
+              y_value -= parent_absolute_y if parent.is_a?(Shape)
+              @y = y_value
+            end
+            @y
           end
           
           def width
@@ -144,8 +156,12 @@ module Glimmer
           end
 
           def include?(x, y)
-            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)}
+            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
                     
           def move_by(x_delta, y_delta)

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

@@ -42,19 +42,23 @@ module Glimmer
           end
           
           def point_count
+            point_array = args.size > 1 ? args : self.point_array
             point_array.count / 2
           end
           
           def [](index)
+            point_array = args.size > 1 ? args : self.point_array
             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 = args.size > 1 ? args : self.point_array
             point_array.each_with_index.select {|pair| pair.last.even?}.map(&:first)
           end
           
           def y_array
+            point_array = args.size > 1 ? args : self.point_array
             point_array.each_with_index.select {|pair| pair.last.odd?}.map(&:first)
           end
           
@@ -63,6 +67,7 @@ module Glimmer
           end
           
           def absolute_point_array
+            point_array = args.size > 1 ? args : self.point_array
             if parent.is_a?(Shape)
               point_array.each_with_index.map do |coordinate, i|
                 if i.even?

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

@@ -23,7 +23,6 @@ require 'glimmer/swt/custom/shape'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/color_proxy'
-require 'glimmer/swt/font_proxy'
 require 'glimmer/swt/transform_proxy'
 
 module Glimmer
@@ -34,16 +33,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
-              rectangle_gradient_parameter_names
-            elsif @args.to_a.size == 1
-              rectangle_rectangle_parameter_names
-            else
-              rectangle_parameter_names
-            end
+            @parameter_names || rectangle_parameter_names
           end
           
           def possible_parameter_names
@@ -68,17 +58,18 @@ module Glimmer
             [:rectangle]
           end
           
-          def parameter_index(attribute_name)
-            ####TODO refactor and improve this method through meta-programming (and share across other shapes)
-            if rectangle_round_parameter_names.map(&:to_s).include?(attribute_name.to_s)
-              rectangle_round_parameter_names.map(&:to_s).index(attribute_name.to_s)
+          def set_parameter_attribute(attribute_name, *args)
+            return super if @parameter_names.to_a.map(&:to_s).include?(attribute_name.to_s)
+            if rectangle_parameter_names.map(&:to_s).include?(attribute_name.to_s)
+              @parameter_names = rectangle_parameter_names
+            elsif rectangle_round_parameter_names.map(&:to_s).include?(attribute_name.to_s)
+              @parameter_names = rectangle_round_parameter_names
             elsif rectangle_gradient_parameter_names.map(&:to_s).include?(attribute_name.to_s)
-              rectangle_gradient_parameter_names.map(&:to_s).index(attribute_name.to_s)
-            elsif rectangle_parameter_names.map(&:to_s).include?(attribute_name.to_s)
-              rectangle_parameter_names.map(&:to_s).index(attribute_name.to_s)
+              @parameter_names = rectangle_gradient_parameter_names
             elsif rectangle_rectangle_parameter_names.map(&:to_s).include?(attribute_name.to_s)
-              rectangle_rectangle_parameter_names.map(&:to_s).index(attribute_name.to_s)
+              @parameter_names = rectangle_rectangle_parameter_names
             end
+            super
           end
           
           def point_xy_array

data/lib/glimmer/swt/image_proxy.rb

@@ -57,7 +57,7 @@ module Glimmer
       include_package 'org.eclipse.swt.widgets'
       include_package 'org.eclipse.swt.graphics'
       
-      attr_reader :file_path, :jar_file_path, :image_data, :swt_image
+      attr_reader :file_path, :jar_file_path, :image_data, :swt_image, :parent_proxy, :parent
       
       # Initializes a proxy for an SWT Image object
       #
@@ -141,6 +141,10 @@ module Glimmer
         self
       end
       
+      def size
+        org.eclipse.swt.graphics.Point.new(bounds.width, bounds.height)
+      end
+      
       def gc
         @gc ||= reset_gc
       end

data/samples/elaborate/tetris.rb

@@ -156,21 +156,7 @@ class Tetris
           color = colored ? color(([:white] + Model::Tetromino::LETTER_COLORS.values).sample) : color(:white)
           x = column * icon_block_size
           y = row * icon_block_size
-          rectangle(x, y, icon_block_size, icon_block_size) {
-            background color
-          }
-          polygon(x, y, x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size) {
-            background rgb(color.red + 4*BEVEL_CONSTANT, color.green + 4*BEVEL_CONSTANT, color.blue + 4*BEVEL_CONSTANT)
-          }
-          polygon(x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size, y + icon_block_size) {
-            background rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
-          }
-          polygon(x + icon_block_size, y + icon_block_size, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size) {
-            background rgb(color.red - 2*BEVEL_CONSTANT, color.green - 2*BEVEL_CONSTANT, color.blue - 2*BEVEL_CONSTANT)
-          }
-          polygon(x, y, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size) {
-            background rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
-          }
+          bevel(x: x, y: y, base_color: color, size: icon_block_size)
         }
       }
     }

data/samples/elaborate/tetris/model/game.rb

@@ -33,6 +33,8 @@ class Tetris
     class Game
       PLAYFIELD_WIDTH = 10
       PLAYFIELD_HEIGHT = 20
+#       PLAYFIELD_WIDTH = 5
+#       PLAYFIELD_HEIGHT = 5
       PREVIEW_PLAYFIELD_WIDTH = 4
       PREVIEW_PLAYFIELD_HEIGHT = 2
       SCORE_MULTIPLIER = {1 => 40, 2 => 100, 3 => 300, 4 => 1200}
@@ -199,6 +201,7 @@ class Tetris
       
       def delay
         [1.1 - (level.to_i * 0.1), 0.001].max
+#         99999
       end
       
       def beep

data/samples/elaborate/tetris/view/bevel.rb

@@ -0,0 +1,81 @@
+# 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.
+
+# Creates a class-based custom shape representing the `bevel` keyword by convention
+class Tetris
+  module View
+    class Bevel
+      include Glimmer::UI::CustomShape
+      
+      options :base_color, :size, :bevel_pixel_size
+      option :x, default: 0
+      option :y, default: 0
+      
+      before_body {
+        self.bevel_pixel_size = 0.16*size.to_f if bevel_pixel_size.nil?
+      }
+      
+      body {
+        rectangle(x, y, size, size) {
+          background bind(self, :base_color)
+          polygon(0, 0, size, 0, size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size, bevel_pixel_size) {
+            background bind(self, :base_color) { |color_value|
+              unless color_value.nil?
+                color = color(color_value)
+                rgb(color.red + 4*BEVEL_CONSTANT, color.green + 4*BEVEL_CONSTANT, color.blue + 4*BEVEL_CONSTANT)
+              end
+            }
+          }
+          polygon(size, 0, size - bevel_pixel_size, bevel_pixel_size, size - bevel_pixel_size, size - bevel_pixel_size, size, size) {
+            background bind(self, :base_color) { |color_value|
+              unless color_value.nil?
+                color = color(color_value)
+                rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
+              end
+            }
+          }
+          polygon(size, size, 0, size, bevel_pixel_size, size - bevel_pixel_size, size - bevel_pixel_size, size - bevel_pixel_size) {
+            background bind(self, :base_color) { |color_value|
+              unless color_value.nil?
+                color = color(color_value)
+                rgb(color.red - 2*BEVEL_CONSTANT, color.green - 2*BEVEL_CONSTANT, color.blue - 2*BEVEL_CONSTANT)
+              end
+            }
+          }
+          polygon(0, 0, 0, size, bevel_pixel_size, size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size) {
+            background bind(self, :base_color) { |color_value|
+              unless color_value.nil?
+                color = color(color_value)
+                rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
+              end
+            }
+          }
+          rectangle(0, 0, size, size) {
+            foreground bind(self, :base_color) { |color_value|
+              # use gray instead of white for the border
+              color_value == Model::Block::COLOR_CLEAR ? :gray : color_value
+            }
+          }
+        }
+      }
+    end
+  end
+end

data/samples/elaborate/tetris/view/block.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_relative 'bevel'
+
 class Tetris
   module View
     class Block
@@ -27,36 +29,9 @@ class Tetris
       options :game_playfield, :block_size, :row, :column
   
       body {
-        canvas {
-          background bind(game_playfield[row][column], :color)
-          polygon(0, 0, block_size, 0, block_size - 4, 4, 4, 4) {
-            background bind(game_playfield[row][column], :color) { |color_value|
-              color = color(color_value)
-              rgb(color.red + 4*BEVEL_CONSTANT, color.green + 4*BEVEL_CONSTANT, color.blue + 4*BEVEL_CONSTANT)
-            }
-          }
-          polygon(block_size, 0, block_size - 4, 4, block_size - 4, block_size - 4, block_size, block_size) {
-            background bind(game_playfield[row][column], :color) { |color_value|
-              color = color(color_value)
-              rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
-            }
-          }
-          polygon(block_size, block_size, 0, block_size, 4, block_size - 4, block_size - 4, block_size - 4) {
-            background bind(game_playfield[row][column], :color) { |color_value|
-              color = color(color_value)
-              rgb(color.red - 2*BEVEL_CONSTANT, color.green - 2*BEVEL_CONSTANT, color.blue - 2*BEVEL_CONSTANT)
-            }
-          }
-          polygon(0, 0, 0, block_size, 4, block_size - 4, 4, 4) {
-            background bind(game_playfield[row][column], :color) { |color_value|
-              color = color(color_value)
-              rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
-            }
-          }
-          rectangle(0, 0, block_size, block_size) {
-            foreground bind(game_playfield[row][column], :color) { |color_value|
-              color_value == Model::Block::COLOR_CLEAR ? :gray : color_value
-            }
+        canvas { |canvas_proxy|
+          bevel(size: block_size) {
+            base_color bind(game_playfield[row][column], :color)
           }
         }
       }

data/samples/hello/hello_code_text.rb

@@ -21,86 +21,154 @@
 
 require 'glimmer-dsl-swt'
 
-include Glimmer
-
-shell {
-  minimum_size 640, 480
-  text 'Hello, Code Text!'
+class HelloCodeText
+  include Glimmer::UI::CustomShell
   
-  tab_folder {
-    tab_item {
-      fill_layout
-      text 'Ruby (glimmer theme)'
-      code_text(language: 'ruby', theme: 'glimmer', lines: true) {
-        text <<~CODE
-          greeting = 'Hello, World!'
-          
-          include Glimmer
-          
-          shell {
-            text 'Glimmer'
-            
-            label {
-              text greeting
-              font height: 30, style: :bold
-            }
-          }.open
-        CODE
+  attr_accessor :ruby_code, :js_code, :html_code
+  
+  before_body {
+    self.ruby_code = <<~RUBY
+      greeting = 'Hello, World!'
+      
+      include Glimmer
+      
+      shell {
+        text 'Glimmer'
+        
+        label {
+          text greeting
+          font height: 30, style: :bold
+        }
+      }.open
+    RUBY
+    
+    self.js_code = <<~JS
+      function greet(greeting) {
+        alert(greeting);
       }
-    }
-    tab_item {
-      fill_layout
-      text 'JavaScript (pastie theme)'
-      # No border (SWT styles are passed explicitly)
-      code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'pastie', lines: {width: 2}) {
-        # With lines, the custom widget has a root composite, which can be configured separately
-        root {
-          grid_layout(2, false) {
-            margin_width 2
+      
+      var greetingString = 'Hello, World!';
+      
+      greet(greetingString);
+      
+      var moreGreetings = ['Howdy!', 'Aloha!', 'Hey!']
+      
+      for(var greeting of moreGreetings) {
+        greet(greeting)
+      }
+    JS
+    
+    self.html_code = <<~HTML
+      <html>
+        <body>
+          <section class="accordion">
+            <form method="post" id="name">
+              <label for="name">
+                Name
+              </label>
+              <input name="name" type="text" />
+              <input type="submit" />
+            </form>
+          </section>
+        </body>
+      </html>
+    HTML
+  }
+  
+  body {
+    shell {
+      minimum_size 640, 480
+      text 'Hello, Code Text!'
+      
+      tab_folder {
+        tab_item {
+          fill_layout
+          text 'Ruby (glimmer)'
+          code_text(language: 'ruby', theme: 'glimmer', lines: true) {
+            text bind(self, :ruby_code)
           }
-          background :white
         }
-        # With lines, the line numbers widget can be configured separately
-        line_numbers {
-          background :white
+        tab_item {
+          fill_layout
+          text 'Ruby (pastie)'
+          code_text(language: 'ruby', theme: 'pastie', lines: {width: 2}) {
+            text bind(self, :ruby_code)
+          }
         }
-        text <<~CODE
-          function greet(greeting) {
-            alert(greeting);
+        tab_item {
+          fill_layout
+          text 'Ruby (github)'
+          code_text(language: 'ruby', theme: 'github', lines: false) {
+            text bind(self, :ruby_code)
           }
-          
-          var greetingString = 'Hello, World!';
-          
-          greet(greetingString);
-          
-          var moreGreetings = ['Howdy!', 'Aloha!', 'Hey!']
-          
-          for(var greeting of moreGreetings) {
-            greet(greeting)
+        }
+        tab_item {
+          fill_layout
+          text 'JavaScript (glimmer)'
+          # No border (SWT styles are passed explicitly)
+          code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'glimmer', lines: true) {
+            # With lines, the custom widget has a root composite, which can be configured separately
+            root {
+              grid_layout(2, false) {
+                margin_width 2
+              }
+              background :white
+            }
+            # With lines, the line numbers widget can be configured separately
+            line_numbers {
+              background :white
+            }
+            text bind(self, :js_code)
           }
-        CODE
-      }
-    }
-    tab_item {
-      fill_layout
-      text 'HTML (github theme)'
-      code_text(language: 'html', theme: 'github') {
-        text <<~CODE
-          <html>
-            <body>
-              <section class="accordion">
-                <form method="post" id="name">
-                  <label for="name">
-                    Name
-                  </label>
-                  <input name="name" type="text" />
-                  <input type="submit" />
-                </form>
-              </section>
-            </body>
-          </html>
-        CODE
+        }
+        tab_item {
+          fill_layout
+          text 'JavaScript (pastie)'
+          code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'pastie', lines: {width: 2}) {
+            root {
+              grid_layout(2, false) {
+                margin_width 2
+              }
+              background :white
+            }
+            line_numbers {
+              background :white
+            }
+            text bind(self, :js_code)
+          }
+        }
+        tab_item {
+          fill_layout
+          text 'JavaScript (github)'
+          code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'github') { # default is lines: false
+            text bind(self, :js_code)
+          }
+        }
+        tab_item {
+          fill_layout
+          text 'HTML (glimmer)'
+          code_text(language: 'html', theme: 'glimmer', lines: true) {
+            text bind(self, :html_code)
+          }
+        }
+        tab_item {
+          fill_layout
+          text 'HTML (pastie)'
+          code_text(language: 'html', theme: 'pastie', lines: {width: 2}) {
+            text bind(self, :html_code)
+          }
+        }
+        tab_item {
+          fill_layout
+          text 'HTML (github)'
+          code_text(language: 'html', theme: 'github') { # default is lines: false
+            text bind(self, :html_code)
+          }
+        }
       }
     }
   }
-}.open
+  
+end
+
+HelloCodeText.launch