glimmer-dsl-opal 0.9.1 → 0.10.2

data/lib/glimmer/swt.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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

data/lib/glimmer/swt/color_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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

data/lib/glimmer/swt/composite_proxy.rb

@@ -4,8 +4,6 @@ require 'glimmer/swt/widget_proxy'
 module Glimmer
   module SWT
     class CompositeProxy < WidgetProxy
-      attr_reader :layout
-      
       def initialize(parent, args, block)
         super(parent, args, block)
         @layout = default_layout
@@ -27,7 +25,23 @@ module Glimmer
       def layout=(the_layout)
         @layout = the_layout
       end
+      alias set_layout layout=
+      alias setLayout layout=
+      
+      def get_layout
+        @layout
+      end
+      alias getLayout get_layout #TODO consider pregenerating these aliases with an easy method in the future
+
+      def pack(*args)
+        # No Op (just a shim) TODO consider if it should be implemented
+      end
       
+      def layout​(changed = nil, all = nil)
+        # TODO implement layout(changed = nil, all = nil) just as per SWT API
+        @layout&.layout(self, changed)
+      end
+            
     end
     
   end

data/lib/glimmer/swt/control_editor.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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

data/lib/glimmer/swt/custom/checkbox_group.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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

data/lib/glimmer/swt/custom/radio_group.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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

data/lib/glimmer/swt/dialog_proxy.rb

@@ -0,0 +1,188 @@
+# 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/display_proxy'
+
+module Glimmer
+  module SWT
+    class DialogProxy < CompositeProxy
+      STYLE = <<~CSS
+        .ui-dialog .ui-dialog-content {
+          background: rgb(235, 235, 235);
+        }
+        .ui-dialog-titlebar {
+          background: rgb(80, 116, 211);
+          color: white;
+        }
+        .ui-dialog .dialog .ui-widget-overlay {
+          z-index: 10 !important;
+          background-color: rgba(0, 0, 0, 0.4);
+          opacity: 1;
+        }
+        .ui-dialog * {
+          z-index: 200 !important;
+        }
+      CSS
+
+      
+#         .close {
+#           color: #aaaaaa;
+#           float: right;
+#           font-weight: bold;
+#           margin: 5px;
+#         }
+#         .close:hover,
+#         .close:focus {
+#           color: #000;
+#           text-decoration: none;
+#           cursor: pointer;
+#         }
+      
+      attr_reader :text
+      
+      def initialize(parent, args, block)
+        i = 0
+        @parent = parent
+        @parent = nil if parent.is_a?(LatestShellProxy)
+        @parent ||= DisplayProxy.instance.shells.detect(&:open?) || ShellProxy.new([])
+        @args = args
+        @block = block
+        @children = Set.new
+        @enabled = true
+        DisplayProxy.instance.opened_dialogs.last&.suspend_event_handling
+        DisplayProxy.instance.dialogs << self
+        @parent.post_initialize_child(self)
+      end
+      
+      def text=(txt)
+        @text = txt
+        if @init
+          dom_element.dialog('option', 'title', @text)
+        else
+          dom_element.attr('title', @text)
+        end
+      end
+    
+      def open?
+        @open
+      end
+      
+      def open
+        owned_proc = Glimmer::Util::ProcTracker.new(owner: self, invoked_from: :open) {
+          shell.open(async: false) unless shell.open?
+          unless @init
+            dom_element.remove_class('hide')
+            dom_element.dialog('auto_open' => false)
+            @init = true
+            dom_element.dialog('option', 'appendTo', parent.path)
+            dom_element.dialog('option', 'modal', true) # NOTE: Not Working! Doing manually below by relying on overlay in ShellProxy.
+            unless DisplayProxy.instance.dialogs.any?(&:open?) # only add for first dialog open
+              Element['.dialog-overlay'].remove_class('hide')
+            end
+            dom_element.dialog('option', 'closeOnEscape', true)
+            dom_element.dialog('option', 'draggable', true)
+            dom_element.dialog('option', 'width', 'auto')
+            dom_element.dialog('option', 'minHeight', 'none')
+            dom_element.on('dialogclose') do
+              unless @hiding
+                close
+              else
+                @hiding = false
+              end
+            end
+          else
+            dom_element.dialog('open')
+          end
+          @open = true
+        }
+        DisplayProxy.instance.async_exec(owned_proc)
+      end
+      
+      def hide
+        @hiding = true
+        dom_element.dialog('close')
+        @open = false
+        Element['.dialog-overlay'].add_class('hide') unless DisplayProxy.instance.dialogs.any?(&:open?)
+      end
+      
+      def close
+        dom_element.dialog('destroy')
+        dom_element.remove
+        @open = false
+        @init = false
+        Element['.dialog-overlay'].add_class('hide') unless DisplayProxy.instance.dialogs.any?(&:open?)
+        parent.children.delete(self)
+        shell.close if shell.children.empty?
+        DisplayProxy.instance.dialogs.delete(self)
+        DisplayProxy.instance.opened_dialogs.last&.resume_event_handling
+      end
+      
+      
+      def content(&block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::DialogExpression.new, &block)
+      end
+      
+      def path
+        if @init # it gets moved once initialized by jQuery UI, so only ID is reliable then
+          "##{id}"
+        else
+          super
+        end
+      end
+      
+      def suspend_event_handling
+        super
+        Element["[aria-describedby=#{id}]"].css('z-index', 9)
+      end
+      
+      def resume_event_handling
+        super
+        Element["[aria-describedby=#{id}]"].css('z-index', 100)
+      end
+      
+#       def selector
+#         super + ' .close'
+#       end
+#
+#       def listener_path
+#         widget_path + ' .close'
+#       end
+#
+#       def observation_request_to_event_mapping
+#         {
+#           'on_widget_selected' => {
+#             event: 'click'
+#           },
+#         }
+#       end
+ 
+      def dom
+        @dom ||= html {
+          div(id: id, class: "#{name} modal hide", title: text) {
+          }
+        }.to_s
+      end
+    end
+  end
+end
+
+require 'glimmer/dsl/opal/dialog_expression'

