glimmer-dsl-opal 0.7.1 → 0.8.0

data/lib/glimmer/swt/label_proxy.rb

@@ -4,16 +4,19 @@ require 'glimmer/swt/widget_proxy'
 module Glimmer
   module SWT
     class LabelProxy < WidgetProxy
-      attr_reader :text, :background_image, :image, :alignment
+      attr_reader :text, :background_image, :image
       
       def initialize(parent, args, block)
         super(parent, args, block)
-        self.alignment = [:left, :center, :right].detect {|align| args.detect { |arg| SWTProxy[align] == arg } }
       end
 
       def text=(value)
         @text = value
-        dom_element.html(value)
+        dom_element.html(html_text)
+      end
+      
+      def html_text
+        text.gsub("\n", '<br />')
       end
       
       def background_image=(*image_options)
@@ -32,6 +35,15 @@ module Glimmer
       def element
         'label'
       end
+      
+      def alignment
+        if @alignment.nil?
+          found_arg = nil
+          @alignment = [:left, :center, :right].detect {|align| found_arg = args.detect { |arg| SWTProxy[align] == SWTProxy[arg] } }
+          args.delete(found_arg)
+        end
+        @alignment
+      end
 
       def alignment=(value)
         # TODO consider storing swt value in the future instead
@@ -40,12 +52,11 @@ module Glimmer
       end
       
       def dom
