glimmer-dsl-opal 0.9.2 → 0.10.3

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,46 @@ 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
+        layout_css = <<~CSS
+          grid-template-columns: #{'auto ' * @num_columns.to_i};
+          grid-row-gap: #{@vertical_spacing}px;
+          grid-column-gap: #{@horizontal_spacing}px;
+        CSS
+        if @parent.css_classes.include?('grid-layout')
+          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
+            @parent.dom_element.css(key, value) unless key.nil?
+          end
+          if @parent.is_a?(GroupProxy)
+            @parent.dom_element.find('legend').css('grid-column-start', "span #{@num_columns.to_i}")
+          end
+        else
+          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
+            @parent.dom_element.css(key, 'initial') unless key.nil?
+          end
+        end
       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,25 +73,13 @@ module Glimmer
         @parent.dom_element.css('padding-bottom', effective_margin_height)
       end
             
-      def reapply
-        # TODO get rid of this method
-        layout_css = <<~CSS
-          grid-template-columns: #{'auto ' * @num_columns.to_i};
-          grid-row-gap: #{@vertical_spacing}px;
-          grid-column-gap: #{@horizontal_spacing}px;
-        CSS
-        if @parent.css_classes.include?('grid-layout')
-          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
-            @parent.dom_element.css(key, value) unless key.nil?
-          end
-          if @parent.is_a?(GroupProxy)
-            @parent.dom_element.find('legend').css('grid-column-start', "span #{@num_columns.to_i}")
-          end
-        else
-          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|
-            @parent.dom_element.css(key, 'initial') unless key.nil?
-          end
-        end
+      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
       end
     end
   end

data/lib/glimmer/swt/label_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-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,26 @@
 # 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.async_exec {
+            DisplayProxy.instance.dialogs.last&.open
+          }
         end
       end
+
     end
+    
   end
+  
 end

data/lib/glimmer/swt/latest_message_box_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
@@ -31,7 +31,9 @@ module Glimmer
       
       def open
         Document.ready? do
-          DisplayProxy.instance.message_boxes.last&.open
+          DisplayProxy.instance.async_exec {
+            DisplayProxy.instance.message_boxes.last&.open
+          }
         end
       end
 

data/lib/glimmer/swt/latest_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
@@ -19,21 +19,38 @@
 # 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/shell_proxy'
+
 module Glimmer
   module SWT
-    class LatestShellProxy #< ShellProxy
-      # TODO consider overriding all methods from ShellProxy and proxying to them
-      # TODO consider the idea of promoting this object into the real shell once Document is ready
-      
+    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
-          DisplayProxy.instance.shells.last&.open
+          DisplayProxy.instance.async_exec {
+            latest_shell&.open
+          }
         end
       end
+      
+      def latest_shell
+        @latest_shell ||= DisplayProxy.instance.shells.last
+      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/layout_proxy.rb

@@ -31,29 +31,32 @@ module Glimmer
         
       def initialize(parent, args)
         @parent = parent
+        @args = args
         @parent = parent.body_root if @parent.is_a?(Glimmer::UI::CustomWidget)
         @parent.css_classes.each do |css_class|
           @parent.remove_css_class(css_class) if css_class.include?('layout')
         end
-        @args = args
         @parent.add_css_class(css_class)
         @parent.layout = self
         self.margin_width = 15 if respond_to?(:margin_width=)
         self.margin_height = 15 if respond_to?(:margin_height=)
       end
-
-      def css_class
-        self.class.name.split('::').last.underscore.sub(/_proxy$/, '').gsub('_', '-')
+              
+      def layout​(composite = nil, flush_cache = false)
+        # TODO implement def layout​(composite = nil, flush_cache = false) as per SWT API
+        composite ||= @parent
+        initialize(composite, @args)
       end
       
-      def reapply
-        # subclasses can override this
+      def css_class
+        self.class.name.split('::').last.underscore.sub(/_proxy$/, '').gsub('_', '-')
       end
       
       # Decorates widget dom. Subclasses may override. Returns widget dom by default.
       def dom(widget_dom)
         widget_dom
       end
+      
     end
   end
 end

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

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
@@ -207,11 +207,11 @@ module Glimmer
           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' });`