data/lib/glimmer/swt/display_proxy.rb

@@ -1,3 +1,5 @@
+require 'glimmer/swt/widget_proxy'
+
 module Glimmer
   module SWT
     class DisplayProxy < WidgetProxy
@@ -31,22 +33,46 @@ module Glimmer
       def message_boxes
         @message_boxes ||= []
       end
-      alias message_boxs message_boxes # alias for automating processing as plural from keyword by adding s only
+      
+      def dialogs
+        @dialogs ||= []
+      end
+      
+      def modals
+        message_boxes + dialogs
+      end
+      
+      def message_box_open?
+        message_boxes.any?(&:open?)
+      end
+      
+      def dialog_open?
+        dialogs.any?(&:open?)
+      end
+      
+      def opened_dialogs
+        dialogs.select(&:open?)
+      end
+      
+      def modal_open?
+        message_box_open? or dialog_open?
+      end
       
       def render
         # No rendering as body is rendered as part of ShellProxy.. this class only serves as an SWT Display utility
       end
       
-      def async_exec(&block)
-        executer = lambda do
-          if Document.find('.modal').to_a.empty?
-            block.call
-          else
-            sleep(0.05)
-            Async::Task.new(&executer)
-          end
+      def async_exec(proc_tracker = nil, &block)
+        block = proc_tracker unless proc_tracker.nil?
+        queue = nil # general queue
+        if !proc_tracker.nil? && proc_tracker.invoked_from.to_s == 'open' && modal_open? &&
+           (
+             proc_tracker.owner.is_a?(MessageBoxProxy) ||
+             (dialog_open? && proc_tracker.owner.is_a?(DialogProxy) && opened_dialogs.last == WidgetProxy.widget_handling_listener&.dialog_ancestor)
+           )
+          queue = WidgetProxy.widget_handling_listener
         end
-        Async::Task.new(&executer)
+        schedule_async_exec(block, queue)
       end
       # sync_exec kept for API compatibility reasons
       alias sync_exec async_exec
