glimmer-dsl-swt 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b818d6b949f1a1c4388ecad2f9d6f425afbdf0c772a99031c2ea1cf1276dc1c
-  data.tar.gz: 7f9f78326e9a083b170f9606bfb7337963bda57c4648e7f585c435747f77e94a
+  metadata.gz: ce119763646f3e3ccc0211534317572ed02c5d21b9820387dec34d83b714e50f
+  data.tar.gz: 1c4486c574ab3e8d30957133b9aab200dcfbdea10ea1c4aa0279a4991f80a0dd
 SHA512:
-  metadata.gz: e56deeff2d43d47a8e875ed1e32ba54f6cca9398053afdd5351257a2b0da3326384412635cf0c41529e8d961abab5de32d69cc5b6e23e67f1ebec23bb372b174
-  data.tar.gz: 49dc96a0dc0921bac9b0cd048d9e33d1436dffa09b4bcb48704f162a30209c52209b3ca03318c89e7277835e682821ec89fb4f32f9c26218fb8ed1812a340dcb
+  metadata.gz: cea6c2e7ac8920d4ae87e447f08c7a622fc8851827b76160dc07b36d8c725911bf94a772aa5f47e43465a24961f7dc38b1d974a164ec3704d159dee61deb7712
+  data.tar.gz: 8efbb95213218c052cbcc8165dc2305c41f26a42f1a374ba05fd9b5912c3a79bfbb99522a524c8cc0fa88b128c471ab22e03fb75a750b7dd31708617b4c6b4cf

data/README.md

@@ -1,4 +1,4 @@
-# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 /> Glimmer DSL for SWT 0.3.0 (Desktop GUI)
+# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 /> Glimmer DSL for SWT 0.3.1 (Desktop GUI)
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer-dsl-swt/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer-dsl-swt?branch=master)

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/glimmer/swt/shell_proxy.rb

@@ -130,7 +130,11 @@ module Glimmer
       # This method is not needed except in rare circumstances where there is a need to start the SWT Event Loop before opening the shell.
       def start_event_loop
         until @swt_widget.isDisposed
-          @display.sleep unless @display.readAndDispatch
+          begin
+            @display.sleep unless @display.readAndDispatch
+          rescue => e
+            Glimmer::Config.logger&.debug e.full_message          
+          end
         end
       end
 

data/lib/glimmer/swt/table_column_proxy.rb

@@ -3,7 +3,7 @@ require 'glimmer/swt/widget_proxy'
 module Glimmer
   module SWT
     class TableColumnProxy < Glimmer::SWT::WidgetProxy    
-      attr_reader :no_sort, :sort_property
+      attr_reader :no_sort, :sort_property, :editor
       alias no_sort? no_sort
       attr_accessor :sort_block, :sort_by_block
       
@@ -19,6 +19,10 @@ module Glimmer
         @sort_property = args unless args.empty?
       end
       
+      def editor=(args)
+        @editor = args
+      end
+      
     end
   end
 end

data/lib/glimmer/swt/table_proxy.rb

@@ -1,4 +1,4 @@
-  require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/widget_proxy'
 
 module Glimmer
   module SWT
@@ -23,8 +23,8 @@ module Glimmer
         def find_table_item_and_column_index
           {}.tap do |result|
             if respond_to?(:x) && respond_to?(:y)
-              result[:table_item] = widget.getItems.detect do |ti|
-                result[:column_index] = widget.getColumnCount.times.to_a.detect do |ci|
+              result[:table_item] = widget.items.detect do |ti|
+                result[:column_index] = widget.column_count.times.to_a.detect do |ci|
                   ti.getBounds(ci).contains(x, y)
                 end
               end
@@ -33,7 +33,61 @@ module Glimmer
         end   
       end
       
