glimmer 0.7.3 → 0.7.8

data/lib/glimmer/swt/shell_proxy.rb

@@ -47,7 +47,7 @@ module Glimmer
             Thread.new do      
               sleep(0.25)
               async_exec do
-                @swt_widget.setActive
+                @swt_widget.setActive unless @swt_widget.isDisposed
               end
             end
           end
@@ -102,15 +102,12 @@ module Glimmer
       end
 
       def pack_same_size
-        minimum_size = @swt_widget.getMinimumSize
         bounds = @swt_widget.getBounds
         width = @swt_widget.getBounds.width
         height = @swt_widget.getBounds.height
         x = @swt_widget.getBounds.x
         y = @swt_widget.getBounds.y
-        @swt_widget.setMinimumSize(bounds.width, bounds.height)
         @swt_widget.pack
-        @swt_widget.setMinimumSize(minimum_size)
         @swt_widget.setSize(width, height)
         @swt_widget.setLocation(x, y)
       end

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -54,6 +54,12 @@ module Glimmer
           super(attribute_name)
         end
       end
+      
+      def dispose
+        swt_tab_item.setControl(nil)
+        swt_widget.dispose
+        swt_tab_item.dispose
+      end
     end
   end
 end

data/lib/glimmer/swt/tree_proxy.rb

@@ -0,0 +1,120 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class TreeProxy < Glimmer::SWT::WidgetProxy
+      include Glimmer
+      
+      attr_reader :tree_editor, :tree_editor_text_proxy
+      attr_accessor :tree_properties
+      
+      def initialize(underscored_widget_name, parent, args)
+        super
+        @tree_editor = TreeEditor.new(swt_widget)
+        @tree_editor.horizontalAlignment = SWTProxy[:left]
+        @tree_editor.grabHorizontal = true
+        @tree_editor.minimumHeight = 20
+      end
+    
+      # Performs depth first search for tree items matching block condition
+      # If no condition block is passed, returns all tree items
+      # Returns a Java TreeItem array to easily set as selection on org.eclipse.swt.Tree if needed
+      def depth_first_search(&condition)
+        found = []
+        recursive_depth_first_search(swt_widget.getItems.first, found, &condition)
+        found.to_java(TreeItem)
+      end
+      
+      # Returns all tree items including descendants
+      def all_tree_items
+        depth_first_search
+      end
+
+      def widget_property_listener_installers
+        super.merge({
+          Java::OrgEclipseSwtWidgets::Tree => {
+            selection: lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(@swt_widget.getSelection)
+              }
+            end
+          },        
+        })
+      end
+      
+      def edit_in_progress?
+        !!@edit_in_progress
+      end
+      
+      def edit_selected_tree_item(before_write: nil, after_write: nil, after_cancel: nil)
+        edit_tree_item(swt_widget.getSelection.first, before_write: before_write, after_write: after_write, after_cancel: after_cancel)
+      end
+            
+      def edit_tree_item(tree_item, before_write: nil, after_write: nil, after_cancel: nil)
+        return if tree_item.nil?
+        content {
+          @tree_editor_text_proxy = text {
+            focus true
+            text tree_item.getText
+            action_taken = false
+            cancel = lambda {
+              @tree_editor_text_proxy.swt_widget.dispose
+              @tree_editor_text_proxy = nil
+              after_cancel&.call
+              @edit_in_progress = false
+            }
+            action = lambda { |event|
+              if !action_taken && !@edit_in_progress
+                action_taken = true
+                @edit_in_progress = true
+                new_text = @tree_editor_text_proxy.swt_widget.getText
+                if new_text == tree_item.getText
+                  cancel.call
+                else
+                  before_write&.call
+                  tree_item.setText(new_text)
+                  model = tree_item.getData
+                  model.send("#{tree_properties[:text]}=", new_text) # makes tree update itself, so must search for selected tree item again
+                  edited_tree_item = depth_first_search { |ti| ti.getData == model }.first
+                  swt_widget.showItem(edited_tree_item)
+                  @tree_editor_text_proxy.swt_widget.dispose
+                  @tree_editor_text_proxy = nil
+                  after_write&.call(edited_tree_item)
+                  @edit_in_progress = false
+                end
+              end
+            }
+            on_focus_lost(&action)
+            on_key_pressed { |key_event|
+              if key_event.keyCode == swt(:cr)
+                action.call(key_event)
+              elsif key_event.keyCode == swt(:esc)
+                cancel.call
+              end
+            }
+          }
+          @tree_editor_text_proxy.swt_widget.selectAll
+        }
+        @tree_editor.setEditor(@tree_editor_text_proxy.swt_widget, tree_item);      
+      end
+      
+      private
+
+      def recursive_depth_first_search(tree_item, found, &condition)
+        return if tree_item.nil?
+        found << tree_item if condition.nil? || condition.call(tree_item)
+        tree_item.getItems.each do |child_tree_item|
+          recursive_depth_first_search(child_tree_item, found, &condition)
+        end
+      end
+      
+      def property_type_converters
+        super.merge({
+          selection: lambda do |value|
+            depth_first_search {|ti| ti.getData == value}
+          end,
+        })
+      end
+    end
+  end
+end