@@ -79,6 +105,40 @@ module Glimmer
           ]
         }
       end
+      
+      private
+      
+      def async_exec_queues
+        @async_exec_queues ||= {}
+      end
+      
+      def async_exec_queue(widget_handling_listener = nil)
+        async_exec_queues[widget_handling_listener] ||= []
+      end
+      
+      def no_widget_handling_listener_work?
+        async_exec_queues.reject {|key, value| key.nil?}.values.reduce(:+).to_a.empty?
+      end
+      
+      def schedule_async_exec(block, queue)
+        async_exec_queue(queue).unshift(block)
+        
+        # TODO consider the need for locking to avoid race conditions (rare or impossible case)
+        if async_exec_queue(queue).size == 1
+          executer = lambda do
+            # queue could be a widget handling listener queue
+            # TODO see if there are more intricate cases of opening a dialog from a widget listener handler
+            if !message_box_open? && (!dialog_open? || queue&.dialog_ancestor == opened_dialogs.last) && ((!queue.nil? && async_exec_queues.keys.last == queue) || no_widget_handling_listener_work?)
+              block = async_exec_queue(queue).pop
+              block.call
+              Async::Task.new(delay: 1, &executer) if async_exec_queue(queue).any?
+            else
+              Async::Task.new(delay: 100, &executer)
+            end
+          end
+          Async::Task.new(delay: 1, &executer)
+        end
+      end
     end
   end
 end

data/lib/glimmer/swt/font_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 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

data/lib/glimmer/swt/grid_layout_proxy.rb

@@ -14,39 +14,29 @@ module Glimmer
       
       attr_reader :num_columns, :make_columns_equal_width, :horizontal_spacing, :vertical_spacing, :margin_width, :margin_height
     
-      def initialize(parent, args)
-        super(parent, args)
-        self.horizontal_spacing = 10
-        self.vertical_spacing = 10
-        self.margin_width = 15
-        self.margin_height = 15
-        self.num_columns = @args.first || 1
-        reapply
-      end
-
       def num_columns=(columns)
         @num_columns = columns
         # TODO do the following instead of reapply
 #         @parent.add_css_class("num-columns-#{@num_columns}")
-        reapply
+        # reinitialize # TODO reimplement without using reinitialize
       end
       
       def make_columns_equal_width=(equal_width)
         @make_columns_equal_width = equal_width
 #         @parent.add_css_class('make_columns_equal_width') if @make_columns_equal_width
-        reapply
+        # reinitialize # TODO reimplement without using reinitialize
       end
       
       def horizontal_spacing=(spacing)
         @horizontal_spacing = spacing
 #         @parent.add_css_class("horizontal-spacing-#{@horizontal_spacing}")
-        reapply
+        # reinitialize # TODO reimplement without using reinitialize
       end
 
       def vertical_spacing=(spacing)
         @vertical_spacing = spacing
 #         @parent.add_css_class("vertical-spacing-#{@vertical_spacing}")
-        reapply
+        # reinitialize # TODO reimplement without using reinitialize
       end
       
       def margin_width=(pixels)
@@ -66,8 +56,13 @@ module Glimmer
         @parent.dom_element.css('padding-bottom', effective_margin_height)
       end
             
-      def reapply
-        # TODO get rid of this method
+      def initialize(parent, args)
+        super(parent, args)
+        self.horizontal_spacing = 10
+        self.vertical_spacing = 10
+        self.margin_width = 15
+        self.margin_height = 15
+        self.num_columns = @args.first || 1
         layout_css = <<~CSS
           grid-template-columns: #{'auto ' * @num_columns.to_i};
           grid-row-gap: #{@vertical_spacing}px;

data/lib/glimmer/swt/label_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/image_proxy'
 
@@ -16,7 +37,7 @@ module Glimmer
       end
       
       def html_text
-        text.gsub("\n", '<br />')
+        text&.gsub("\n", '<br />')
       end
       
       def background_image=(*image_options)