glimmer-dsl-opal 0.6.0 → 0.7.3

data/lib/glimmer/swt/composite_proxy.rb

@@ -6,9 +6,13 @@ module Glimmer
     class CompositeProxy < WidgetProxy
       attr_reader :layout
       
-      def initialize(parent, args)
-        super(parent, args)
-        @layout = GridLayoutProxy.new(self, [])
+      def initialize(parent, args, block)
+        super(parent, args, block)
+        @layout = default_layout
+      end
+      
+      def default_layout
+        GridLayoutProxy.new(self, [])
       end
       
       def dom

data/lib/glimmer/swt/control_editor.rb

@@ -0,0 +1,54 @@
+# 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.
+
+module Glimmer
+  module SWT
+    # Emulates SWT's native org.eclipse.swt.custom.ControlEditor
+    class ControlEditor
+      # TODO implement behavior for all these attributes
+      ATTRIBUTES = [:grabHorizontal, :grabVertical, :horizontalAlignment, :verticalAlignment, :minimumWidth, :minimumHeight]
+      attr_accessor(*ATTRIBUTES)
+      ATTRIBUTES.each do |attribute|
+        alias_method attribute.underscore, attribute
+        alias_method "#{attribute.underscore}=", "#{attribute}="
+      end
+      
+      # TODO consider supporting a java_attr_accessor to get around having to generate all the aliases manually
+      attr_accessor :editor
+      alias getEditor editor
+      alias get_editor editor
+      alias setEditor editor=
+      alias set_editor editor=
+      
+      # TODO implement `#layout` method if needed
+      
+      attr_reader :composite
+      
+      def initialize(composite)
+        @composite = composite
+      end
+      
+      # TODO implement showing editor for composite or canvas
+#       def editor=(widget)
+#       end
+    end
+  end
+end

data/lib/glimmer/swt/date_time_proxy.rb

@@ -4,7 +4,7 @@ module Glimmer
   module SWT
     class DateTimeProxy < WidgetProxy
       class << self
-        def create(keyword, parent, args)
+        def create(keyword, parent, args, block)
           case keyword
           when 'date'
             args += [:date]
@@ -15,12 +15,13 @@ module Glimmer
           when 'calendar'
             args += [:calendar]
           end
-          new(parent, args)
+          new(parent, args, block)
         end
       end
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
+        post_add_content if block.nil?
       end
       
       def post_add_content
@@ -30,7 +31,13 @@ module Glimmer
             showPeriod: true,
             showLeadingZero: true,
             showOn: 'both',
+            showNowButton: true,
+            showCloseButton: true,
             button: "##{time_button_id}",
+            onClose: ->(v) {
+              @timepicker_done = true
+              dom_element.trigger('change')
+            },
           })
         else
           options = {}
@@ -104,9 +111,68 @@ module Glimmer
         {
           'on_widget_selected' => [
             {
-              event: 'change'
+              event: 'change',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  if date? || (time? && @timepicker_done)
+                    @timepicker_done = false if time?
+                    event_listener.call(event)
+                  end
+                }
+              }
             },
           ],
+          'on_focus_lost' => [
+            {
+              event: 'blur',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  # TODO support blur event for date?
+                  if time? && @timepicker_done
+                    @timepicker_done = false if time?
+                    event_listener.call(event)
+                  end
+                }
+              }
+            },
+          ],
+          'on_key_pressed' => {
+            event: 'keydown',
+            event_handler: -> (event_listener) {
+              -> (event) {
+                # TODO generalize this solution to all widgets that support key presses
+                # TODO support event.location once DOM3 is supported by opal-jquery
+                event.define_singleton_method(:keyCode) {event.which}
+                event.define_singleton_method(:key_code, &event.method(:keyCode))
+                event.define_singleton_method(:character) {event.which.chr}
+                event.define_singleton_method(:stateMask) do
+                  state_mask = 0
+                  state_mask |= SWTProxy[:alt] if event.alt_key
+                  state_mask |= SWTProxy[:ctrl] if event.ctrl_key
+                  state_mask |= SWTProxy[:shift] if event.shift_key
+                  state_mask |= SWTProxy[:command] if event.meta_key
+                  state_mask
+                end
+                event.define_singleton_method(:state_mask, &event.method(:stateMask))
+                doit = true
+                event.define_singleton_method(:doit=) do |value|
+                  doit = value
+                end
+                event.define_singleton_method(:doit) { doit }
+                event_listener.call(event)
+                
+                  # TODO Fix doit false, it's not stopping input
+                unless doit
+                  event.prevent
+                  event.prevent_default
+                  event.stop_propagation
+                  event.stop_immediate_propagation
+                end
+                
+                doit
+              }
+            }
+          },
         }
       end
       

