glimmer-dsl-opal 0.8.0 → 0.10.0

data/lib/glimmer/swt/display_proxy.rb

@@ -28,6 +28,14 @@ module Glimmer
         @shells ||= []
       end
       
+      def message_boxes
+        @message_boxes ||= []
+      end
+      
+      def dialogs
+        @dialogs ||= []
+      end
+      
       def render
         # No rendering as body is rendered as part of ShellProxy.. this class only serves as an SWT Display utility
       end
@@ -74,10 +82,6 @@ module Glimmer
           ]
         }
       end
-      
-      def shells
-        @shells ||= []
-      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/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)

data/lib/{glimmer-dsl-opal/ext/struct.rb → glimmer/swt/latest_dialog_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
@@ -19,19 +19,24 @@
 # 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 Struct
-  class << self
-    alias new_original new
-    def new(*args, &block)
-      new_original(*args, &block).tap do |struct_class|
-        if args.size >= 2 && args.last.is_a?(Hash) && args.last[:keyword_init]
-          struct_class.define_method(:initialize) do |struct_class_keyword_args|
-            struct_class_keyword_args.each do |attribute, value|
-              send("#{attribute}=", value)
-            end
-          end
+module Glimmer
+  module SWT
+    class LatestDialogProxy #< DialogProxy
+      # TODO consider overriding all methods from DialogProxy and proxying to them
+      # TODO consider the idea of promoting this object into the real dialog once Document is ready
+      
+      def initialize(parent, args, block)
+        # No Op
+      end
+      
+      def open
+        Document.ready? do
+          DisplayProxy.instance.dialogs.last&.open
         end
       end
+
     end
+    
   end
+  
 end

data/lib/glimmer/swt/latest_message_box_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.
+
+module Glimmer
+  module SWT
+    class LatestMessageBoxProxy #< MessageBoxProxy
+      # TODO consider overriding all methods from MessageBoxProxy and proxying to them
+      # TODO consider the idea of promoting this object into the real message_box once Document is ready
+      
+      def initialize(parent, args, block)
+        # No Op
+      end
+      
+      def open
+        Document.ready? do
+          DisplayProxy.instance.message_boxes.last&.open
+        end
+      end
+
+    end
+    
+  end
+  
+end

data/lib/glimmer/swt/latest_shell_proxy.rb

@@ -0,0 +1,55 @@
+# 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.
+
+module Glimmer
+  module SWT
+    class LatestShellProxy #< ShellProxy
+      def initialize(parent, args, block)
+        # No Op
+      end
+      
+      def method_missing(method, *args, &block)
+        if latest_shell.nil?
+          super(method, *args, &block)
+        else
+          latest_shell.send(method, *args, &block)
+        end
+      end
+      
+      def respond_to?(method, *args, &block)
+        super || latest_shell&.respond_to?(method, *args, &block)
+      end
+      
+      def open
+        Document.ready? do
+          latest_shell&.open
+        end
+      end
+      
+      def latest_shell
+        @latest_shell ||= DisplayProxy.instance.shells.last
+      end
+
+    end
+    
+  end
+  
+end

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -17,6 +17,8 @@ module Glimmer
                   :grab_excess_vertical_space,
                   :width_hint,
                   :height_hint
+      alias width width_hint
+      alias height height_hint
     
       def initialize(parent, args)
         @parent = parent
@@ -35,12 +37,14 @@ module Glimmer
         @parent.dom_element.css('width', "#{@width_hint}px")
 #         reapply
       end
+      alias width= width_hint=
 
       def height_hint=(height_hint)
         @height_hint = height_hint
         @parent.dom_element.css('height', "#{@height_hint}px")
 #         reapply
       end
+      alias height= height_hint=
 
       def horizontal_alignment=(horizontal_alignment)
         @horizontal_alignment = horizontal_alignment

data/lib/glimmer/swt/list_proxy.rb

@@ -13,24 +13,6 @@ module Glimmer
           padding-left: 10px;
           padding-right: 10px;
         }
-        li.menu-item {
-          padding-left: initial;
-          padding-right: initial;
-        }
-        .ui-menu {
-          /* TODO consider auto-sizing in the future */
-          font-size: initial;
-          width: 150px;
-          border-radius: 5px;
-        }
-        .ui-menu-item:first-child > .ui-menu-item-wrapper {
-          border-top-left-radius: 5px;
-          border-top-right-radius: 5px;
-        }
-        .ui-menu-item:last-child > .ui-menu-item-wrapper {
-          border-bottom-left-radius: 5px;
-          border-bottom-right-radius: 5px;
-        }
         li.empty-list-item {
           color: transparent;
         }

data/lib/glimmer/swt/make_shift_shell_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/menu_item_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
@@ -30,20 +30,98 @@ module Glimmer
     # Follows the Proxy Design Pattern since it's a proxy for an HTML based menu
     # Follows the Adapter Design Pattern since it's adapting a Glimmer DSL for SWT widget
     class MenuItemProxy < WidgetProxy
