glimmer-dsl-opal 0.16.1 → 0.19.0

data/lib/glimmer/dsl/opal/menu_expression.rb

@@ -37,6 +37,9 @@ module Glimmer
             if parent.is_a?(Glimmer::SWT::WidgetProxy)
               return true
             else
+              puts 'parent'
+              puts parent.class
+              puts parent
               raise Glimmer::Error, "menu may only be nested under a widget (like shell or another menu)!"
             end
           end

data/lib/glimmer/swt/arrow_proxy.rb

@@ -0,0 +1,42 @@
+# 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.
+
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/button_proxy'
+
+module Glimmer
+  module SWT
+    class ArrowProxy < ButtonProxy
+      def initialize(parent, args, block)
+        if args.to_a.include?(:left)
+          @text = '<'
+        elsif args.to_a.include?(:right)
+          @text = '>'
+        elsif args.to_a.include?(:up)
+          @text = '^'
+        else
+          @text = 'v'
+        end
+        super(parent, args, block)
+      end
+    end
+  end
+end

data/lib/glimmer/swt/button_proxy.rb

@@ -1,3 +1,24 @@
+# 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.
+
 require 'glimmer/swt/widget_proxy'
 require 'glimmer/swt/radio_proxy'
 require 'glimmer/swt/checkbox_proxy'
@@ -11,6 +32,8 @@ module Glimmer
             RadioProxy.new(parent, args, block)
           elsif args.to_a.include?(:check)
             CheckboxProxy.new(parent, args, block)
+          elsif args.to_a.include?(:arrow)
+            ArrowProxy.new(parent, args, block)
           else
             new(parent, args, block)
           end
@@ -29,9 +52,21 @@ module Glimmer
       end
 
       def observation_request_to_event_mapping
+        myself = self
         {
           'on_widget_selected' => {
-            event: 'click'
+            event: 'click',
+            event_handler: -> (event_listener) {
+              -> (event) {
+                event.define_singleton_method(:widget) {myself}
+                doit = true
+                event.define_singleton_method(:doit=) do |value|
+                  doit = value
+                end
+                event.define_singleton_method(:doit) { doit }
+                event_listener.call(event)
+              }
+            }
           },
         }
       end

data/lib/glimmer/swt/c_combo_proxy.rb

@@ -0,0 +1,51 @@
+# 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.
+
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/combo_proxy'
+
+module Glimmer
+  module SWT
+    class CComboProxy < ComboProxy
+      def post_add_content
+        `$(#{path}).selectmenu()`
+        c_combo_dom_element.css('width', 'initial')
+      end
+      
+      def font=(value)
+        @font = value.is_a?(FontProxy) ? value : FontProxy.new(self, value)
+        c_combo_dom_element.css('font-family', @font.name) unless @font.nil?
+        c_combo_dom_element.css('font-style', 'italic') if @font&.style == :italic
+        c_combo_dom_element.css('font-weight', 'bold') if @font&.style == :bold
+        c_combo_dom_element.css('font-size', "#{@font.height}px") unless @font.nil?
+      end
+      
+      def c_combo_path
+        "##{id}-button"
+      end
+      
+      def c_combo_dom_element
+        Document.find(c_combo_path)
+      end
+    end
+  end
+  
+end

data/lib/glimmer/swt/c_tab_folder_proxy.rb

@@ -0,0 +1,43 @@
+# 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.
+
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/tab_folder_proxy'
+
+module Glimmer
+  module SWT
+    class CTabFolderProxy < TabFolderProxy
+      attr_reader :closeable_children
+        
+      def initialize(parent, args, block)
+        @closeable_children = args.detect { |arg| SWTProxy[:close] == SWTProxy[arg] }
+        super(parent, args, block)
+      end
+          
+      def post_initialize_child(child)
+        child.closeable = true if @closeable_children
+        super(child)
+      end
+    end
+    
+  end
+  
+end

data/lib/glimmer/swt/c_tab_item_proxy.rb

