glimmer-dsl-opal 0.26.3 → 0.28.2

data/lib/glimmer/swt/image_proxy.rb

@@ -0,0 +1,29 @@
+module Glimmer
+  module SWT
+    # emulating org.eclipse.swt.graphics.Image
+    class ImageProxy
+      class << self
+        def create(*args, &content)
+          if args.size == 1 && args.first.is_a?(ImageProxy)
+            args.first
+          else
+            new(*args, &content)
+          end
+        end
+      end
+    
+      attr_reader :file_path, :width, :height
+      
+      def initialize(*args)
+        options = args.last.is_a?(Hash) ? args.last : {}
+        # TODO support a parent as a first argument before the file path
+        @file_path = args.first
+        @width = options[:width]
+        @height = options[:height]
+      end
+      
+      # TODO implement scale_to
+    end
+    # TODO alias as org.eclipse.swt.graphics.Image
+  end
+end

data/lib/glimmer/swt/point.rb

@@ -1,5 +1,7 @@
 module Glimmer
   module SWT
+    # emulating org.eclipse.swt.graphics.Point
     Point = Struct.new(:x, :y)
+    # TODO alias as org.eclipse.swt.graphics.Point
   end
 end

data/lib/glimmer/swt/rectangle.rb

@@ -0,0 +1,7 @@
+module Glimmer
+  module SWT
+    # emulating org.eclipse.swt.graphics.Rectangle
+    Rectangle = Struct.new(:x, :y, :width, :height)
+    # TODO alias as org.eclipse.swt.graphics.Rectangle
+  end
+end

data/lib/glimmer/swt/text_proxy.rb

@@ -3,7 +3,26 @@ require 'glimmer/swt/widget_proxy'
 module Glimmer
   module SWT
     class TextProxy < WidgetProxy
-      attr_reader :text
+      attr_reader :text, :border, :left, :center, :right, :read_only, :wrap, :multi
+      alias border? border
+      alias left? left
+      alias center? center
+      alias right? right
+      alias read_only? read_only
+      alias wrap? wrap
+      alias multi? multi
+      
+      def initialize(parent, args, block)
+        args << :border if args.empty?
+        @border = !!args.detect { |arg| SWTProxy[arg] == SWTProxy[:border] }
+        @left = !!args.detect { |arg| SWTProxy[arg] == SWTProxy[:left] }
+        @center = !!args.detect { |arg| SWTProxy[arg] == SWTProxy[:center] }
+        @right = !!args.detect { |arg| SWTProxy[arg] == SWTProxy[:right] }
+        @read_only = !!args.detect { |arg| SWTProxy[arg] == SWTProxy[:read_only] }
+        @wrap = !!args.detect { |arg| SWTProxy[arg] == SWTProxy[:wrap] }
+        @multi = !!args.detect { |arg| SWTProxy[arg] == SWTProxy[:multi] }
+        super(parent, args, block)
+      end
 
       def text=(value)
         @text = value
@@ -11,43 +30,86 @@ module Glimmer
       end
       
       def element
-        'input'
+        @wrap || @multi ? 'textarea' : 'input'
       end
       
       def observation_request_to_event_mapping
+        myself = self
         {
-          'on_modify_text' => {
-            event: 'keyup',
-            event_handler: -> (event_listener) {
-              -> (event) {
-                # TODO consider unifying this event handler with on_key_pressed by relying on its result instead of hooking another keyup event
-                # TODO add all attributes for on_modify_text modify event
-                if @last_key_pressed_event.nil? || @last_key_pressed_event.doit
+          'on_verify_text' => [
+            {
+              event: 'beforeinput',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  event.define_singleton_method(:widget) {myself}
+                  event.define_singleton_method(:text) {`#{event.to_n}.originalEvent.data` || ''}
+                  selection_start = `#{event.target}[0].selectionStart`
+                  selection_end = `#{event.target}[0].selectionEnd`
+                  if `#{event.to_n}.originalEvent.inputType` == 'deleteContentBackward' && selection_start == selection_end
+                    selection_start -= 1
+                    selection_start = 0 if selection_start < 0
+                  end
+                  event.define_singleton_method(:start) do
+                    selection_start
+                  end
+                  event.define_singleton_method(:end) {selection_end}
+                  doit = true
+                  event.define_singleton_method(:doit=) do |value|
+                    doit = value
+                  end
+                  event.define_singleton_method(:doit) { doit }
+                  event_listener.call(event)
+                  
+                  if !doit
+                    `#{event.to_n}.originalEvent.returnValue = false`
+                  end
+                  
+                  doit
+                }
+              }
+            },
+            {
+              event: 'input',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  event.define_singleton_method(:widget) {myself}
+                  @text = event.target.value
+                }
+              }
+            }
+          ],
+          'on_modify_text' => [
+            {
+              event: 'input',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  # TODO add all attributes for on_modify_text modify event
+                  event.define_singleton_method(:widget) {myself}
                   @text = event.target.value
                   event_listener.call(event)
-                else
-                  # TODO Fix doit false, it's not stopping input
-                  event.prevent
-                  event.prevent_default
-                  event.stop_propagation
-                  event.stop_immediate_propagation
-                end
+                }
               }
             }
