glimmer-dsl-opal 0.15.1 → 0.17.0

data/lib/glimmer/swt/label_proxy.rb

@@ -33,19 +33,19 @@ module Glimmer
 
       def text=(value)
         @text = value
-        dom_element.html(html_text)
+        dom_element.html(html_text) # TODO deal with issue of handling lines and escaping at the same time
       end
       
       def html_text
-        text&.gsub("\n", '<br />')
+        text && CGI.escape_html(text).gsub("\n", '<br />')
       end
       
-      def background_image=(*image_options)
+#       def background_image=(*image_options)
         # TODO consider if there is a difference between background_image and image in label and to have one reuse the other
         # TODO finish implementation
 #         @background_image = Glimmer::SWT::ImageProxy.create(*image_options)
 #         dom_element.css('background-image', @background_image.image_data.dom_element.src)
-      end
+#       end
       
       def image=(*image_options)
         # TODO finish implementation
@@ -53,6 +53,19 @@ module Glimmer
 #         dom_element.css('background-image', @image.image_data.dom_element.src)
       end
       
+      # background image
+      def background_image
+        @background_image
+      end
+      
+      # background image is stretched by default
+      def background_image=(value)
+        @background_image = value
+        dom_element.css('background-image', "url(#{background_image})")
+        dom_element.css('background-repeat', 'no-repeat')
+        dom_element.css('background-size', 'cover')
+      end
+      
       def element
         'label'
       end

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -92,7 +92,7 @@ module Glimmer
       def grab_excess_horizontal_space=(grab_excess_horizontal_space)
         @grab_excess_horizontal_space = grab_excess_horizontal_space
         @parent.dom_element.css('justify-self', @horizontal_alignment) if @grab_excess_horizontal_space && @horizontal_alignment != 'fill' && width_hint.nil?
-        @parent.parent.dom_element.css('justify-content', "normal") if @grab_excess_horizontal_space
+        @parent.parent.dom_element.css('justify-content', 'stretch') if @grab_excess_horizontal_space
 #         reapply
       end
 

data/lib/glimmer/swt/menu_proxy.rb

@@ -218,6 +218,21 @@ module Glimmer
         end
       end
       
+      def visible=(value)
+        @visible = value
+        if @visible
+          parent.menu_requested = true
+          parent.dom_element.css('position', 'relative')
+          render
+          dom_element.css('position', 'absolute')
+          dom_element.css('left', parent.menu_x - parent.dom_element.offset.left)
+          dom_element.css('top', parent.menu_y - parent.dom_element.offset.top)
+          parent.menu_requested = false
+        else
+          close
+        end
+      end
+      
       def render(custom_parent_dom_element: nil, brand_new: false)
         # TODO attach to top nav bar if parent is shell
         # TODO attach listener to parent to display on right click
@@ -226,7 +241,7 @@ module Glimmer
           if root_menu? && !bar?
             `$(#{path}).menu();`
             @close_event_handler = lambda do |event|
-              close if event.target.parents('.ui-menu').empty?
+              close if event.target != parent.dom_element && event.target.parents('.ui-menu').empty?
             end
             Element['body'].on('click', &@close_event_handler)
           end
@@ -236,6 +251,7 @@ module Glimmer
       def close
         dom_element.remove
         Element['body'].off('click', &@close_event_handler)
+        @visible = false
       end
       
       def root_menu?

data/lib/glimmer/swt/row_layout_proxy.rb

@@ -24,6 +24,14 @@ module Glimmer
           margin-left: auto;
           margin-right: auto;
         }
+        
+        .row-layout-wrap {
+          flex-wrap: wrap;
+        }
+                
+        .row-layout-justify {
+          justify-content: space-around;
+        }
                 
         .row-layout-horizontal {
           flex-direction: row;
@@ -42,13 +50,14 @@ module Glimmer
         }
       CSS
     
-      attr_reader :type, :fill, :margin_width, :margin_height, :margin_top, :margin_right, :margin_bottom, :margin_left, :spacing, :pack, :center
+      attr_reader :type, :margin_width, :margin_height, :margin_top, :margin_right, :margin_bottom, :margin_left, :spacing, :pack, :center, :wrap, :justify
         
       def initialize(parent, args)
         super(parent, args)
         @parent.dom_element.add_class('row-layout')
         self.type = args.first || :horizontal
         self.pack = true
+        self.wrap = true
       end
       
       def type=(value)
@@ -79,9 +88,13 @@ module Glimmer
         end
       end
       
+      def fill
+        !pack
+      end
+      
       def fill=(value)
         # TODO verify this is a correct implementation and interpretation of RowLayout in SWT