-        label_text = @text
         label_id = id
         label_class = name
         @dom ||= html {
-          label(id: label_id, class: label_class) {
-            label_text
+          label(id: label_id, class: label_class, style: "text-align: #{alignment};") {
+            html_text
           }
         }.to_s
       end

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -3,6 +3,7 @@ require 'glimmer/swt/property_owner'
 module Glimmer
   module SWT
     class LayoutDataProxy
+      # TODO make this polymorphic as GridData or RowData subclasses
       include Glimmer::SWT::PropertyOwner
       attr_reader :parent,
                   :args,
@@ -44,10 +45,11 @@ module Glimmer
       def horizontal_alignment=(horizontal_alignment)
         @horizontal_alignment = horizontal_alignment
         return if @horizontal_alignment.nil?
-        if @horizontal_alignment == 'fill'
-          @parent.dom_element.css('width', '100%') if width_hint.nil?
-        else
-          @parent.dom_element.css('text-align', @horizontal_alignment)
+        if @horizontal_alignment != 'fill'
+          @parent.dom_element.css('text-align', @horizontal_alignment.to_s)
+          @parent.dom_element.css('place-self', @horizontal_alignment.to_s)
+          @parent.dom_element.css('margin-left', 'auto') if ['right', 'center'].include?(@horizontal_alignment.to_s)
+          @parent.dom_element.css('margin-right', 'auto') if ['left', 'center'].include?(@horizontal_alignment.to_s)
         end
         # TODO
 #         reapply
@@ -85,18 +87,19 @@ module Glimmer
       
       def grab_excess_horizontal_space=(grab_excess_horizontal_space)
         @grab_excess_horizontal_space = grab_excess_horizontal_space
-        @parent.dom_element.css('width', "100%") if @grab_excess_horizontal_space && width_hint.nil?
+        @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
 #         reapply
       end
 
       def grab_excess_vertical_space=(grab_excess_vertical_space)
         @grab_excess_vertical_space = grab_excess_vertical_space
-        @parent.dom_element.css('height', "100%") if @grab_excess_vertical_space && height_hint.nil?
-        # TODO
+        @parent.dom_element.css('height', "100%") if @grab_excess_vertical_space && @vertical_alignment == 'fill' && height_hint.nil?
 #         reapply
       end
 
       def reapply
+        # TODO remove reapply method
 #         @parent.css = <<~CSS
 #         CSS
       end

data/lib/glimmer/swt/list_proxy.rb

@@ -3,6 +3,39 @@ require 'glimmer/swt/widget_proxy'
 module Glimmer
   module SWT
     class ListProxy < WidgetProxy
+      STYLE = <<~CSS
+        ul {
+          list-style: none;
+          padding: 0;
+        }
+        li {
+          cursor: default;
+          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;
+        }
+      CSS
+    
       ITEM_EMPTY = '_____'
       attr_reader :items, :selection
       

data/lib/glimmer/swt/menu_item_proxy.rb

@@ -0,0 +1,87 @@
+# Copyright (c) 2020 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.
+
+# TODO implement set_menu or self.menu=
+
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.MenuItem
+    #
+    # 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
+      def post_initialize_child(child)
+        @children << child
+      end
+      
+      def text
+        @text
+      end
+      
+      def text=(value)
+        @text = value
+        dom_element.html(html {div {value}}.to_s)
+        @text
+      end
+      
+      def root_menu
+        the_menu = parent
+        the_menu = the_menu.parent_menu until the_menu.root_menu?
+        the_menu
+      end
+      
+      def skip_content_on_render_blocks?
+        true
+      end
+      
+      def observation_request_to_event_mapping
+        {
+          'on_widget_selected' => {
+            event: 'mouseup',
+            event_handler: -> (event_listener) {
+              -> (event) {
+                remove_event_listener_proxies
+                root_menu.close
+                event_listener.call(event)
+              }
+            },
+          },
+        }
+      end
+      
+      def element
+        'li'
+      end
+      
+      def dom
+        @dom ||= html {
+          li(id: id, class: name) {
+            div {
+              @text
+            }
+          }
+        }.to_s
+      end
+    end
+  end
+end

data/lib/glimmer/swt/menu_proxy.rb

@@ -0,0 +1,162 @@
+# Copyright (c) 2020 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/menu_item_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.Menu
+    #
+    # Functions differently from other widget proxies.
+    #
+    # Glimmer automatically detects if this is a drop down menu
+    # or pop up menu from its parent if no SWT style is passed in.
+    #
+    # There are 3 possibilities:
+    # - SWT :bar style is passed in: Menu Bar
+    # - Parent is ShellProxy: Pop Up Menu (having style :pop_up)
+    # - Parent is another Menu: Drop Down Menu (having style :drop_down)
+    #
+    # In order to get the SWT Menu object, one must call `#swt_widget`.
+    #
+    # In the case of a Drop Down menu, this automatically creates an
+    # SWT MenuItem object with style :cascade
+    #
+    # In order to retrieve the menu item widget proxy, one must call `#menu_item_proxy`
+    #
+    # Follows the Proxy Design Pattern
+    class MenuProxy < WidgetProxy
+      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
+        @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)
+        end
+
+        if parent.is_a?(MenuProxy)
+          @menu_item_proxy = SWT::WidgetProxy.for('menu_item', parent, [:cascade] + [index].compact)
+          super(@menu_item_proxy)
+          @menu_item_proxy.menu = self
+        elsif parent.is_a?(ShellProxy)
+          super(parent, style('menu', styles))
+        else
+          super(parent)
+        end
+
+        if styles.include?(:bar)
+          # Assumes a parent shell
+          parent.menu_bar = self
+        elsif styles.include?(:pop_up)
+          parent.menu = self
+        end
+        # TODO IMPLEMENT PROPERLY
+#         on_focus_lost {
+#           dispose
+#         }
+      end
+      
+      def text
+        @menu_item_proxy&.text
+      end
+      
+      def text=(text_value)
+        @menu_item_proxy&.text = text_value
+      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
+          return menu_item_proxy.can_handle_observation_request?(observation_request)
+        else
+          super_result
+        end
+      end
+      
+      def handle_observation_request(observation_request, block)
+        if can_handle_observation_request?(observation_request, super_only: true)
+          super
+        else
+          menu_item_proxy.handle_observation_request(observation_request, block)
+        end
+      end
+      
+      def post_initialize_child(child)
+        if child && !@children.include?(child)
+          if child.is_a?(MenuItemProxy)
+            @children << child
+          else
+            @children << child.menu_item_proxy
+          end
+        end
+      end
+      
+      def render
+        # 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();`
+            @close_event_handler = lambda do |event|
+              if event.target.parents('.ui-menu').empty?
+                close
+              end
+            end
+            Element['body'].on('click', &@close_event_handler)
+            @menu_initialized = true
+          end
+        end
+      end
+      
+      def close
+        dom_element.remove
+        Element['body'].off('click', &@close_event_handler)
+      end
+      
+      def root_menu?
+        !parent.is_a?(MenuProxy) && !parent.is_a?(MenuItemProxy)
+      end
+      
+      def parent_menu
+        parent.parent unless root_menu?
+      end
+      
+      def element
+        'ul'
+      end
+      
+      def dom
+        @dom ||= html {
+          ul(id: id, class: name) {
+          }
+        }.to_s
+      end
+    end
+  end
+end