@@ -0,0 +1,96 @@
+# 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.
+
+require 'glimmer/swt/tab_item_proxy'
+
+module Glimmer
+  module SWT
+    class CTabItemProxy < TabItemProxy
+      attr_reader :selection_foreground
+      attr_accessor :closeable
+      
+      def initialize(parent, args, block)
+        @closeable = args.detect { |arg| SWTProxy[:close] == SWTProxy[arg] }
+        super(parent, args, block)
+        # TODO attach listener if :close style is set
+        close_dom_element.on('click') { dispose }
+      end
+      
+      def foreground=(value)
+        value = ColorProxy.new(value) if value.is_a?(String)
+        @foreground = value
+        tab_dom_element.css('color', foreground.to_css) unless foreground.nil?
+      end
+      
+      def selection_foreground=(value)
+        value = ColorProxy.new(value) if value.is_a?(String)
+        @selection_foreground = value
+        if @selection_foreground && tab_dom_element.has_class?('selected')
+          @old_foreground = tab_dom_element.css('color')
+          tab_dom_element.css('color', @selection_foreground.to_css)
+        end
+      end
+      
+      def font=(value)
+        @font = value.is_a?(FontProxy) ? value : FontProxy.new(self, value)
+        tab_dom_element.css('font-family', @font.name) unless @font.nil?
+        tab_dom_element.css('font-style', 'italic') if @font&.style == :italic || @font&.style&.to_a&.include?(:italic)
+        tab_dom_element.css('font-weight', 'bold') if @font&.style == :bold || @font&.style&.to_a&.include?(:bold)
+        tab_dom_element.css('font-size', "#{@font.height}px") unless @font.nil?
+      end
+      
+      def show
+        super
+        if @selection_foreground
+          @old_foreground = tab_dom_element.css('color')
+          tab_dom_element.css('color', @selection_foreground.to_css)
+        end
+      end
+      
+      def hide
+        super
+        if @old_foreground
+          tab_dom_element.css('color', @old_foreground)
+          @old_foreground = nil
+        end
+      end
+      
+      def close_path
+        "#{tab_path} span.ui-icon-close"
+      end
+      
+      def close_dom_element
+        Document.find(close_path)
+      end
+      
+      def tab_dom
+        @tab_dom ||= html {
+          a(href: '#', id: tab_id, class: "tab") {
+            img {}
+            span { @text }
+            span(class: 'ui-icon ui-icon-close', role: 'presentation') { 'Remove Tab' } if @closeable
+          }
+        }.to_s
+      end
+      
+    end
+  end
+end

data/lib/glimmer/swt/combo_proxy.rb

@@ -99,6 +99,9 @@ module Glimmer
           }
         }.to_s
       end
+      
     end
+    
   end
+  
 end

data/lib/glimmer/swt/fill_layout_proxy.rb

@@ -28,13 +28,11 @@ module Glimmer
     
       def initialize(parent, args)
         super(parent, args)
-        @type = @args.first || :horizontal
+        self.type = @args.first || :horizontal
         self.margin_width = 15
         self.margin_height = 15
         @parent.css_classes << 'fill-layout'
-        @parent.css_classes << (horizontal? ? 'fill-layout-horizontal' : 'fill-layout-vertical')
         @parent.dom_element.add_class('fill-layout')
-        @parent.dom_element.add_class(horizontal? ? 'fill-layout-horizontal' : 'fill-layout-vertical')
       end
       
       def horizontal?
@@ -44,6 +42,14 @@ module Glimmer
       def vertical?
         @type == :vertical
       end
+      
+      def type=(value)
+        @parent.dom_element.remove_class(horizontal? ? 'fill-layout-horizontal' : 'fill-layout-vertical')
+        @parent.css_classes.delete(horizontal? ? 'fill-layout-horizontal' : 'fill-layout-vertical')
+        @type = value
+        @parent.dom_element.add_class(horizontal? ? 'fill-layout-horizontal' : 'fill-layout-vertical')
+        @parent.css_classes << horizontal? ? 'fill-layout-horizontal' : 'fill-layout-vertical'
+      end
 
       def margin_width=(pixels)
         @margin_width = pixels

data/lib/glimmer/swt/grid_layout_proxy.rb

@@ -12,7 +12,7 @@ module Glimmer
         }
       CSS
       
-      attr_reader :num_columns, :make_columns_equal_width, :horizontal_spacing, :vertical_spacing, :margin_width, :margin_height
+      attr_reader :num_columns, :make_columns_equal_width, :horizontal_spacing, :vertical_spacing, :margin_width, :margin_height, :margin_top, :margin_right, :margin_bottom, :margin_left
     
       def num_columns=(columns)
         @num_columns = columns
@@ -55,6 +55,38 @@ module Glimmer
         @parent.dom_element.css('padding-top', effective_margin_height)
         @parent.dom_element.css('padding-bottom', effective_margin_height)
       end
+      
+      def margin_top=(pixels)
+        @margin_top = pixels
+        # Using padding for width since margin-right isn't getting respected with width 100%
+        effective_margin_top = @margin_top
+        effective_margin_top += 9 if @parent.is_a?(GroupProxy)
+        @parent.dom_element.css('padding-top', effective_margin_top)
+      end
+      
+      def margin_right=(pixels)
+        @margin_right = pixels
+        effective_margin_right = @margin_right
+        effective_margin_right += 6 if @parent.is_a?(GroupProxy)
+        @parent.dom_element.css('padding-right', effective_margin_right)
+      end
+      
+      def margin_bottom=(pixels)
+        @margin_bottom = pixels
+        # Using padding for width since margin-right isn't getting respected with width 100%
+        effective_margin_bottom = @margin_bottom
+        effective_margin_bottom += 9 if @parent.is_a?(GroupProxy)
+        @parent.dom_element.css('padding-bottom', effective_margin_bottom)
+      end
+      
+      def margin_left=(pixels)
+        @margin_left = pixels
+        effective_margin_left = @margin_left
+        effective_margin_left += 6 if @parent.is_a?(GroupProxy)
+        @parent.dom_element.css('padding-left', effective_margin_left)
+      end
+            
+      
             
       def initialize(parent, args)
         super(parent, args)

data/lib/glimmer/swt/label_proxy.rb

@@ -33,11 +33,11 @@ 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)

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?