-        self.pack(!value)
+        self.pack = !value
       end
       
       def center=(center_value)
@@ -94,6 +107,24 @@ module Glimmer
         end
       end
       
+      def wrap=(wrap_value)
+        @wrap = wrap_value
+        if @wrap
+          parent.dom_element.add_class("row-layout-wrap")
+        else
+          parent.dom_element.remove_class("row-layout-wrap")
+        end
+      end
+      
+      def justify=(justify_value)
+        @justify = justify_value
+        if @justify
+          parent.dom_element.add_class("row-layout-justify")
+        else
+          parent.dom_element.remove_class("row-layout-justify")
+        end
+      end
+      
       def margin_width=(pixels)
         @margin_width = pixels
         # Using padding for width since margin-right isn't getting respected with width 100%

data/lib/glimmer/swt/widget_proxy.rb

@@ -31,8 +31,8 @@ module Glimmer
       include Glimmer
       include PropertyOwner
       
-      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font, :focus, :disposed?, :rendered, :menu_requested
-      attr_accessor :menu
+      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font, :focus, :disposed?, :rendered
+      attr_accessor :menu, :menu_requested, :menu_x, :menu_y
       alias isDisposed disposed?
       alias is_disposed disposed?
       alias rendered? rendered
@@ -133,17 +133,16 @@ module Glimmer
       # Executes at the closing of a parent widget curly braces after all children/properties have been added/set
       def post_add_content
         if !menu.nil? && !is_a?(MenuProxy) && !is_a?(MenuItemProxy)
-          on_mouse_down { |mouse_event|
+          # TODO consider in the future retaining listener registrations to deregister on unsetting of the menu
+          on_mouse_move do |mouse_event|
+            self.menu_x = mouse_event.x
+            self.menu_y = mouse_event.y
+          end
+          on_mouse_down do |mouse_event|
             if mouse_event.button == 3 # right-click
-              @menu_requested = true
-              dom_element.css('position', 'relative')
-              menu&.render
-              menu.dom_element.css('position', 'absolute')
-              menu.dom_element.css('left', mouse_event.x - parent.get_layout&.margin_width.to_i) # TODO - parent.get_layout&.margin_left.to_i)
-              menu.dom_element.css('top', mouse_event.y - parent.get_layout&.margin_height.to_i - 5) # TODO - parent.get_layout&.margin_top.to_i)
-              @menu_requested = false
+              menu.visible = true
             end
-          }
+          end
         end
       end
       
@@ -321,10 +320,12 @@ module Glimmer
       end
       
       def default_observation_request_to_event_mapping
+        myself = self
         mouse_event_handler = -> (event_listener) {
           -> (event) {
             # TODO generalize this solution to all widgets that support key presses
             # TODO support event.location once DOM3 is supported by opal-jquery
+            event.define_singleton_method(:widget) {myself}
             event.define_singleton_method(:button, &event.method(:which))
             event.define_singleton_method(:count) {1} # TODO support double-click count of 2 in the future by using ondblclick
             event.define_singleton_method(:x, &event.method(:page_x))
@@ -345,6 +346,31 @@ module Glimmer
 #               event.prevent
 #               event.stop
 #               event.stop_immediate
+#             end
+          }
+        }
+        mouse_move_event_handler = -> (event_listener) {
+          -> (event) {
+            # TODO generalize this solution to all widgets that support key presses
+            # TODO support event.location once DOM3 is supported by opal-jquery
+            event.define_singleton_method(:widget) {myself}
+            event.define_singleton_method(:button, &event.method(:which))
+            event.define_singleton_method(:count) {1} # TODO support double-click count of 2 in the future by using ondblclick
+            event.define_singleton_method(:x, &event.method(:page_x))
+            event.define_singleton_method(:y, &event.method(:page_y))
+            doit = true
+            event.define_singleton_method(:doit=) do |value|
+              doit = value
+            end
+            event.define_singleton_method(:doit) { doit }
+            
+            event_listener.call(event)
+            
+            # TODO Imlement doit properly for all different kinds of events
+#             unless doit
+#               event.prevent
+#               event.stop
+#               event.stop_immediate
 #             end
           }
         }