-          },
+          ],
         }
       end
       
       def dom
         text_text = @text
         text_id = id
-        text_style = css
+        text_style = 'min-width: 27px; '
+        text_style += 'border: none; ' if !@border
+        text_style += 'text-align: left; ' if @left
+        text_style += 'text-align: center; ' if @center
+        text_style += 'text-align: right; ' if @right
         text_class = name
-        options = {type: 'text', id: text_id, style: text_style, class: text_class, value: text_text, style: 'min-width: 27px;'}
+        options = {type: 'text', id: text_id, style: text_style, class: text_class, value: text_text}
         options = options.merge('disabled': 'disabled') unless @enabled
+        options = options.merge('readonly': 'readonly') if @read_only
+        options = options.merge('contenteditable': 'true')
         options = options.merge(type: 'password') if has_style?(:password)
         @dom ||= html {
-          input(options)
+          send(element, options)
         }.to_s
       end
     end

data/lib/glimmer/swt/widget_proxy.rb

@@ -30,7 +30,7 @@ module Glimmer
     class WidgetProxy
       include Glimmer
       include PropertyOwner
-      
+            
       Event = Struct.new(:widget, keyword_init: true)
     
       JS_KEY_CODE_TO_SWT_KEY_CODE_MAP = {
@@ -158,7 +158,7 @@ module Glimmer
         @block = block
         # TODO consider changing children to an array (why is it a Set if order matters?)
         @children = Set.new # TODO consider moving to composite
-        @enabled = true
+        @enabled = true if @enabled.nil?
         DEFAULT_INITIALIZERS[self.class.underscored_widget_name(self).to_s.to_sym]&.call(self)
         @parent.post_initialize_child(self) # TODO rename to post_initialize_child to be closer to glimmer-dsl-swt terminology
       end
@@ -331,9 +331,10 @@ module Glimmer
         brand_new = @dom.nil? || old_element.empty? || brand_new
         build_dom(layout: !custom_parent_dom_element) # TODO handle custom parent layout by passing parent instead of parent dom element
         if brand_new
-          the_parent_dom_element.append(@dom) # TODO make a method attach to allow subclasses to override if needed
+          # TODO make a method attach to allow subclasses to override if needed
+          attach(the_parent_dom_element)
         else
-          old_element.replace_with(@dom)
+          reattach(old_element)
         end
         observation_requests&.each do |keyword, event_listener_set|
           event_listener_set.each do |event_listener|
@@ -347,6 +348,14 @@ module Glimmer
         content_on_render_blocks.each { |content_block| content(&content_block) } unless skip_content_on_render_blocks?
       end
       alias redraw render
+        
+      def attach(the_parent_dom_element)
+        the_parent_dom_element.append(@dom)
+      end
+        
+      def reattach(old_element)
+        old_element.replace_with(@dom)
+      end
       
       def content_on_render_blocks
         @content_on_render_blocks ||= []
@@ -367,7 +376,7 @@ module Glimmer
       def build_dom(layout: true)
         # TODO consider passing parent element instead and having table item include a table cell widget only for opal
         @dom = nil
-        @dom = dom
+        @dom = dom # TODO unify how to build dom for most widgets based on element, id, and name (class)
         @dom = @parent.get_layout.dom(@dom) if @parent.respond_to?(:layout) && @parent.get_layout
         @dom
       end
@@ -616,6 +625,7 @@ module Glimmer
                     JS_KEY_CODE_TO_SWT_KEY_CODE_MAP[event.which] || event.which
                   }
                   event.define_singleton_method(:key_code, &event.method(:keyCode))