+              `$(#{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' });`
+            `$(#{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)

data/lib/glimmer/swt/message_box_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
@@ -26,9 +26,9 @@ module Glimmer
   module SWT
     class MessageBoxProxy < WidgetProxy
       STYLE = <<~CSS
-        .modal {
+        .message-box {
           position: fixed;
-          z-index: 1;
+          z-index: 1000;
           padding-top: 100px;
           left: 0;
           top: 0;
@@ -39,15 +39,15 @@ module Glimmer
           background-color: rgba(0,0,0,0.4);
           text-align: center;
         }
-        .modal-content .text {
+        .message-box-content .text {
           background: rgb(80, 116, 211);
           color: white;
           padding: 5px;
         }
-        .modal-content .message {
+        .message-box-content .message {
           padding: 20px;
         }
-        .modal-content {
+        .message-box-content {
           background-color: #fefefe;
           padding-bottom: 15px;
           border: 1px solid #888;
@@ -74,7 +74,7 @@ module Glimmer
         i = 0
         @parent = parent
         @parent = nil if parent.is_a?(LatestShellProxy)
-        @parent ||= DisplayProxy.instance.shells.last || ShellProxy.new([])
+        @parent ||= DisplayProxy.instance.shells.detect(&:open?) || ShellProxy.new([])
         @args = args
         @block = block
         @children = Set.new
@@ -87,7 +87,7 @@ module Glimmer
       
       def text=(txt)
         @text = txt
-        dom_element.find('.modal-content .text').html(@text)
+        dom_element.find('.message-box-content .text').html(@text)
       end
     
       def html_message
@@ -96,25 +96,31 @@ module Glimmer
       
       def message=(msg)
         @message = msg
-        dom_element.find('.modal-content .message').html(html_message)
+        dom_element.find('.message-box-content .message').html(html_message)
+      end
+      
+      def open?
+        @open
       end
       
       def open
-        parent.post_initialize_child(self)
+        shell.open(async: false) unless shell.open?
+        owned_proc = Glimmer::Util::ProcTracker.new(owner: self, invoked_from: :open) {
+          parent.post_initialize_child(self)
+          @open = true
+        }
+        DisplayProxy.instance.async_exec(owned_proc)
       end
       
       def hide
         dom_element.remove
+        @open = false
       end
       
       def content(&block)
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::MessageBoxExpression.new, &block)
       end
       
-      def name
-        'div'
-      end
-      
       def selector
         super + ' .close'
       end
@@ -134,9 +140,9 @@ module Glimmer
       def dom
         @dom ||= html {
           div(id: id, class: "modal #{name}") {
-            div(class: 'modal-content') {
+            div(class: 'message-box-content') {
               header(class: 'text') {
-                text
+                "#{text}&nbsp;" # ensure title area occuppied when there is no text by adding non-breaking space (&nbsp;)
               }
               tag(_name: 'p', id: 'message', class: 'message') {
                 html_message

data/lib/glimmer/swt/row_layout_proxy.rb

@@ -14,6 +14,16 @@ module Glimmer
         .row-layout-pack-false {
           align-items: stretch;
         }
+        
+        .row-layout-center.row-layout-horizontal > * {
+          margin-top: auto;
+          margin-bottom: auto;
+        }
+                
+        .row-layout-center.row-layout-vertical > * {
+          margin-left: auto;
+          margin-right: auto;
+        }
                 
         .row-layout-horizontal {
           flex-direction: row;
@@ -32,15 +42,17 @@ module Glimmer
         }
       CSS
     
-      attr_reader :type, :margin_width, :margin_height, :margin_top, :margin_right, :margin_bottom, :margin_left, :spacing, :pack
-    
+      attr_reader :type, :fill, :margin_width, :margin_height, :margin_top, :margin_right, :margin_bottom, :margin_left, :spacing, :pack, :center
+        
       def initialize(parent, args)
         super(parent, args)
-        @type = @args.first || :horizontal
-        @marign_width = 15
-        @margin_height = 15
-        self.pack = true
         @parent.dom_element.add_class('row-layout')
+        self.type = args.first || :horizontal
+        self.pack = true
+      end
+      
+      def type=(value)
+        @type = value
         @parent.dom_element.add_class(horizontal? ? 'row-layout-horizontal' : 'row-layout-vertical')
       end
       
@@ -67,6 +79,21 @@ module Glimmer
         end
       end
       
+      def fill=(value)
+        # TODO verify this is a correct implementation and interpretation of RowLayout in SWT
+        self.pack(!value)
+      end
+      
+      def center=(center_value)
+        @center = center_value
+        # Using padding for width since margin-right isn't getting respected with width 100%
+        if @center
+          parent.dom_element.add_class("row-layout-center")
+        else
+          parent.dom_element.remove_class("row-layout-center")
+        end
+      end
+      
       def margin_width=(pixels)
         @margin_width = pixels
         # Using padding for width since margin-right isn't getting respected with width 100%
@@ -101,7 +128,7 @@ module Glimmer
         @margin_left = pixels
         @parent.dom_element.css('padding-left', @margin_left)
       end
-      
+            
       def spacing=(spacing)
         @spacing = spacing.to_i
         # TODO implement changes to accomodate layout_data in the future