data/lib/glimmer/swt/display_proxy.rb

@@ -24,6 +24,10 @@ module Glimmer
         Document
       end
       
+      def shells
+        @shells ||= []
+      end
+      
       def render
         # No rendering as body is rendered as part of ShellProxy.. this class only serves as an SWT Display utility
       end
@@ -66,10 +70,10 @@ module Glimmer
                   event_listener.call(event) if event.key_code != 13 && (event.key_code == 127 || event.key_code <= 31)
                 }
               }
-            }          
+            }
           ]
         }
-      end      
+      end
       
       def shells
         @shells ||= []

data/lib/glimmer/swt/fill_layout_proxy.rb

@@ -68,7 +68,7 @@ module Glimmer
             elsif vertical?
               margin_bottom "#{@spacing}px"
             end
-          }          
+          }
           s("##{@parent.id} > :last-child") {
             if horizontal?
               margin_right 0

data/lib/glimmer/swt/font_proxy.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -68,7 +68,7 @@ module Glimmer
       private
 
       def detect_invalid_font_property(font_properties)
-        [font_properties[:style]].flatten.select do |style|
+        font_properties[:style].to_collection(false).select do |style|
           style.is_a?(Symbol) || style.is_a?(String)
         end.each do |style|
           raise Error, style.to_s + ERROR_INVALID_FONT_STYLE if !FONT_STYLES.include?(style.to_sym)

data/lib/glimmer/swt/label_proxy.rb

@@ -6,8 +6,8 @@ module Glimmer
     class LabelProxy < WidgetProxy
       attr_reader :text, :background_image, :image, :alignment
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         self.alignment = [:left, :center, :right].detect {|align| args.detect { |arg| SWTProxy[align] == arg } }
       end
 

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -3,15 +3,16 @@ 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, 
-                  :horizontal_alignment, 
-                  :vertical_alignment, 
-                  :horizontal_span, 
-                  :vertical_span, 
-                  :horizontal_indent, 
-                  :vertical_indent, 
+      attr_reader :parent,
+                  :args,
+                  :horizontal_alignment,
+                  :vertical_alignment,
+                  :horizontal_span,
+                  :vertical_span,
+                  :horizontal_indent,
+                  :vertical_indent,
                   :grab_excess_horizontal_space,
                   :grab_excess_vertical_space,
                   :width_hint,
@@ -48,6 +49,8 @@ module Glimmer
           @parent.dom_element.css('width', '100%') if width_hint.nil?
         else
           @parent.dom_element.css('text-align', @horizontal_alignment)
+          @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,13 +88,13 @@ 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('width', "100%") if @grab_excess_horizontal_space && @horizontal_alignment == 'fill' && width_hint.nil?
 #         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?
+        @parent.dom_element.css('height', "100%") if @grab_excess_vertical_space && @vertical_alignment == 'fill' && height_hint.nil?
         # TODO
 #         reapply
       end

data/lib/glimmer/swt/layout_proxy.rb

@@ -18,28 +18,28 @@ module Glimmer
           a_layout_class = Glimmer::SWT.const_get(class_name_main.to_sym) rescue Glimmer::SWT.const_get(class_name_alternative.to_sym)
           a_layout_class if a_layout_class.ancestors.include?(Glimmer::SWT::LayoutProxy)
         rescue => e
-          puts "Layout #{keyword} was not found!"
+          Glimmer::Config.logger.debug "Layout #{keyword} was not found!"
           nil
         end
         
         def layout_exists?(keyword)
           !!layout_class(keyword)
         end
-      end      
+      end
       
       attr_reader :parent, :args
         
-      def initialize(parent, args)      
+      def initialize(parent, args)
         @parent = parent
         @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        
+        @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=)        
+        self.margin_height = 15 if respond_to?(:margin_height=)
       end
 
       def css_class