+                  event.define_singleton_method(:widget) {myself}
                   event.define_singleton_method(:character) {event.which.chr}
                   event.define_singleton_method(:stateMask) do
                     state_mask = 0
@@ -658,6 +668,7 @@ module Glimmer
                     JS_KEY_CODE_TO_SWT_KEY_CODE_MAP[event.which] || event.which
                   }
                   event.define_singleton_method(:key_code, &event.method(:keyCode))
+                  event.define_singleton_method(:widget) {myself}
                   event.define_singleton_method(:character) {event.which.chr}
                   event.define_singleton_method(:stateMask) do
                     state_mask = 0
@@ -1141,6 +1152,7 @@ require 'glimmer/swt/combo_proxy'
 require 'glimmer/swt/c_combo_proxy'
 require 'glimmer/swt/checkbox_proxy'
 require 'glimmer/swt/composite_proxy'
+require 'glimmer/swt/canvas_proxy'
 require 'glimmer/swt/date_time_proxy'
 require 'glimmer/swt/group_proxy'
 require 'glimmer/swt/label_proxy'

data/lib/glimmer-dsl-opal/samples/elaborate/tetris.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2021 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,11 +25,7 @@ require_relative 'tetris/view/playfield'
 require_relative 'tetris/view/score_lane'
 require_relative 'tetris/view/high_score_dialog'
 require_relative 'tetris/view/tetris_menu_bar'
-class Event
-  def location
-    `#@native.location`
-  end
-end
+
 class Tetris
   include Glimmer::UI::CustomShell
   
@@ -147,7 +143,7 @@ class Tetris
   def show_about_dialog
     message_box {
       text 'Glimmer Tetris'
-      message "Glimmer Tetris\n\nGlimmer DSL for SWT Sample\n\nUse arrow keys for movement\nand right/left alt/shift keys for rotation\nAlternatively:\nLeft is A\nRight is D\nDown is S\nUp is W\nRotate Left is Q\nRotate Right is E\n\n for Left, Down, Right, Up\n\nCopyright (c) 2007-2021 Andy Maleh"
+      message "Glimmer Tetris\n\nGlimmer DSL for SWT Sample\n\nUse arrow keys for movement\nand right/left alt/shift keys for rotation\nAlternatively:\nLeft is A\nRight is D\nDown is S\nUp is W\nRotate Left is Q\nRotate Right is E\n\nCopyright (c) 2007-2021 Andy Maleh"
     }.open
   end
 end

data/lib/glimmer-dsl-opal/samples/hello/hello_canvas.rb

@@ -0,0 +1,91 @@
+# Copyright (c) 2020-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.
+
+class HelloCanvas
+  include Glimmer::UI::CustomShell
+  
+  before_body do
+    @image_object = image(File.expand_path('./images/scaffold_app.png', __dir__), width: 50)
+  end
+  
+  body {
+    shell {
+      text 'Hello, Canvas!'
+      minimum_size 320, 400
+    
+      canvas {
+        background :yellow
+        
+        rectangle(0, 0, 220, 400) {
+          background rgb(255, 0, 0)
+        }
+        rectangle(50, 20, 300, 150, 30, 50) {
+          background :magenta
+        }
+        rectangle(50, 20, 300, 150, 30, 50) {
+          foreground :yellow
+        }
+        rectangle(205, 50, 86, 97) {
+          foreground :yellow
+        }
+        rectangle(67, 75, 128, 38) {
+          background :yellow
+        }
+        rectangle(150, 200, 100, 70) {
+          background :dark_magenta
+        }
+        rectangle(50, 200, 30, 70) {
+          background :magenta
+        }
+        oval(110, 310, 100, 100) {
+          background :yellow
+        }
+        arc(210, 210, 100, 100, 30, -77) {
+          background :red
+        }
+        text('Picasso', 67, 103) {
+          foreground :dark_magenta
+          font name: 'Courier', height: 30
+        }
+        image(@image_object, 205, 55)
+        polygon(250, 210, 260, 170, 270, 210, 290, 230) {
+          background :dark_yellow
+        }
+        polyline(250, 110, 260, 70, 270, 110, 290, 130, 250, 110) {
+          foreground :black
+        }
+        3.times do |n|
+          line(250, 120 + n*10, 270 + n*10, 80 + n*10) {
+            foreground :yellow
+          }
+        end
+        10.times do |n|
+          point(220 + n*5, 100 + n*5) {
+            foreground :yellow
+          }
+        end
+      }
+    }
+  }
+end
+
+HelloCanvas.launch
+        