-      attr_reader :table_editor, :table_editor_text_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block, :additional_sort_properties
+      class << self
+        def editors
+          @editors ||= {
+            text: {
+              widget_value_property: :text,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                table_proxy.table_editor.minimumHeight = 20
+                table_editor_widget_proxy = text(*args) {
+                  text model.send(property)
+                  focus true
+                  on_focus_lost {
+                    table_proxy.finish_edit!
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }              
+                }
+                table_editor_widget_proxy.swt_widget.selectAll          
+                table_editor_widget_proxy
+              end,
+            },
+            combo: {
+              widget_value_property: :text,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                table_proxy.table_editor.minimumHeight = 25
+                table_editor_widget_proxy = combo(*args) {
+                  items model.send("#{property}_options")
+                  text model.send(property)
+                  focus true
+                  on_focus_lost {
+                    table_proxy.finish_edit!
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }
+                  on_widget_selected {
+                    table_proxy.finish_edit!
+                  }
+                }
+                table_editor_widget_proxy
+              end,
+            }
+          }      
+        end
+      end
+      
+      attr_reader :table_editor, :table_editor_text_proxy, :table_editor_widget_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block, :additional_sort_properties, :editor
       attr_accessor :column_properties
       
       def initialize(underscored_widget_name, parent, args)
@@ -46,7 +100,7 @@ module Glimmer
 
       def model_binding
         swt_widget.data
-      end      
+      end
       
       def sort_by_column(table_column_proxy)
         index = swt_widget.columns.to_a.index(table_column_proxy.swt_widget)
@@ -100,6 +154,10 @@ module Glimmer
         @additional_sort_properties = args unless args.empty?
       end
       
+      def editor=(args)
+        @editor = args
+      end 
+      
       def sort
         return unless sort_property && (sort_type || sort_block || sort_by_block)
         array = model_binding.evaluate_property
@@ -152,6 +210,14 @@ module Glimmer
         })
       end
       
+      def post_initialize_child(table_column_proxy)
+        table_column_proxies << table_column_proxy
+      end
+      
+      def table_column_proxies
+        @table_column_proxies ||= []
+      end
+      
       # Indicates if table is in edit mode, thus displaying a text widget for a table item cell
       def edit_mode?
         !!@edit_mode
@@ -177,58 +243,62 @@ module Glimmer
             
       def edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil)
         return if table_item.nil?
+        model = table_item.data
+        property = column_properties[column_index]
         @cancel_edit&.call if @edit_mode
+        action_taken = false
         @edit_mode = true