data/lib/glimmer/swt/message_box_proxy.rb

@@ -4,11 +4,54 @@ require 'glimmer/swt/display_proxy'
 module Glimmer
   module SWT
     class MessageBoxProxy < WidgetProxy
+      STYLE = <<~CSS
+        .modal {
+          position: fixed;
+          z-index: 1;
+          padding-top: 100px;
+          left: 0;
+          top: 0;
+          width: 100%;
+          height: 100%;
+          overflow: auto;
+          background-color: rgb(0,0,0);
+          background-color: rgba(0,0,0,0.4);
+          text-align: center;
+        }
+        .modal-content .text {
+          background: rgb(80, 116, 211);
+          color: white;
+          padding: 5px;
+        }
+        .modal-content .message {
+          padding: 20px;
+        }
+        .modal-content {
+          background-color: #fefefe;
+          padding-bottom: 15px;
+          border: 1px solid #888;
+          display: inline-block;
+          min-width: 200px;
+        }
+      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, :message
       
       def initialize(parent, args, block)
         i = 0
-        @parent = parent || DisplayProxy.instance.shells.first
+        @parent = parent || DisplayProxy.instance.shells.last
         @args = args
         @block = block
         @children = Set.new
@@ -25,21 +68,17 @@ module Glimmer
         dom_element.find('.modal-content .text').html(@text)
       end
     
-      def message=(msg)
-        @message = msg
-        dom_element.find('.modal-content .message').html(@text)
+      def html_message
+        message.gsub("\n", '<br />')
       end
       
-      def document
-        element = self
-        begin
-          element = element.parent
-        end while(element.parent)
-        element
+      def message=(msg)
+        @message = msg
+        dom_element.find('.modal-content .message').html(html_message)
       end
       
       def open
-        document.post_initialize_child(self)
+        parent.post_initialize_child(self)
       end
       
       def hide
@@ -70,68 +109,15 @@ module Glimmer
         }
       end
  
-      def style_dom_modal_css
-        <<~CSS
-          .modal {
-            position: fixed;
-            z-index: 1;
-            padding-top: 100px;
-            left: 0;
-            top: 0;
-            width: 100%;
-            height: 100%;
-            overflow: auto;
-            background-color: rgb(0,0,0);
-            background-color: rgba(0,0,0,0.4);
-            text-align: center;
-          }
-          .modal-content .text {
-            background: rgb(80, 116, 211);
-            color: white;
-            padding: 5px;
-          }
-          .modal-content .message {
-            padding: 20px;
-          }
-          .modal-content {
-            background-color: #fefefe;
-            padding-bottom: 15px;
-            border: 1px solid #888;
-            display: inline-block;
-            min-width: 200px;
-          }
-        CSS
-#           .close {
-#             color: #aaaaaa;
-#             float: right;
-#             font-weight: bold;
-#             margin: 5px;
-#           }
-#           .close:hover,
-#           .close:focus {
-#             color: #000;
-#             text-decoration: none;
-#             cursor: pointer;
-#           }
-      end
-      
       def dom
-        modal_id = id
-        modal_style = css
-        modal_text = text
-        modal_message = message
-        modal_class = ['modal', name].join(' ')
         @dom ||= html {
-          div(id: modal_id, style: modal_style, class: modal_class) {
-            style(class: 'modal-style') {
-              style_dom_modal_css #.split("\n").map(&:strip).join(' ')
-            }
+          div(id: id, class: "modal #{name}") {
             div(class: 'modal-content') {
               header(class: 'text') {
-                modal_text
+                text
               }
               tag(_name: 'p', id: 'message', class: 'message') {
-                modal_message
+                html_message
               }
               input(type: 'button', class: 'close', autofocus: 'autofocus', value: 'OK')
             }