+      STYLE = <<~CSS
+        .menu-item.disabled {
+          background-color: lightgrey;
+          color: grey;
+        }
+        .menu-item.disabled .menu, .menu-item.disabled .menu * {
+          display: none;
+          opacity: 0;
+        }
+      CSS
+      
+      attr_accessor :accelerator # TODO consider doing something with it
+    
+      def initialize(parent, args)
+        args.push(:push) if args.empty?
+        super(parent, args)
+        # TODO do not add the following event till post_add_content to avoid adding if already one on_widget_selected event existed
+        on_widget_selected {
+          # No Op, just trigger selection
+        }
+      end
+      
       def post_initialize_child(child)
         @children << child
       end
       
+      def cascade?
+        args.include?(:cascade)
+      end
+      
+      def push?
+        args.include?(:push)
+      end
+      
+      def radio?
+        args.include?(:radio)
+      end
+      
+      def check?
+        args.include?(:check)
+      end
+      
+      def separator?
+        args.include?(:separator)
+      end
+      
       def text
         @text
       end
       
       def text=(value)
         @text = value
-        dom_element.html(html {div {value}}.to_s)
+        dom_element.find('.menu-item-text').html(@text)
         @text
       end
       
+      def selection
+        @selection
+      end
+      
+      def selection=(value)
+        @selection = value
+        icon_suffix = check? ? 'check' : 'bullet'
+        dom_element.find('.menu-item-selection').toggle_class("ui-icon ui-icon-#{icon_suffix}", @selection)
+        @selection
+      end
+      
+      def toggle_selection!
+        self.selection = !selection
+      end
+      
+      def enabled=(value)
+        @enabled = value
+        dom_element.toggle_class('disabled', !@enabled)
+        @enabled
+      end
+      
+      def div_content
+        div_attributes = {}
+        icon_suffix = check? ? 'check' : 'bullet'
+        div(div_attributes) {
+          unless separator? # empty content automatically gets a separator style in jQuery-UI
+            span(class: "menu-item-selection #{"ui-icon ui-icon-#{icon_suffix}" if selection}") {}
+            span(class: 'ui-menu-icon ui-icon ui-icon-caret-1-e') {} if cascade? && !parent.bar?
+            span(class: 'menu-item-text') {
+              @text
+            }
+            ''
+          end
+        }
+      end
+      
       def root_menu
         the_menu = parent
         the_menu = the_menu.parent_menu until the_menu.root_menu?
@@ -60,9 +138,19 @@ module Glimmer
             event: 'mouseup',
             event_handler: -> (event_listener) {
               -> (event) {
-                remove_event_listener_proxies
-                root_menu.close
-                event_listener.call(event)
+                if enabled && (push? || radio? || check?)
+                  if check?
+                    self.toggle_selection!
+                  elsif radio? && !selection
+                    parent.children.detect(&:selection)&.selection = false
+                    self.selection = true
+                  end
+                  if !root_menu.bar?
+                    remove_event_listener_proxies
+                    root_menu.close
+                  end
+                  event_listener.call(event)
+                end
               }
             },
           },
@@ -74,11 +162,10 @@ module Glimmer
       end
       
       def dom