data/lib/glimmer/swt/widget_listener_proxy.rb

@@ -5,12 +5,29 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class WidgetListenerProxy
 
-      attr_reader :swt_listener
+      attr_reader :swt_widget, :swt_listener, :widget_add_listener_method, :swt_listener_class, :swt_listener_method, :event_type, :swt_constant
 
-      # TODO capture its widget and support unregistering 
-
-      def initialize(swt_listener)
+      def initialize(swt_widget:, swt_listener:, widget_add_listener_method: nil, swt_listener_class: nil, swt_listener_method: nil, event_type: nil, swt_constant: nil)
+        @swt_widget = swt_widget
         @swt_listener = swt_listener
+        @widget_add_listener_method = widget_add_listener_method
+        @swt_listener_class = swt_listener_class
+        @swt_listener_method = swt_listener_method
+        @event_type = event_type
+        @swt_constant = swt_constant
+      end
+      
+      def widget_remove_listener_method
+        @widget_add_listener_method.sub('add', 'remove')
+      end      
+      
+      def unregister
+        # TODO consider renaming to deregister (and in Observer too)
+        if @event_type
+          @swt_widget.removeListener(@event_type, @swt_listener)
+        else
+          @swt_widget.send(widget_remove_listener_method, @swt_listener)
+        end
       end
     end
   end

data/lib/glimmer/swt/widget_proxy.rb

@@ -5,6 +5,8 @@ require 'glimmer/swt/font_proxy'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/data_binding/observable_widget'
 
+# TODO refactor to make file smaller and extract sub-widget-proxies out of this
+
 module Glimmer
   module SWT
     # Proxy for SWT Widget objects
@@ -23,6 +25,7 @@ module Glimmer
       DEFAULT_STYLES = {
         "text"        => [:border],
         "table"       => [:border],
+        "tree"       =>  [:virtual, :border, :h_scroll, :v_scroll],
         "spinner"     => [:border],
         "styled_text" => [:border],
         "list"        => [:border, :v_scroll],
@@ -31,17 +34,17 @@ module Glimmer
       }
 
       DEFAULT_INITIALIZERS = {
-        "composite" => proc do |composite|
+        "composite" => lambda do |composite|
           composite.setLayout(GridLayout.new)
         end,
-        "table" => proc do |table|
+        "table" => lambda do |table|
           table.setHeaderVisible(true)
           table.setLinesVisible(true)
         end,
-        "table_column" => proc do |table_column|
+        "table_column" => lambda do |table_column|
           table_column.setWidth(80)
         end,
-        "group" => proc do |group|
+        "group" => lambda do |group|
           group.setLayout(GridLayout.new)
         end,
       }
