glimmer-dsl-opal 0.1.0 → 0.5.1

data/lib/glimmer/swt/styled_text_proxy.rb

@@ -0,0 +1,44 @@
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/text_proxy'
+require 'glimmer/swt/swt_proxy'
+
+module Glimmer
+  module SWT
+    class StyledTextProxy < TextProxy
+      attr_reader :alignment, :right_margin, :editable, :caret
+      
+      def alignment=(value)
+        @alignment = %w[left center right].detect {|alignment_value| SWTProxy[alignment_value] == value}
+        dom_element.css('text-align', @alignment)
+      end
+      
+      def right_margin=(value)
+        @right_margin = value.to_i
+        dom_element.css('padding-right', @right_margin)
+      end
+      
+      def editable=(value)
+        @editable = value
+        if !@editable
+          dom_element.attr('disabled', true)
+          dom_element.css('background', :white)
+          dom_element.css('border', 'solid 1px rgb(118, 118, 118)')
+          dom_element.css('border-radius', '3px')
+          # :hover {
+          #     border-color: rgb(80, 80, 80);
+          # }        
+        else
+          dom_element.prop('disabled', false)
+          dom_element.css('background', nil)
+          dom_element.css('border', nil)
+          dom_element.css('border-radius', nil)
+        end
+      end
+      
+      def caret=(value)
+        @caret = value
+        # TODO implement (not needed for disabling caret though)
+      end
+    end
+  end
+end

data/lib/glimmer/swt/swt_proxy.rb

@@ -0,0 +1,53 @@
+# 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'
+require 'glimmer/swt/style_constantizable'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.SWT
+    #
+    # Follows the Proxy Design Pattern
+    class SWTProxy            
+      include StyleConstantizable      
+
+      class << self
+        def constant_source_class
+          SWT
+        end
+
+        def constant_value_none
+          SWT::NONE
+        end
+        
+        def extra_styles
+          EXTRA_STYLES
+        end
+      end
+      
+      EXTRA_STYLES = {
+        NO_RESIZE: self[:shell_trim, :resize!, :max!],
+        NO_SORT: -7,
+      }            
+    end
+  end
+end

data/lib/glimmer/swt/tab_folder_proxy.rb

@@ -12,20 +12,16 @@ module Glimmer
       
       def add_child(child)
         unless @children.include?(child)
-          @children << child
+          @children << child 
+          tabs_dom_element.append(child.tab_dom)
+          child.render
         end
+        
         if @children.size == 1
           child.show
         end
       end
       
-      def redraw
-        super()
-        @children.each do |child|
-          add_child(child) # TODO think of impact of this on performance
-        end
-      end
-      
       def hide_all_tab_content
         @children.each(&:hide)
       end
@@ -38,6 +34,10 @@ module Glimmer
         id + '-tabs'
       end
       
+      def tabs_dom_element
+        Document.find(tabs_path)
+      end
+      
       def dom
         tab_folder_id = id
         tab_folder_id_style = css

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -8,7 +8,6 @@ module Glimmer
       
       def initialize(parent, args)
         super(parent, args)
-        css_classes << 'tab-item'
         content {
           on_widget_selected {
             @parent.hide_all_tab_content
@@ -18,22 +17,20 @@ module Glimmer
       end
       
       def show
-        # TODO refactor/rewrite via simply class application in jquery
-#         Document.find(path).remove_class('hide')
         @content_visible = true
-        redraw
+        dom_element.remove_class('hide')
+        tab_dom_element.add_class('selected')
       end
       
       def hide
-        # TODO refactor/rewrite via simply class application in jquery
-#         Document.find(path).add_class('hide')
         @content_visible = false
-        redraw
+        dom_element.add_class('hide')
+        tab_dom_element.remove_class('selected')
       end
     
       def text=(value)
         @text = value
-        redraw
+        tab_dom_element.html(@text)
       end
     
       def selector
@@ -52,47 +49,33 @@ module Glimmer
         tab_path
       end      
       
-      def redraw        
-        if @tab_dom
-          old_tab_dom = @tab_dom
-          @tab_dom = nil
-          Document.find(tab_path).replace_with(tab_dom)
-        else
-          Document.find(parent.tabs_path).append(tab_dom)
-        end
-        super()
-      end
-      
       def tab_path
         "#{parent.tabs_path} > ##{tab_id}"
       end
       
+      def tab_dom_element
+        Document.find(tab_path)
+      end
+      
       def tab_id
         id + '-tab'
       end
         
+      # This contains the clickable tab area with tab names
       def tab_dom
-        tab_selected = @content_visible ? 'selected' : ''
         @tab_dom ||= html {
-          button(id: tab_id, class: "tab #{tab_selected}") {
+          button(id: tab_id, class: "tab") {
             @text
           }
         }.to_s
       end
       
+      # This contains the tab content
       def dom
-        tab_item_id = id
-        tab_item_id_style = css
-        tab_item_css_classes = css_classes
-        css_classes << name
-        if @content_visible
-          tab_item_css_classes.delete('hide')
-        else
-          tab_item_css_classes << 'hide' 
-        end
-        tab_item_class_string = tab_item_css_classes.to_a.join(' ')
+        tab_item_id = id        
+        tab_item_class_string = [name, 'hide'].join(' ')
         @dom ||= html {
-          div(id: tab_item_id, style: tab_item_id_style, class: tab_item_class_string) {
+          div(id: tab_item_id, class: tab_item_class_string) {
           }
         }.to_s
       end      

data/lib/glimmer/swt/table_proxy.rb

@@ -105,24 +105,6 @@ module Glimmer
         @columns.to_a.each(&:redraw)  
       end
       
-#       def redraw
-#         if @dom
-#           old_dom = @dom
-#           @dom = nil
-#           old_dom.replace dom
-#         else
-#           dom
-#         end
-#         if @last_redrawn_children != @children
-#           items_dom_element.empty
-#           @last_redrawn_children = @children
-#           @children = []
-#           @last_redrawn_children.each do |child|            
-#             add_child(child)
-#           end
-#         end
-#       end
-      
       def element
         'table'
       end

data/lib/glimmer/swt/widget_proxy.rb

@@ -1,5 +1,27 @@
+# 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/event_listener_proxy'
 require 'glimmer/swt/property_owner'
+require 'glimmer/swt/swt_proxy'
 
 module Glimmer
   module SWT
@@ -7,13 +29,13 @@ module Glimmer
       include Glimmer
       include PropertyOwner
       
-      attr_reader :parent, :args, :path, :css_classes, :css, :children, :enabled
+      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font, :focus
       
       class << self
         # Factory Method that translates a Glimmer DSL keyword into a WidgetProxy object
         def for(keyword, parent, args)
-          the_widget_class = widget_class(keyword) || Glimmer::SWT::LabelProxy
-          the_widget_class.new(parent, args)
+          the_widget_class = widget_class(keyword)
+          the_widget_class.respond_to?(:create) ? the_widget_class.create(parent, args) : the_widget_class.new(parent, args)
         end
         
         def widget_class(keyword)
@@ -44,16 +66,48 @@ module Glimmer
         def reset_max_id_numbers!
           @max_id_numbers = {}
         end
+        
+        def underscored_widget_name(widget_proxy)
+          widget_proxy.class.name.split(/::|\./).last.sub(/Proxy$/, '').underscore
+        end
       end
       
+      DEFAULT_INITIALIZERS = {
+        "composite" => lambda do |composite_proxy|
+          if composite_proxy.layout.nil?
+            layout = GridLayoutProxy.new(composite_proxy, [])
+            composite_proxy.layout = layout
+            layout.margin_width = 15
+            layout.margin_height = 15
+          end
+        end,
+#         "scrolled_composite" => lambda do |scrolled_composite|
+#           scrolled_composite.expand_horizontal = true
+#           scrolled_composite.expand_vertical = true
+#         end,
+#         "table" => lambda do |table|
+#           table.setHeaderVisible(true)
+#           table.setLinesVisible(true)
+#         end,
+        "table_column" => lambda do |table_column_proxy|
+          table_column_proxy.width = 80
+        end,
+#         "group" => lambda do |group_proxy|
+#           group_proxy.layout = GridLayoutProxy.new(group_proxy, []) if group.layout.nil?
+#         end,
+      }
+      
       def initialize(parent, args)
-        @parent = parent        
+        @parent = parent
         @args = args
-        @children = Set.new
-        @css_classes = Set.new
-        @css = ''
+        @children = Set.new # TODO consider moving to composite
         @enabled = true
-        @parent.add_child(self)
+        DEFAULT_INITIALIZERS[self.class.underscored_widget_name(self)]&.call(self)
+        @parent.add_child(self) # TODO rename to post_initialize_child to be closer to glimmer-dsl-swt terminology
+      end
+      
+      def css_classes
+        dom_element.attr('class').to_s.split
       end
       
       def dispose
@@ -61,7 +115,7 @@ module Glimmer
       end
       
       def path
-        "#{parent_path} > #{element}##{id}.#{name}"
+        "#{parent_path} #{element}##{id}.#{name}"
       end
 
       # Root element representing widget. Must be overridden by subclasses if different from div
@@ -71,28 +125,54 @@ module Glimmer
 
       def add_child(child)
         @children << child
-        child.redraw
+        child.render
       end
       
       def enabled=(value)
         @enabled = value
-        # TODO consider relying less on redraw in setters in the future
-        redraw
+        dom_element.prop('disabled', !@enabled)
+      end
+      
+      def foreground=(value)
+        @foreground = value
+        dom_element.css('color', foreground.to_css) unless foreground.nil?
+      end
+      
+      def background=(value)
+        @background = value
+        dom_element.css('background-color', background.to_css) unless background.nil?
       end
       
+      def font=(value)
+        @font = value.is_a?(FontProxy) ? value : FontProxy.new(self, value)
+        dom_element.css('font-family', @font.name) unless @font.nil?
+        dom_element.css('font-style', 'italic') if @font&.style == :italic
+        dom_element.css('font-weight', 'bold') if @font&.style == :bold
+        dom_element.css('font-size', "#{@font.height}px") unless @font.nil?
+      end
+      
+      def focus=(value)
+        @focus = value
+        dom_element.focus # TODO consider if a delay or async_exec is needed here
+      end
+      
+      def set_focus
+        self.focus = true
+      end
+      alias setFocus set_focus
+      
       def parent_path
         @parent.path
       end
 
-      def redraw
-        if @dom && !Document.find(path).empty?
-          old_element = Document.find(path)
-          old_dom = @dom
-          @dom = nil
-          old_element.replace_with(dom.gsub('<html>', '').gsub('</html>', ''))
+      def render
+        old_element = dom_element
+        brand_new = @dom.nil? || old_element.empty?
+        build_dom
+        if brand_new
+          Document.find(parent_path).append(@dom)
         else
-          @dom = nil
-          Document.find(parent_path).append(dom.gsub('<html>', '').gsub('</html>', ''))
+          old_element.replace_with(@dom)
         end
         @observation_requests&.clone&.each do |keyword, event_listener_set|
           event_listener_set.each do |event_listener|
@@ -101,9 +181,16 @@ module Glimmer
           end
         end
         children.each do |child|
-          child.redraw
+          child.render
         end
       end
+      alias redraw render
+      
+      def build_dom
+        @dom = nil
+        @dom = dom
+        @dom = @parent.layout.dom(@dom) if @parent.respond_to?(:layout) && @parent.layout
+      end
       
       def content(&block)
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Opal::WidgetExpression.new, &block)
@@ -133,33 +220,23 @@ module Glimmer
       end
       
       def add_css_class(css_class)
-        @css_classes << css_class
-        redraw
+        dom_element.add_class(css_class)
       end
       
-      def add_css_classes(css_classes)
-        @css_classes += css_classes
-        redraw
+      def add_css_classes(css_classes_to_add)
+        css_classes_to_add.each {|css_class| add_css_class(css_class)}
       end
       
       def remove_css_class(css_class)
-        @css_classes.delete(css_class)
-        redraw
-      end
-      
-      def remove_css_classes(css_classes)
-        @css_classes -= css_classes
-        redraw
+        dom_element.remove_class(css_class)
       end
       
-      def clear_css_classes(css_class)
-        @css_classes.clear
-        redraw
+      def remove_css_classes(css_classes_to_remove)
+        css_classes_to_remove.each {|css_class| remove_css_class(css_class)}
       end
       
-      def css=(css)
-        @css = css
-        redraw
+      def clear_css_classes
+        css_classes.each {|css_class| remove_css_class(css_class)}
       end
       
       def has_style?(symbol)
@@ -167,9 +244,24 @@ module Glimmer
       end
       
       def dom_element
+        # TODO consider making this pick an element in relation to its parent, allowing unhooked dom elements to be built if needed (unhooked to the visible page dom)
         Document.find(path)
       end
       
+      def style_element
+        style_element_id = "#{id}-style"
+        style_element_selector = "style##{style_element_id}"
+        element = dom_element.find(style_element_selector)
+        if element.empty?
+          new_element = Element.new(:style)
+          new_element.attr('id', style_element_id)
+          new_element.attr('class', "#{name.gsub('_', '-')}-instance-style widget-instance-style")
+          dom_element.prepend(new_element)
+          element = dom_element.find(style_element_selector)
+        end
+        element
+      end
+      
       def parent_dom_element
         Document.find(parent_path)
       end
@@ -178,6 +270,23 @@ module Glimmer
         path
       end
       
+      def listener_dom_element
+        Document.find(listener_path)
+      end
+      
+      def can_handle_observation_request?(observation_request)
+        # TODO sort this out for Opal
+        observation_request = observation_request.to_s
+        if observation_request.start_with?('on_swt_')
+          constant_name = observation_request.sub(/^on_swt_/, '')
+          SWTProxy.has_constant?(constant_name)
+        elsif observation_request.start_with?('on_')
+#           event = observation_request.sub(/^on_/, '')
+#           can_add_listener?(event) || can_handle_drag_observation_request?(observation_request) || can_handle_drop_observation_request?(observation_request)
+          true # TODO filter by valid listeners only in the future
+        end
+      end
+      
       def handle_observation_request(keyword, &event_listener)
         return unless observation_request_to_event_mapping.keys.include?(keyword)
         @observation_requests ||= {}
@@ -190,7 +299,7 @@ module Glimmer
           event_handler = mapping[:event_handler]
           potential_event_listener = event_handler&.call(event_listener)
           event_listener = potential_event_listener || event_listener
-          delegate = Document.find(listener_path).on(event, &event_listener)
+          delegate = listener_dom_element.on(event, &event_listener)
         end
         # TODO update code below for new WidgetProxy API
         EventListenerProxy.new(element_proxy: self, event: event, selector: selector, delegate: delegate)
@@ -222,8 +331,15 @@ module Glimmer
       end
       
       def property_type_converters
+        color_converter = lambda do |value|
+          if value.is_a?(Symbol) || value.is_a?(String)
+            ColorProxy.new(value)
+          else
+            value
+          end
+        end
         @property_type_converters ||= {
-#           :background => color_converter,
+          :background => color_converter,
 #           :background_image => lambda do |value|
 #             if value.is_a?(String)
 #               if value.start_with?('uri:classloader')
@@ -243,7 +359,7 @@ module Glimmer
 #               value
 #             end
 #           end,
-#           :foreground => color_converter,
+          :foreground => color_converter,
 #           :font => lambda do |value|
 #             if value.is_a?(Hash)
 #               font_properties = value
@@ -251,9 +367,6 @@ module Glimmer
 #             else
 #               value
 #             end
-#           end,
-#           :items => lambda do |value|
-#             value.to_java :string
 #           end,
           :text => lambda do |value|
 #             if swt_widget.is_a?(Browser)
@@ -265,8 +378,8 @@ module Glimmer
 #           :visible => lambda do |value|
 #             !!value
 #           end,
-        }      
-      end      
+        }
+      end
       
       def widget_property_listener_installers
         @swt_widget_property_listener_installers ||= {
@@ -345,13 +458,13 @@ module Glimmer
 #               }
 #             end,
 #           },
-#           Button => { #radio?
-#             :selection => lambda do |observer|
-#               on_widget_selected { |selection_event|
-#                 observer.call(getSelection)
-#               }
-#             end
-#           },
+          RadioProxy => { #radio?
+            :selection => lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(selection)
+              }
+            end
+          },
 #           Java::OrgEclipseSwtWidgets::MenuItem => {
 #             :selection => lambda do |observer|
 #               on_widget_selected { |selection_event|
@@ -376,14 +489,20 @@ end
 require 'glimmer/swt/browser_proxy'
 require 'glimmer/swt/button_proxy'
 require 'glimmer/swt/combo_proxy'
+require 'glimmer/swt/checkbox_proxy'
 require 'glimmer/swt/composite_proxy'
+require 'glimmer/swt/group_proxy'
 require 'glimmer/swt/label_proxy'
 require 'glimmer/swt/list_proxy'
+require 'glimmer/swt/radio_proxy'
 require 'glimmer/swt/tab_folder_proxy'
 require 'glimmer/swt/tab_item_proxy'
 require 'glimmer/swt/table_column_proxy'
 require 'glimmer/swt/table_item_proxy'
 require 'glimmer/swt/table_proxy'
 require 'glimmer/swt/text_proxy'
+require 'glimmer/swt/radio_proxy'
+require 'glimmer/swt/scrolled_composite_proxy'
+require 'glimmer/swt/styled_text_proxy'
 
 require 'glimmer/dsl/opal/widget_expression'