glimmer-dsl-opal 0.5.1 → 0.7.2

data/lib/glimmer/swt/combo_proxy.rb

@@ -7,8 +7,8 @@ module Glimmer
       include Glimmer::DataBinding::ObservableElement
       attr_reader :text, :items
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         @items = []
       end
       
@@ -45,7 +45,46 @@ module Glimmer
                 event_listener.call(event)
               }
             }
-          }
+          },
+          'on_key_pressed' => {
+            event: 'keydown',
+            event_handler: -> (event_listener) {
+              -> (event) {
+                @last_key_pressed_event = event
+                @text = event.target.value
+                # 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/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

@@ -0,0 +1,209 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class DateTimeProxy < WidgetProxy
+      class << self
+        def create(keyword, parent, args, block)
+          case keyword
+          when 'date'
+            args += [:date]
+          when 'date_drop_down'
+            args += [:date, :drop_down]
+          when 'time'
+            args += [:time]
+          when 'calendar'
+            args += [:calendar]
+          end
+          new(parent, args, block)
+        end
+      end
+      
+      def initialize(parent, args, block)
+        super(parent, args, block)
+        post_add_content if block.nil?
+      end
+      
+      def post_add_content
+        # TODO handle date_drop_down version
+        if time?
+          dom_element.timepicker({
+            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 = {}
+          if drop_down?
+            options = {
+              showOn: 'both',
+              buttonImage: 'assets/glimmer/images/calendar.gif',
+              buttonImageOnly: true,
+              buttonText: 'Select date'
+            }
+          end
+          dom_element.datepicker(options)
+        end
+        date_time_value = self.date_time
+        @added_content = true
+        self.date_time = date_time_value
+      end
+      
+      def date?
+        args.to_a.include?(:date)
+      end
+      
+      def time?
+        args.to_a.include?(:time)
+      end
+      
+      def drop_down?
+        args.to_a.include?(:drop_down)
+      end
+      
+      def calendar?
+        args.to_a.include?(:calendar)
+      end
+      
+      def date_time
+        if @added_content
+          default_date = DateTime.new if @date_time.nil?
+          default_year = @date_time&.year || default_date.year
+          default_month = @date_time&.month || default_date.month
+          default_day = @date_time&.day || default_date.day
+          default_hour = @date_time&.hour || default_date.hour
+          default_min = @date_time&.min || default_date.min
+          default_sec = @date_time&.sec || default_date.sec
+          if time?
+            @date_time = DateTime.new(default_year, default_month, default_day, dom_element.timepicker('getHour').to_i, dom_element.timepicker('getMinute').to_i, default_sec)
+          else
+            @date_time = DateTime.new(dom_element.datepicker('getDate')&.year.to_i, dom_element.datepicker('getDate')&.month.to_i, dom_element.datepicker('getDate')&.day.to_i, default_hour, default_min, default_sec)
+          end
+          @date_time = @date_time&.to_datetime
+        else
+          @initial_date_time
+        end
+      end
+      
+      def date_time=(value)
+        if @added_content
+          @date_time = value&.to_datetime || DateTime.new
+          if time?
+            dom_element.timepicker('setTime', "#{@date_time.hour}:#{@date_time.min}")
+          else
+            dom_element.datepicker('setDate', @date_time.to_time)
+          end
+        else
+          @initial_date_time = value
+        end
+      end
+      
+      # TODO add date, time, year, month, day, hours, minutes, seconds attribute methods
+      
+      def observation_request_to_event_mapping
+        {
+          'on_widget_selected' => [
+            {
+              event: 'change',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  if @timepicker_done
+                    @timepicker_done = false
+                    event_listener.call(event)
+                  end
+                }
+              }
+            },
+          ],
+          'on_focus_lost' => [
+            {
+              event: 'blur',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  if @timepicker_done
+                    @timepicker_done = false
+                    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
+      
+      def time_button_id
+        "#{id}-time-button"
+      end
+      
+      def time_button_class
+        "#{name}-time-button"
+      end
+      
+      def element
+        calendar? ? 'div' : 'input'
+      end
+      
+      def dom
+        @dom ||= html {
+          span {
+            send(element, type: 'text', id: id, class: name)
+            button(id: time_button_id, class: time_button_class, style: "border: none; background: url(assets/glimmer/images/ui-icons_222222_256x240.png) -80px, -96px; width: 16px; height: 16px;") if time?
+          }
+        }.to_s
+      end
+      
+    end
+    
+    # Aliases: `date`, `date_drop_down`, `time`, and `calendar`
+    DateProxy         = DateTimeProxy
+    DateDropDownProxy = DateTimeProxy
+    TimeProxy         = DateTimeProxy
+    CalendarProxy     = DateTimeProxy
+    
+  end
+  
+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/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