data/lib/glimmer-dsl-opal/samples/hello/hello_text.rb

@@ -0,0 +1,149 @@
+# Copyright (c) 2020-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.
+
+class HelloText
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :default, :no_border, :center, :left, :right, :password, :telephone, :read_only, :wrap, :multi
+  
+  before_body do
+    self.default = 'default is :border style'
+    self.no_border = 'no border'
+    self.center = 'centered'
+    self.left = 'left-aligned'
+    self.right = 'right-aligned'
+    self.password = 'password'
+    self.telephone = '555-555-5555'
+    self.read_only = 'Telephone area code is 555'
+    self.wrap = 'wraps if text content is too long like this example'
+    self.multi = "multi-line enables hitting enter,\nbut works like wrap on the web"
+  end
+  
+  body {
+    shell {
+      grid_layout 2, false
+      
+      text 'Hello, Text!'
+      minimum_size 350, 100
+      
+      label {
+        text 'text'
+      }
+      text { # includes :border style by default
+        layout_data :fill, :center, true, false
+        text <=> [self, :default]
+      }
+
+      label {
+        text 'text(:none)'
+      }
+      text(:none) { # no border
+        layout_data :fill, :center, true, false
+        text <=> [self, :no_border]
+      }
+
+      label {
+        text 'text(:center, :border)'
+      }
+      text(:center, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :center]
+      }
+
+      label {
+        text 'text(:left, :border)'
+      }
+      text(:left, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :left]
+      }
+
+      label {
+        text 'text(:right, :border)'
+      }
+      text(:right, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :right]
+      }
+
+      label {
+        text 'text(:password, :border)'
+      }
+      text(:password, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :password]
+      }
+
+      label {
+        text 'text(:read_only, :border)'
+      }
+      text(:read_only, :border) {
+        layout_data :fill, :center, true, false
+        text <= [self, :read_only]
+      }
+      
+      label {
+        text 'text with event handlers'
+      }
+      text {
+        layout_data :fill, :center, true, false
+        text <=> [self, :telephone]
+        
+        # this event kicks in just after the user typed and before modifying the text attribute value
+        on_verify_text do |verify_event|
+          new_text = verify_event.widget.text.clone
+          # new_text[verify_event.start...verify_event.end] = verify_event.text # Opal does not allow string mutation like JRuby in Glimmer DSL for SWT
+          new_text = "#{new_text[0...verify_event.start]}#{verify_event.text}#{new_text[verify_event.end..-1]}"
+          verify_event.doit = telephone?(new_text)
+        end
+        
+        # this event kicks in just after the text widget is verified and modified
+        on_modify_text do |modify_event|
+          self.read_only = "Telephone area code is #{modify_event.widget.text.gsub(/[^0-9]/, '')[0...3]}"
+        end
+      }
+      
+      label {
+        text 'text(:wrap, :border)'
+      }
+      text(:wrap, :border) {
+        layout_data(:fill, :center, true, false) {
+          width_hint 100
+        }
+        text <=> [self, :wrap]
+      }
+
+      label {
+        text 'text(:multi, :border)'
+      }
+      text(:multi, :border) {
+        layout_data :fill, :center, true, false
+        text <=> [self, :multi]
+      }
+    }
+  }
+  
+  def telephone?(text)
+    !!text.match(/^\d{0,3}[-.\/]?\d{0,3}[-.\/]?\d{0,4}$/)
+  end
+end
+
+HelloText.launch