@@ -119,7 +122,7 @@ module Glimmer
       def widget_property_listener_installers
         @swt_widget_property_listener_installers ||= {
           Java::OrgEclipseSwtWidgets::Control => {
-            :focus => proc do |observer|
+            :focus => lambda do |observer|
               on_focus_gained { |focus_event|
                 observer.call(true)
               }
@@ -129,12 +132,12 @@ module Glimmer
             end,
           },
           Java::OrgEclipseSwtWidgets::Text => {
-            :text => proc do |observer|
+            :text => lambda do |observer|
               on_modify_text { |modify_event|
                 observer.call(@swt_widget.getText)
               }
             end,
-            :caret_position => proc do |observer|
+            :caret_position => lambda do |observer|
               on_event_keydown { |event|
                 observer.call(@swt_widget.getCaretPosition)
               }
@@ -148,7 +151,21 @@ module Glimmer
                 observer.call(@swt_widget.getCaretPosition)
               }
             end,
-            :selection_count => proc do |observer|
+            :selection => lambda do |observer|
+              on_event_keydown { |event|
+                observer.call(@swt_widget.getSelection)
+              }
+              on_event_keyup { |event|
+                observer.call(@swt_widget.getSelection)
+              }
+              on_event_mousedown { |event|
+                observer.call(@swt_widget.getSelection)
+              }
+              on_event_mouseup { |event|
+                observer.call(@swt_widget.getSelection)
+              }
+            end,
+            :selection_count => lambda do |observer|
               on_event_keydown { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
@@ -162,7 +179,7 @@ module Glimmer
                 observer.call(@swt_widget.getSelectionCount)
               }
             end,
-            :top_index => proc do |observer|
+            :top_index => lambda do |observer|
               @last_top_index = @swt_widget.getTopIndex
               on_paint_control { |event|
                 if @swt_widget.getTopIndex != @last_top_index
@@ -173,33 +190,33 @@ module Glimmer
             end,
           },
           Java::OrgEclipseSwtCustom::StyledText => {
-            :text => proc do |observer|
+            :text => lambda do |observer|
               on_modify_text { |modify_event|
                 observer.call(@swt_widget.getText)
               }
             end,
           },
           Java::OrgEclipseSwtWidgets::Button => {
-            :selection => proc do |observer|
+            :selection => lambda do |observer|
               on_widget_selected { |selection_event|
                 observer.call(@swt_widget.getSelection)
               }
             end
           },
           Java::OrgEclipseSwtWidgets::MenuItem => {
-            :selection => proc do |observer|
+            :selection => lambda do |observer|
               on_widget_selected { |selection_event|
                 observer.call(@swt_widget.getSelection)
               }
             end
           },
           Java::OrgEclipseSwtWidgets::Spinner => {
-            :selection => proc do |observer|
+            :selection => lambda do |observer|
               on_widget_selected { |selection_event|
                 observer.call(@swt_widget.getSelection)
               }
             end
-          }
+          },
         }
       end
 
@@ -321,10 +338,12 @@ module Glimmer
       end
 
       def add_listener(underscored_listener_name, &block)
-        widget_add_listener_method, listener_class, listener_method = self.class.find_listener(@swt_widget.getClass, underscored_listener_name)
-        listener = listener_class.new(listener_method => block)
+        widget_add_listener_method, listener_class, listener_method = self.class.find_listener(@swt_widget.getClass, underscored_listener_name)        
+        widget_listener_proxy = nil
+        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }
+        listener = listener_class.new(listener_method => safe_block)
         @swt_widget.send(widget_add_listener_method, listener)
-        WidgetListenerProxy.new(listener)
+        widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: listener, widget_add_listener_method: widget_add_listener_method, swt_listener_class: listener_class, swt_listener_method: listener_method)
       end
 
       # Looks through SWT class add***Listener methods till it finds one for which
@@ -375,8 +394,10 @@ module Glimmer
 
       def add_swt_event_listener(swt_constant, &block)
         event_type = SWTProxy[swt_constant]
-        @swt_widget.addListener(event_type, &block)
-        WidgetListenerProxy.new(@swt_widget.getListeners(event_type).last)
+        widget_listener_proxy = nil
+        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }
+        @swt_widget.addListener(event_type, &safe_block)
+        widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: @swt_widget.getListeners(event_type).last, event_type: event_type, swt_constant: swt_constant)
       end
 
       def widget_custom_attribute_mapping
@@ -409,7 +430,7 @@ module Glimmer
       end
 
       def property_type_converters
-        color_converter = proc do |value|
+        color_converter = lambda do |value|
           if value.is_a?(Symbol) || value.is_a?(String)
             ColorProxy.new(value).swt_color
           else