-        content {
-          @table_editor_text_proxy = text {
-            focus true
-            text table_item.getText(column_index)
-            action_taken = false
-            @cancel_edit = lambda do
-              @cancel_in_progress = true
-              @table_editor_text_proxy&.swt_widget&.dispose
-              @table_editor_text_proxy = nil
-              after_cancel&.call
+        
+        editor_config = table_column_proxies[column_index].editor || editor
+        editor_config = editor_config.to_a
+        editor_widget_options = editor_config.last.is_a?(Hash) ? editor_config.last : {}
+        editor_widget_arg_last_index = editor_config.last.is_a?(Hash) ? -2 : -1
+        editor_widget = editor_config[0] || :text
+        editor_widget_args = editor_config[1..editor_widget_arg_last_index]
+        model_editing_property = editor_widget_options[:property] || property
+        widget_value_property = TableProxy::editors[editor_widget][:widget_value_property]
+        
+        @cancel_edit = lambda do |event=nil|
+          @cancel_in_progress = true
+          @table_editor_widget_proxy&.swt_widget&.dispose
+          @table_editor_widget_proxy = nil
+          after_cancel&.call
+          @edit_in_progress = false
+          @cancel_in_progress = false
+          @cancel_edit = nil
+          @edit_mode = false
+        end
+        
+        @finish_edit = lambda do |event=nil|
+          new_value = @table_editor_widget_proxy&.swt_widget&.send(widget_value_property)
+          if table_item.isDisposed
+            @cancel_edit.call
+          elsif new_value && !action_taken && !@edit_in_progress && !@cancel_in_progress
+            action_taken = true
+            @edit_in_progress = true
+            if new_value == model.send(model_editing_property)
+              @cancel_edit.call
+            else
+              before_write&.call
+              model.send("#{model_editing_property}=", new_value) # makes table update itself, so must search for selected table item again
+              # Table refresh happens here because of model update triggering observers, so must retrieve table item again
+              edited_table_item = search { |ti| ti.getData == model }.first
+              swt_widget.showItem(edited_table_item)
+              @table_editor_widget_proxy&.swt_widget&.dispose
+              @table_editor_widget_proxy = nil
+              after_write&.call(edited_table_item)              
               @edit_in_progress = false
-              @cancel_in_progress = false
-              @cancel_edit = nil
-              @edit_mode = false
-            end
-            @finish_edit = lambda do |event=nil|
-              if table_item.isDisposed
-                @cancel_edit.call
-              elsif !action_taken && !@edit_in_progress && !@cancel_in_progress
-                action_taken = true
-                @edit_in_progress = true
-                new_text = @table_editor_text_proxy.swt_widget.getText
-                if new_text == table_item.getText(column_index)
-                  @cancel_edit.call
-                else
-                  before_write&.call
-                  table_item.setText(column_index, new_text)
-                  model = table_item.getData
-                  model.send("#{column_properties[column_index]}=", new_text) # makes table update itself, so must search for selected table item again
-                  edited_table_item = search { |ti| ti.getData == model }.first
-                  swt_widget.showItem(edited_table_item)
-                  @table_editor_text_proxy&.swt_widget&.dispose
-                  @table_editor_text_proxy = nil
-                  after_write&.call(edited_table_item)
-                  @edit_in_progress = false
-                end
-              end
             end
-            on_focus_lost(&@finish_edit)
-            on_key_pressed { |key_event|
-              if key_event.keyCode == swt(:cr)
-                @finish_edit.call(key_event)
-              elsif key_event.keyCode == swt(:esc)
-                @cancel_edit.call
-              end
-            }
-          }
-          @table_editor_text_proxy.swt_widget.selectAll
+          end
+        end
+
+        content { 
+          @table_editor_widget_proxy = @table_editor_text_proxy = TableProxy::editors[editor_widget][:editor_gui].call(editor_widget_args, model, model_editing_property, self)
         }
-        @table_editor.setEditor(@table_editor_text_proxy.swt_widget, table_item, column_index)
+        @table_editor.setEditor(@table_editor_widget_proxy.swt_widget, table_item, column_index)
+      rescue => e
+        Glimmer::Config.logger&.error e.full_message
+        raise e
       end
       
       def add_listener(underscored_listener_name, &block)

data/lib/glimmer/swt/widget_proxy.rb

@@ -271,7 +271,7 @@ module Glimmer
           return nil
         end
         swt_widget_class
-      rescue NameError => e
+      rescue SyntaxError, NameError => e
         Glimmer::Config.logger&.debug e.full_message
         # Glimmer::Config.logger&.debug("#{e.message}\n#{e.backtrace.join("\n")}")
         nil

data/lib/glimmer/ui/custom_widget.rb

@@ -138,12 +138,8 @@ module Glimmer
         @swt_widget = @body_root.swt_widget
       end
       
-      # Subclasses may override to perform post initialization work on an added child
-      def post_initialize_child(child)
-        body_root.post_initialize_child(child)
-      end      
-
       def can_handle_observation_request?(observation_request)
+        observation_request = observation_request.to_s
         result = false
         if observation_request.start_with?('on_updated_')
           property = observation_request.sub(/^on_updated_/, '')
@@ -153,6 +149,7 @@ module Glimmer
       end
 
       def handle_observation_request(observation_request, &block)
+        observation_request = observation_request.to_s
         if observation_request.start_with?('on_updated_')
           property = observation_request.sub(/^on_updated_/, '') # TODO look into eliminating duplication from above
           add_observer(DataBinding::Observer.proc(&block), property) if can_add_observer?(property)
@@ -188,7 +185,9 @@ module Glimmer
 
       # This method ensures it has an instance method not coming from Glimmer DSL
       def has_instance_method?(method_name)
-        respond_to?(method_name) && !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb')
+        respond_to?(method_name) && 
+          !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb') && 
+          !method(method_name)&.source_location&.first&.include?('glimmer/swt/widget_proxy.rb')
       end
 
       def get_attribute(attribute_name)
@@ -229,13 +228,14 @@ module Glimmer
         end
       end
 
-      def dispose
-        body_root.dispose
-      end
-      
       def method_missing(method, *args, &block)
         body_root.send(method, *args, &block)
       end
+      
+      def respond_to?(method, *args, &block)
+        super or
+          body_root.respond_to?(method, *args, &block)
+      end
 
       private
 

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2020-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.9.5
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: