glimmer-dsl-opal 0.6.1 → 0.7.4

data/lib/glimmer/swt/grid_layout_proxy.rb

@@ -7,9 +7,8 @@ module Glimmer
         .grid-layout {
           display: grid;
           grid-template-rows: min-content;
-          justify-content: start;
           place-content: start;
-          align-items: stretch;      
+          align-items: stretch;
         }
       CSS
       attr_reader :num_columns, :make_columns_equal_width, :horizontal_spacing, :vertical_spacing, :margin_width, :margin_height
@@ -18,7 +17,7 @@ module Glimmer
         super(parent, args)
         self.horizontal_spacing = 10
         self.vertical_spacing = 10
-        self.num_columns = @args.first || 1        
+        self.num_columns = @args.first || 1
         reapply
       end
 
@@ -30,7 +29,7 @@ module Glimmer
       end
       
       def make_columns_equal_width=(equal_width)
-        @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
       end
@@ -68,15 +67,15 @@ module Glimmer
           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|          
+          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
         else
-          layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|          
+          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
-      end      
+      end
     end
   end
 end

data/lib/glimmer/swt/label_proxy.rb

@@ -4,11 +4,10 @@ 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)
@@ -32,6 +31,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
@@ -44,7 +52,7 @@ module Glimmer
         label_id = id
         label_class = name
         @dom ||= html {
-          label(id: label_id, class: label_class) {
+          label(id: label_id, class: label_class, style: "text-align: #{alignment};") {
             label_text
           }
         }.to_s

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,
@@ -47,7 +48,10 @@ module Glimmer
         if @horizontal_alignment == 'fill'
           @parent.dom_element.css('width', '100%') if width_hint.nil?
         else
-          @parent.dom_element.css('text-align', @horizontal_alignment)
+          @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,13 +89,15 @@ 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?
+        @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?
+        @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,7 +18,7 @@ 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
         

data/lib/glimmer/swt/message_box_proxy.rb

@@ -1,4 +1,5 @@
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/display_proxy'
 
 module Glimmer
   module SWT
@@ -7,7 +8,7 @@ module Glimmer
       
       def initialize(parent, args, block)
         i = 0
-        @parent = parent
+        @parent = parent || DisplayProxy.instance.shells.last
         @args = args
         @block = block
         @children = Set.new
@@ -29,16 +30,8 @@ module Glimmer
         dom_element.find('.modal-content .message').html(@text)
       end
       
-      def document
-        element = self
-        begin
-          element = element.parent
-        end while(element.parent)
-        element
-      end
-      
       def open
-        document.post_initialize_child(self)
+        parent.post_initialize_child(self)
       end
       
       def hide

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/table_column_proxy.rb

@@ -1,12 +1,51 @@
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/swt_proxy'
 
 module Glimmer
   module SWT
     class TableColumnProxy < WidgetProxy
+      STYLE = <<~CSS
+        th.table-column {
+          background: rgb(246, 246, 246);
+          text-align: left;
+          padding: 5px;
+        }
+        
+        th.table-column .sort-direction {
+          float: right;
+        }
+      CSS
       include Glimmer
       
-      attr_reader :text, :width      
+      attr_accessor :sort_block, :sort_by_block
+      attr_reader :text, :width,
+                  :no_sort, :sort_property, :editor
+      alias no_sort? no_sort
+      
+      def initialize(parent, args, block)
+        @no_sort = args.delete(:no_sort)
+        super(parent, args, block)
+        unless no_sort?
+          content {
+            on_widget_selected { |event|
+              parent.sort_by_column!(self)
+            }
+          }
+        end
+      end
       
+      def sort_property=(args)
+        @sort_property = args unless args.empty?
+      end
+      
+      def sort_direction
+        parent.sort_direction if parent.sort_column == self
+      end
+      
+      def redraw_sort_direction
+        sort_icon_dom_element.attr('class', sort_icon_class)
+      end
+            
       def text=(value)
         @text = value
         redraw
@@ -21,36 +60,56 @@ module Glimmer
         parent.columns_path
       end
       
-      def css
-        <<~CSS
-          width: #{width}px;
-        CSS
-      end
-    
       def element
         'th'
       end
       
+      def sort_icon_class
+        @sort_icon_class = 'sort-direction'
+        @sort_icon_class += (sort_direction == SWTProxy[:up] ? ' ui-icon ui-icon-caret-1-n' : ' ui-icon ui-icon-caret-1-s') unless sort_direction.nil?
+        @sort_icon_class
+      end
+      
+      def sort_icon_dom_element
+        dom_element.find('.sort-direction')
+      end
+      
+      # Sets editor (e.g. combo)
+      def editor=(*args)
+        @editor = args
+      end
+      
+      def editable?
+        !@editor&.include?(:none)
+      end
+      
       def observation_request_to_event_mapping
         {
           'on_widget_selected' => {
-            event: 'click'
+            event: 'click',
+            event_handler: -> (event_listener) {
+              -> (event) {
+                event_listener.call(event)
+                redraw_sort_direction
+              }
+            }
           },
         }
-      end      
+      end
       
       def dom
         table_column_text = text
         table_column_id = id
-        table_column_id_style = css
+        table_column_id_style = "width: #{width}px;"
         table_column_css_classes = css_classes
         table_column_css_classes << name
         @dom ||= html {
           th(id: table_column_id, style: table_column_id_style, class: table_column_css_classes.to_a.join(' ')) {
-            table_column_text
+            span {table_column_text}
+            span(class: sort_icon_class)
           }
         }.to_s
-      end      
+      end
     end
   end
 end

data/lib/glimmer/swt/table_editor.rb

@@ -0,0 +1,65 @@
+# 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/control_editor'
+
+module Glimmer
+  module SWT
+    # Emulates SWT's native org.eclipse.swt.custom.TableEditor
+    class TableEditor < ControlEditor
+      alias table composite
+      
+      def editor=(editor_widget, table_item, table_column_index)
+        # TODO consider making editor not gain an ID or gain a separate set of IDs to avoid clashing with standard widget predictability of ID
+        @table_item = table_item
+        @table_column_index = table_column_index
+        @editor_widget = editor_widget
+        @old_value = table_item.cell_dom_element(table_column_index).html
+        table_item.cell_dom_element(table_column_index).html('')
+        editor_widget.render(table_item.cell_dom_element(table_column_index))
+        # TODO tweak the width perfectly so it doesn't expand the table cell
+#         editor_widget.dom_element.css('width', 'calc(100% - 20px)')
+        editor_widget.dom_element.css('width', "#{minimumWidth}%") # TODO implement property with pixels (and perhaps derive percentage separately from pixels)
+        editor_widget.dom_element.css('height', "#{minimumHeight}px")
+        editor_widget.dom_element.add_class('table-editor')
+        # TODO consider relying on autofocus instead
+        editor_widget.dom_element.focus
+        # TODO consider doing the following line only for :text editor
+        editor_widget.dom_element.select
+      end
+      alias set_editor editor=
+      alias setEditor editor=
+      
+      def cancel!
+        done!
+      end
+      
+      def save!
+        done!
+      end
+      
+      def done!
+        @table_item.cell_dom_element(@table_column_index).html(@old_value) unless @old_value.nil?
+        @old_value = nil
+      end
+    end
+  end
+end

data/lib/glimmer/swt/table_item_proxy.rb

@@ -1,12 +1,43 @@
+# 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'
 
 module Glimmer
   module SWT
     class TableItemProxy < WidgetProxy
+      STYLE = <<~CSS
+        tr.table-item td {
+          padding-bottom: 0;
+        }
+        tr.table-item:nth-child(even):not(.selected) {
+          background: rgb(243, 244, 246);
+        }
+      CSS
+      
       attr_reader :data
       
       def initialize(parent, args, block)
         super(parent, args, block)
+        # TODO check if there is a need to remove this observer when removing widget from table upon items update
         on_widget_selected { |event|
           parent.select(parent.index_of(self), event.meta?)
         }
@@ -53,8 +84,12 @@ module Glimmer
         'tr'
       end
       
+      def cell_dom_element(column_index)
+        dom_element.find("td:nth-child(#{column_index + 1})")
+      end
+      
       def redraw
-        super() #TODO re-enalbe and remove below lines
+        super() #TODO re-enable and remove below lines
 
         # TODO perhaps turn the following lambdas into methods
         table_item_edit_handler = lambda do |event, cancel = false|
@@ -104,6 +139,14 @@ module Glimmer
         redraw
       end
       
+      def redraw_selection
+        if parent.selection.include?(self)
+          dom_element.add_class('selected')
+        else
+          dom_element.remove_class('selected')
+        end
+      end
+      
       def on_widget_selected(&block)
         event = 'click'
         delegate = $document.on(event, selector, &block)