+        # TODO support rendering image
         @dom ||= html {
-          li(id: id, class: name) {
-            div {
-              @text
-            }
+          li(id: id, class: "#{name} #{'disabled' unless enabled}") {
+            div_content
           }
         }.to_s
       end

data/lib/glimmer/swt/menu_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
@@ -45,33 +45,85 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class MenuProxy < WidgetProxy
+      STYLE = <<~CSS
+        .menu.menu-bar {
+          position: absolute;
+          top: -30px;
+          border-radius: 0;
+          width: 100%;
+        }
+        .menu.menu-bar .menu {
+          border-radius: 0;
+        }
+        .menu-bar .menu-item {
+          width: 180px;
+        }
+        .menu-bar > .menu-item {
+          display: inline-block;
+          width: 150px;
+        }
+        li.menu-item {
+          padding-left: initial;
+          padding-right: initial;
+        }
+        .menu {
+          /* TODO consider auto-sizing in the future */
+          font-size: initial;
+          border-radius: 5px;
+        }
+        .menu:not(.menu-bar) {
+          width: 150px;
+        }
+        .menu-bar .ui-menu:not(.menu-bar) {
+          width: 180px;
+        }
+        .ui-menu-item:first-child > .ui-menu-item-wrapper {
+          border-top-left-radius: 5px;
+          border-top-right-radius: 5px;
+        }
+        .ui-menu-item:last-child > .ui-menu-item-wrapper {
+          border-bottom-left-radius: 5px;
+          border-bottom-right-radius: 5px;
+        }
+        .menu-bar .ui-menu-item:first-child > .ui-menu-item-wrapper {
+          border-top-left-radius: 0;
+          border-top-right-radius: 0;
+        }
+        .menu-bar .ui-menu-item:last-child > .ui-menu-item-wrapper {
+          border-bottom-left-radius: 0;
+          border-bottom-right-radius: 0;
+        }
+        
+      CSS
+      
       attr_reader :menu_item_proxy, :menu_parent
 
       def initialize(parent, args)
-        # TODO handle :bar swt style
-        # TODO handle :pop_up swt style
-        # TODO handle :cascade swt style
+        # TODO refactor/simplify code below
         @children = []
         index = args.delete(args.last) if args.last.is_a?(Numeric)
-        styles = args.map(&:to_sym)
-        if !styles.include?(:bar) && !parent.is_a?(MenuProxy)
-          styles = styles.unshift(:pop_up)
+        args = args.map {|arg| arg.is_a?(String) ? arg.to_sym : arg}
+        if parent.is_a?(ShellProxy)
+          args = args.unshift(:bar)
+        elsif parent.is_a?(MenuProxy)
+          args = args.unshift(:drop_down)
+        else
+          args = args.unshift(:pop_up)
         end
-
         if parent.is_a?(MenuProxy)
           @menu_item_proxy = SWT::WidgetProxy.for('menu_item', parent, [:cascade] + [index].compact)
-          super(@menu_item_proxy)
+          super(@menu_item_proxy, args)
           @menu_item_proxy.menu = self
         elsif parent.is_a?(ShellProxy)
-          super(parent, style('menu', styles))
-        else
-          super(parent)
+          super(parent, args)
+        else # widget pop up
+          super(parent, args)
         end
 
-        if styles.include?(:bar)
+        if bar?
           # Assumes a parent shell
           parent.menu_bar = self
-        elsif styles.include?(:pop_up)
+        elsif pop_up?
           parent.menu = self
         end
         # TODO IMPLEMENT PROPERLY
@@ -80,6 +132,18 @@ module Glimmer
 #         }
       end
       
+      def bar?
+        args.include?(:bar)
+      end
+      
+      def pop_up?
+        args.include?(:pop_up)
+      end
+      
+      def drop_down?
+        args.include?(:drop_down)
+      end
+      
       def text
         @menu_item_proxy&.text
       end
@@ -88,6 +152,20 @@ module Glimmer
         @menu_item_proxy&.text = text_value
       end
       
+      def enabled
+        if drop_down?
+          menu_item_proxy.enabled
+        else
+          true
+        end
+      end
+      
+      def enabled=(value)
+        if drop_down?
+          menu_item_proxy.enabled = value
+        end
+      end
+      
       def can_handle_observation_request?(observation_request, super_only: false)
         super_result = super(observation_request)
         if observation_request.start_with?('on_') && !super_result && !super_only
@@ -115,21 +193,42 @@ module Glimmer
         end
       end
       
-      def render
+      def post_add_content
+        if bar?
+          # delay this till all children rendered (perhaps post_add_content block)
+          parent_dom_element.css('position', 'relative')
+          parent_dom_element.css('margin-top', '30px')
+          redraw
+          `$(#{path}).menu({
+            position: { my: "top", at: "bottom" },
+            icons: { submenu: "ui-icon-blank" }
+          });`
+          the_element = dom_element
+          the_element.on('mouseover') { |event|
+            if event.page_x.between?(the_element.offset.left, the_element.offset.left + the_element.width) and
+               event.page_y.between?(the_element.offset.top, the_element.offset.top + the_element.height)
+              `$(#{path}).menu('option', 'position', { my: 'left top', at: 'left bottom' })`
+            end
+          }
+          the_element.on('menublur') {
+            `$(#{path}).menu('option', 'position', { my: 'left top', at: 'right top' })`
+          }
+          minimum_width = children.to_a.map(&:dom_element).map(&:width).reduce(:+)
+          the_element.css('min-width', minimum_width)
+        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
-        if parent.is_a?(MenuProxy) || parent.is_a?(MenuItemProxy) || parent.menu_requested?
-          super
-          if root_menu?
-            id_css = "##{id}"
-            `$(#{id_css}).menu();`
+        if parent.is_a?(MenuProxy) || parent.is_a?(MenuItemProxy) || parent.menu_requested? || parent.is_a?(ShellProxy)
+          super(custom_parent_dom_element: custom_parent_dom_element, brand_new: brand_new)
+          if root_menu? && !bar?
+            `$(#{path}).menu();`
             @close_event_handler = lambda do |event|
-              if event.target.parents('.ui-menu').empty?
-                close
-              end
+              close if event.target.parents('.ui-menu').empty?
             end
             Element['body'].on('click', &@close_event_handler)
-            @menu_initialized = true
           end
         end
       end
@@ -143,6 +242,12 @@ module Glimmer
         !parent.is_a?(MenuProxy) && !parent.is_a?(MenuItemProxy)
       end
       
+      def root_menu
+        the_menu = self
+        the_menu = the_menu.parent_menu until the_menu.root_menu?
+        the_menu
+      end
+      
       def parent_menu
         parent.parent unless root_menu?
       end
@@ -152,11 +257,17 @@ module Glimmer
       end
       
       def dom
+        css_class = name
+        css_class += ' menu-bar' if bar?
+        css_class += ' menu-drop-down' if drop_down?
+        css_class += ' menu-pop-up' if pop_up?
         @dom ||= html {
-          ul(id: id, class: name) {
+          ul(id: id, class: css_class) {
           }
         }.to_s
       end
     end
+    
+    MenuBarProxy = MenuProxy
   end
 end