glimmer 0.7.5 → 0.8.1

data/lib/glimmer/swt/display_proxy.rb

@@ -16,6 +16,8 @@ module Glimmer
     class DisplayProxy
       include_package 'org.eclipse.swt.widgets'
 
+      OBSERVED_MENU_ITEMS = ['about', 'preferences']
+
       class << self
         # Returns singleton instance
         def instance(*args)
@@ -52,6 +54,9 @@ module Glimmer
         if observation_request.start_with?('on_event_')
           constant_name = observation_request.sub(/^on_event_/, '')
           SWTProxy.has_constant?(constant_name)
+        elsif observation_request.start_with?('on_')
+          event_name = observation_request.sub(/^on_/, '')
+          OBSERVED_MENU_ITEMS.include?(event_name)
         else
           false
         end
@@ -61,6 +66,15 @@ module Glimmer
         if observation_request.start_with?('on_event_')
           constant_name = observation_request.sub(/^on_event_/, '')
           add_swt_event_listener(constant_name, &block)
+        elsif observation_request.start_with?('on_')
+          event_name = observation_request.sub(/^on_/, '')
+          if OBSERVED_MENU_ITEMS.include?(event_name)
+            if OS.mac?
+              system_menu = swt_display.getSystemMenu
+              menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
+              menu_item.addListener(SWTProxy[:Selection], &block)
+            end
+          end
         end
       end
 

data/lib/glimmer/swt/menu_proxy.rb

@@ -79,6 +79,23 @@ module Glimmer
           super(attribute_name)
         end
       end
+      
+      def can_handle_observation_request?(observation_request, super_only: false)
+        super_result = super(observation_request)
+        if observation_request.start_with?('on_') && !super_result && !super_only
+          return menu_item_proxy.can_handle_observation_request?(observation_request)
+        else
+          super_result
+        end
+      end
+      
+      def handle_observation_request(observation_request, &block)
+        if can_handle_observation_request?(observation_request, super_only: true)
+          super
+        else
+          menu_item_proxy.handle_observation_request(observation_request, &block)
+        end
+      end      
     end
   end
 end

data/lib/glimmer/swt/shell_proxy.rb

@@ -14,7 +14,6 @@ module Glimmer
 
       WIDTH_MIN = 130
       HEIGHT_MIN = 0
-      OBSERVED_MENU_ITEMS = ['about', 'preferences']
 
       attr_reader :opened_before
       alias opened_before? opened_before
@@ -47,7 +46,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
@@ -107,9 +106,21 @@ module Glimmer
         height = @swt_widget.getBounds.height
         x = @swt_widget.getBounds.x
         y = @swt_widget.getBounds.y
-        @swt_widget.pack
-        @swt_widget.setSize(width, height)
-        @swt_widget.setLocation(x, y)
+        if OS.windows?
+          minimum_size = @swt_widget.getMinimumSize
+          @swt_widget.setMinimumSize(bounds.width, bounds.height)
+          listener = on_control_resized {
+            @swt_widget.setSize(bounds.width, bounds.height)
+            @swt_widget.setLocation(bounds.x, bounds.y)
+          }
+          @swt_widget.pack
+          @swt_widget.removeControlListener(listener.swt_listener)
+          @swt_widget.setMinimumSize(minimum_size)
+        else
+          @swt_widget.pack
+          @swt_widget.setSize(width, height)
+          @swt_widget.setLocation(x, y)
+        end
       end
 
       def content(&block)
@@ -128,30 +139,6 @@ module Glimmer
         end
       end
 
-      def can_handle_observation_request?(observation_request)
-        result = false
-        if observation_request.start_with?('on_')
-          event_name = observation_request.sub(/^on_/, '')
-          result = OBSERVED_MENU_ITEMS.include?(event_name)
-        end
-        result || super
-      end
-
-      def handle_observation_request(observation_request, &block)
-        if observation_request.start_with?('on_')
-          event_name = observation_request.sub(/^on_/, '')
-          if OBSERVED_MENU_ITEMS.include?(event_name)
-            if OS.mac?
-              system_menu = DisplayProxy.instance.swt_display.getSystemMenu
-              menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
-              menu_item.addListener(SWTProxy[:Selection], &block)
-            end
-          else
-            super
-          end
-        end
-      end
-
       def add_observer(observer, property_name)
         case property_name.to_s
         when 'visible?' #TODO see if you must handle non-? version and/or move elsewhere

data/lib/glimmer/swt/widget_proxy.rb

@@ -151,6 +151,20 @@ module Glimmer
                 observer.call(@swt_widget.getCaretPosition)
               }
             end,
+            :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)

data/lib/glimmer/ui/custom_widget.rb

@@ -70,7 +70,7 @@ module Glimmer
           @custom_widget_namespaces = Set[Object, Glimmer::UI]
         end
 
-        # Allows defining convenience option readers for an array of option names
+        # Allows defining convenience option accessors for an array of option names
         # Example: `options :color1, :color2` defines `#color1` and `#color2`
         # where they return the instance values `options[:color1]` and `options[:color2]`
         # respectively.
@@ -83,23 +83,26 @@ 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
 
-        def option(new_option, new_option_default = nil)
+        def option(new_option, default: nil)
           new_option = new_option.to_s.to_sym
-          new_options = {new_option => new_option_default}
+          new_options = {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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-06-03 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: Ruby Desktop Development GUI Library
 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
@@ -328,5 +299,5 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
-summary: Desktop development library for Ruby
+summary: Ruby Desktop Development GUI Library
 test_files: []