data/lib/glimmer/swt/list_proxy.rb

@@ -6,8 +6,8 @@ module Glimmer
       ITEM_EMPTY = '_____'
       attr_reader :items, :selection
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         @selection = []
       end
       

data/lib/glimmer/swt/message_box_proxy.rb

@@ -1,14 +1,16 @@
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/display_proxy'
 
 module Glimmer
   module SWT
     class MessageBoxProxy < WidgetProxy
       attr_reader :text, :message
       
-      def initialize(parent, args)
+      def initialize(parent, args, block)
         i = 0
-        @parent = parent
+        @parent = parent || DisplayProxy.instance.shells.first
         @args = args
+        @block = block
         @children = Set.new
         @enabled = true
         content do

data/lib/glimmer/swt/property_owner.rb

@@ -7,7 +7,7 @@ module Glimmer
       end
     
       def set_attribute(attribute_name, *args)
-        send(attribute_setter(attribute_name), *args) unless send(attribute_getter(attribute_name)) == args.first
+        send(attribute_setter(attribute_name), *args) unless args.size == 1 && send(attribute_getter(attribute_name)) == args.first
       end
       
       def attribute_setter(attribute_name)
@@ -16,7 +16,7 @@ module Glimmer
       
       def attribute_getter(attribute_name)
         attribute_name.to_s.underscore
-      end      
+      end
     end
   end
 end

data/lib/glimmer/swt/shell_proxy.rb

@@ -21,6 +21,7 @@ module Glimmer
         @layout.margin_width = 0
         @layout.margin_height = 0
         self.minimum_size = Point.new(WIDTH_MIN, HEIGHT_MIN)
+        DisplayProxy.instance.shells << self
       end
       
       def element
@@ -207,6 +208,7 @@ module Glimmer
         body_class = ([name] + css_classes.to_a).join(' ')
         @dom ||= html {
           div(id: body_id, class: body_class) {
+            # TODO support the idea of dynamic CSS building on close of shell that adds only as much CSS as needed for widgets that were mentioned
             style(class: 'common-style') {
               style_dom_css
             }
@@ -246,6 +248,12 @@ module Glimmer
             style(class: 'scrolled-composite-style') {
               Glimmer::SWT::ScrolledCompositeProxy::STYLE
             }
+            style(class: 'table-item-style') {
+              Glimmer::SWT::TableItemProxy::STYLE
+            }
+            style(class: 'table-column-style') {
+              Glimmer::SWT::TableColumnProxy::STYLE
+            }
           }
         }.to_s
       end

data/lib/glimmer/swt/tab_folder_proxy.rb

@@ -5,8 +5,8 @@ module Glimmer
     class TabFolderProxy < WidgetProxy
       attr_reader :tabs
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         @tabs = []
       end
       

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -4,10 +4,10 @@ module Glimmer
   module SWT
     class TabItemProxy < CompositeProxy
       include Glimmer
-      attr_reader :text, :content_visible      
+      attr_reader :text, :content_visible
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         content {
           on_widget_selected {
             @parent.hide_all_tab_content
@@ -35,7 +35,7 @@ module Glimmer
     
       def selector
         super + '-tab'
-      end      
+      end
       
       def observation_request_to_event_mapping
         {
@@ -47,7 +47,7 @@ module Glimmer
       
       def listener_path
         tab_path
-      end      
+      end
       
       def tab_path
         "#{parent.tabs_path} > ##{tab_id}"
@@ -72,13 +72,13 @@ module Glimmer
       
       # This contains the tab content
       def dom
-        tab_item_id = id        
+        tab_item_id = id
         tab_item_class_string = [name, 'hide'].join(' ')
         @dom ||= html {
           div(id: tab_item_id, class: tab_item_class_string) {
           }
         }.to_s
-      end      
+      end
     end
   end
 end