@@ -419,7 +440,7 @@ module Glimmer
         # TODO consider detecting type on widget method and automatically invoking right converter (e.g. :to_s for String, :to_i for Integer)
         @property_type_converters ||= {
           :background => color_converter,
-          :background_image => proc do |value|
+          :background_image => lambda do |value|
             if value.is_a?(String)
               if value.start_with?('uri:classloader')
                 value = value.sub(/^uri\:classloader\:\//, '')
@@ -440,7 +461,7 @@ module Glimmer
             end
           end,
           :foreground => color_converter,
-          :font => proc do |value|
+          :font => lambda do |value|
             if value.is_a?(Hash)
               font_properties = value
               FontProxy.new(self, font_properties).swt_font
@@ -448,17 +469,17 @@ module Glimmer
               value
             end
           end,
-          :items => proc do |value|
+          :items => lambda do |value|
             value.to_java :string
           end,
-          :text => proc do |value|
+          :text => lambda do |value|
             if swt_widget.is_a?(Browser)
               value.to_s
             else
               value.to_s
             end
           end,
-          :visible => proc do |value|
+          :visible => lambda do |value|
             !!value
           end,
         }

data/lib/glimmer/ui/custom_widget.rb

@@ -83,7 +83,7 @@ module Glimmer
           else
             new_options = new_options.reduce({}) {|new_options_hash, new_option| new_options_hash.merge(new_option => nil)}
             @options = options.merge(new_options)
-            def_option_attr_readers(new_options)
+            def_option_attr_accessors(new_options)
           end
         end
 
@@ -91,15 +91,18 @@ module Glimmer
           new_option = new_option.to_s.to_sym
           new_options = {new_option => new_option_default}
           @options = options.merge(new_options)
-          def_option_attr_readers(new_options)
+          def_option_attr_accessors(new_options)
         end
 
-        def def_option_attr_readers(new_options)
+        def def_option_attr_accessors(new_options)
           new_options.each do |option, default|
             class_eval <<-end_eval, __FILE__, __LINE__
               def #{option}
                 options[:#{option}]
               end
+              def #{option}=(option_value)
+                self.options[:#{option}] = option_value
+              end
             end_eval
           end
         end
@@ -224,6 +227,10 @@ module Glimmer
       def dispose
         body_root.dispose
       end
+      
+      def method_missing(method, *args, &block)
+        body_root.send(method, *args, &block)
+      end
 
       private
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.8
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-16 00:00:00.000000000 Z
+date: 2020-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -150,34 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-  name: coveralls
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  name: simplecov
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -192,9 +164,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
-description: JRuby Desktop UI DSL + Data-Binding native-UI cross-platform library
-  that enables productive and efficient authoring of desktop user-interfaces using
-  the robust Eclipse SWT library
+description: Desktop Development Library for Ruby
 email: andy.am@gmail.com
 executables:
 - glimmer
@@ -202,10 +172,10 @@ executables:
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
-- README.markdown
+- README.md
 files:
 - LICENSE.txt
-- README.markdown
+- README.md
 - RUBY_VERSION
 - VERSION
 - bin/girb
@@ -246,6 +216,7 @@ files:
 - lib/glimmer/dsl/swt/combo_selection_data_binding_expression.rb
 - lib/glimmer/dsl/swt/custom_widget_expression.rb
 - lib/glimmer/dsl/swt/data_binding_expression.rb
+- lib/glimmer/dsl/swt/dialog_expression.rb
 - lib/glimmer/dsl/swt/display_expression.rb
 - lib/glimmer/dsl/swt/dsl.rb
 - lib/glimmer/dsl/swt/exec_expression.rb
@@ -292,6 +263,7 @@ files:
 - lib/glimmer/swt/shell_proxy.rb
 - lib/glimmer/swt/swt_proxy.rb
 - lib/glimmer/swt/tab_item_proxy.rb
+- lib/glimmer/swt/tree_proxy.rb
 - lib/glimmer/swt/widget_listener_proxy.rb
 - lib/glimmer/swt/widget_proxy.rb
 - lib/glimmer/ui/custom_shell.rb
@@ -327,5 +299,5 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
-summary: Desktop development library for Ruby
+summary: Desktop Development Library for Ruby
 test_files: []