@@ -352,6 +378,7 @@ module Glimmer
           -> (event) {
             # TODO generalize this solution to all widgets that support key presses
             # TODO support event.location once DOM3 is supported by opal-jquery
+            event.define_singleton_method(:widget) {myself}
             event.define_singleton_method(:button, &event.method(:which))
             event.define_singleton_method(:count) {1} # TODO support double-click count of 2 in the future by using ondblclick
             event.define_singleton_method(:x, &event.method(:page_x))
@@ -366,7 +393,6 @@ module Glimmer
               event.prevent
               event_listener.call(event)
             end
-            
             # TODO Imlement doit properly for all different kinds of events
 #             unless doit
 #               event.prevent
@@ -382,6 +408,12 @@ module Glimmer
           'on_focus_lost' => {
             event: 'blur',
           },
+          'on_mouse_move' => [
+            {
+              event: 'mousemove',
+              event_handler: mouse_move_event_handler,
+            },
+          ],
           'on_mouse_up' => [
             {
               event: 'mouseup',
@@ -428,6 +460,7 @@ module Glimmer
               -> (event) {
                 # TODO generalize this solution to all widgets that support key presses
                 # TODO support event.location once DOM3 is supported by opal-jquery
+                event.define_singleton_method(:widget) {myself}
                 event.define_singleton_method(:keyCode) {event.which}
                 event.define_singleton_method(:key_code, &event.method(:keyCode))
                 event.define_singleton_method(:character) {event.which.chr}
@@ -464,6 +497,7 @@ module Glimmer
               -> (event) {
                 # TODO generalize this solution to all widgets that support key presses
                 # TODO support event.location once DOM3 is supported by opal-jquery
+                event.define_singleton_method(:widget) {myself}
                 event.define_singleton_method(:keyCode) {event.which}
                 event.define_singleton_method(:key_code, &event.method(:keyCode))
                 event.define_singleton_method(:character) {event.which.chr}
@@ -500,6 +534,7 @@ module Glimmer
               -> (event) {
                 # TODO generalize this solution to all widgets that support key presses
                 # TODO support event.location once DOM3 is supported by opal-jquery
+                event.define_singleton_method(:widget) {myself}
                 event.define_singleton_method(:keyCode) {event.which}
                 event.define_singleton_method(:key_code, &event.method(:keyCode))
                 event.define_singleton_method(:character) {event.which.chr}
@@ -536,6 +571,7 @@ module Glimmer
               -> (event) {
                 # TODO generalize this solution to all widgets that support key presses
                 # TODO support event.location once DOM3 is supported by opal-jquery
+                event.define_singleton_method(:widget) {myself}
                 event.define_singleton_method(:keyCode) {event.which}
                 event.define_singleton_method(:key_code, &event.method(:keyCode))
                 event.define_singleton_method(:character) {event.which.chr}
@@ -924,6 +960,7 @@ end
 require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/browser_proxy'
 require 'glimmer/swt/button_proxy'
+require 'glimmer/swt/arrow_proxy'
 require 'glimmer/swt/combo_proxy'
 require 'glimmer/swt/checkbox_proxy'
 require 'glimmer/swt/composite_proxy'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.17.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-xml
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +267,7 @@ files:
 - app/controllers/glimmer/image_paths_controller.rb
 - app/views/glimmer/image_paths/index.html.erb
 - config/routes.rb
+- lib/cgi.rb
 - lib/display.rb
 - lib/glimmer-dsl-opal.rb
 - lib/glimmer-dsl-opal/ext/class.rb
@@ -283,17 +284,20 @@ files:
 - lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe/board.rb
 - lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe/cell.rb
 - lib/glimmer-dsl-opal/samples/elaborate/weather.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_arrow.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_browser.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_button.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_checkbox.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_checkbox_group.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_combo.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_composite.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_computed.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_custom_shell.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_custom_widget.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_date_time.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_dialog.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_group.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_layout.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_list_multi_selection.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_list_single_selection.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_menu_bar.rb
@@ -324,6 +328,7 @@ files:
 - lib/glimmer-dsl-opal/vendor/jquery-ui/package.json
 - lib/glimmer-dsl-opal/vendor/jquery.js
 - lib/glimmer-dsl-swt.rb
+- lib/glimmer/config.rb
 - lib/glimmer/config/opal_logger.rb
 - lib/glimmer/data_binding/element_binding.rb
 - lib/glimmer/data_binding/list_selection_binding.rb
@@ -366,6 +371,7 @@ files:
 - lib/glimmer/dsl/opal/widget_listener_expression.rb
 - lib/glimmer/engine.rb
 - lib/glimmer/swt.rb
+- lib/glimmer/swt/arrow_proxy.rb
 - lib/glimmer/swt/browser_proxy.rb
 - lib/glimmer/swt/button_proxy.rb
 - lib/glimmer/swt/checkbox_proxy.rb
@@ -436,7 +442,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for Opal