glimmer-dsl-swt 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87bcff5d2b652ab8238bfa4860c5c7710e56155712aafc80dd3f8a4acd6a080c
-  data.tar.gz: 7b4dd240b1af86fa39233dec7b9e1e514245ec35513a1589510d0ab21ffbdf9b
+  metadata.gz: '0281642708bc9fc3c57d913c1b1a33e4f9699e6999d290467bbaf02b706319cb'
+  data.tar.gz: 9499e48b14742b2034321631edc06be69212fc0c762a13727ad70cf880d86b6f
 SHA512:
-  metadata.gz: 302644cbe7cbfc6c416585ab4c8d6cc38447ea0a3cb98eaf34473d8b0760f03d67eb9f59616ccf6d4e77b7cfc6112432dcdf6d16a5ccb310d90002ab2e39496d
-  data.tar.gz: efac7d222037f8e3434750c514b6afedcef6faefc60911291261387a4f0639ba73fb7d5f152abebfbc0ba6097701c124b83ca0975a0244add554cb58ab720a80
+  metadata.gz: 7ad2211fa73e076d2993e3e487547cf486c96f500406666f6e9c3a16351c87f118337478b29fea0bd469d937ae7225520fc2efb55259db94766a97313990f9cc
+  data.tar.gz: 66312d638303de3ed1e6c100e4d4bec21c7b6e52203cfc2ef9368b2df7bb0662d08859f96be50fa4928dad10c88b112e71510c75de71f48ee818c7818c0dbbbd

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 0.5.4 (Desktop GUI)
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 0.5.5 (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.5.4
+0.5.5

data/lib/glimmer/package.rb

@@ -21,7 +21,7 @@ module Glimmer
           system('warble config')
           new_config = File.read('config/warble.rb').split("\n").inject('') do |output, line|
             if line.include?('config.dirs =')
-              line = line.sub('# ', '').sub(/=[^=\n]+$/, '= %w(app config db lib script bin docs fonts icons images sounds videos vendor)')
+              line = line.sub('# ', '').sub(/=[^=\n]+$/, '= %w(app bin config db docs fonts icons images lib package script sounds vendor videos)')
             end
             if line.include?('config.includes =')
               line = line.sub('# ', '').sub(/=[^=\n]+$/, "= FileList['LICENSE.txt', 'VERSION']")

data/lib/glimmer/swt/color_proxy.rb

@@ -5,7 +5,7 @@ module Glimmer
   module SWT
     # Proxy for org.eclipse.swt.graphics.Color
     #
-    # Invoking `#swt_color` returns the SWT color object wrapped by this proxy
+    # Invoking `#swt_color` returns the SWT Color object wrapped by this proxy
     #
     # Follows the Proxy Design Pattern
     class ColorProxy

data/lib/glimmer/swt/image_proxy.rb

@@ -0,0 +1,63 @@
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.graphics.Image
+    #
+    # Invoking `#swt_image` returns the SWT Image object wrapped by this proxy
+    #
+    # Follows the Proxy Design Pattern
+    class ImageProxy
+      include_package 'org.eclipse.swt.graphics'
+      
+      attr_reader :jar_file_path, :image_data
+
+      # Initializes a proxy for an SWT Image object
+      #
+      # Takes the same args as the SWT Image class
+      # Alternatively, takes a file path string or a uri:classloader file path string (generated by JRuby when invoking `File.expand_path` inside a JAR file)
+      # and returns an image object.
+      def initialize(*args)
+        @args = args
+        @jar_file_path = @args.first if @args.first.is_a?(String) && @args.size == 1
+        
+      end
+
+      def swt_image
+        unless @swt_image
+          if @jar_file_path
+            file_path = @jar_file_path
+            if file_path.start_with?('uri:classloader')
+              file_path = file_path.sub(/^uri\:classloader\:/, '').sub('//', '/') # the latter sub is needed for Mac
+              object = java.lang.Object.new
+              file_input_stream = object.java_class.resource_as_stream(file_path)
+              buffered_file_input_stream = java.io.BufferedInputStream.new(file_input_stream)
+            end
+            @image_data = ImageData.new(buffered_file_input_stream || file_path)
+            @swt_image = Image.new(DisplayProxy.instance.swt_display, @image_data)
+          else
+            @swt_image = Image.new(*@args)
+          end
+        end
+        @swt_image
+      end
+      
+      def scale_to(width, height)
+        return @swt_image if image_data.nil?
+        scaled_image_data = image_data.scaledTo(width, height)
+        device = swt_image.device
+        swt_image.dispose
+        @swt_image = Image.new(device, scaled_image_data)
+      end
+      
+      def method_missing(method, *args, &block)
+        swt_image.send(method, *args, &block)
+      rescue => e
+        Glimmer::Config.logger.debug {"Neither ImageProxy nor #{swt_image.class.name} can handle the method ##{method}"}
+        super
+      end
+      
+      def respond_to?(method, *args, &block)
+        super || swt_image.respond_to?(method, *args, &block)
+      end      
+    end
+  end
+end

data/lib/glimmer/swt/shell_proxy.rb

@@ -130,7 +130,7 @@ module Glimmer
           begin
             @display.sleep unless @display.readAndDispatch
           rescue => e
-            Glimmer::Config.logger.debug {e.full_message}
+            Glimmer::Config.logger.info {e.full_message}
           end
         end
       end

data/lib/glimmer/swt/widget_proxy.rb

@@ -3,6 +3,7 @@ require 'glimmer/swt/color_proxy'
 require 'glimmer/swt/font_proxy'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/dnd_proxy'
+require 'glimmer/swt/image_proxy'
 
 # TODO refactor to make file smaller and extract sub-widget-proxies out of this
 
@@ -590,21 +591,18 @@ module Glimmer
         @property_type_converters ||= {
           :background => color_converter,
           :background_image => lambda do |value|
+            image_proxy = nil
             if value.is_a?(String)
-              if value.start_with?('uri:classloader')
-                value = value.sub(/^uri\:classloader\:/, '')
-                object = java.lang.Object.new
-                value = object.java_class.resource_as_stream(value)
-                value = java.io.BufferedInputStream.new(value)
-              end
-              image_data = ImageData.new(value)
-              # TODO in the future, look into unregistering this listener when no longer needed
+              image_proxy = ImageProxy.new(value)
+            elsif value.is_a?(Array)
+              image_proxy = ImageProxy.new(*value)
+            end
+            if image_proxy
               on_swt_Resize do |resize_event|
-                new_image_data = image_data.scaledTo(@swt_widget.getSize.x, @swt_widget.getSize.y)
-                @swt_widget.getBackgroundImage&.dispose
-                @swt_widget.setBackgroundImage(Image.new(@swt_widget.getDisplay, new_image_data))
+                image_proxy.scale_to(@swt_widget.getSize.x, @swt_widget.getSize.y)
+                @swt_widget.setBackgroundImage(image_proxy.swt_image)
               end
-              Image.new(@swt_widget.getDisplay, image_data)
+              image_proxy.swt_image
             else
               value
             end
@@ -620,14 +618,9 @@ module Glimmer
           end,
           :image => lambda do |value|
             if value.is_a?(String)
-              if value.start_with?('uri:classloader')
-                value = value.sub(/^uri\:classloader\:/, '')
-                object = java.lang.Object.new
-                value = object.java_class.resource_as_stream(value)
-                value = java.io.BufferedInputStream.new(value)
-              end
-              image_data = ImageData.new(value)
-              Image.new(@swt_widget.getDisplay, image_data)
+              ImageProxy.new(value).swt_image
+            elsif value.is_a?(Array)
+              ImageProxy.new(*value).swt_image
             else
               value
             end
@@ -635,14 +628,9 @@ module Glimmer
           :images => lambda do |array|
             array.to_a.map do |value|
               if value.is_a?(String)
-                if value.start_with?('uri:classloader')
-                  value = value.sub(/^uri\:classloader\:/, '')
-                  object = java.lang.Object.new
-                  value = object.java_class.resource_as_stream(value)
-                  value = java.io.BufferedInputStream.new(value)
-                end
-                image_data = ImageData.new(value)
-                Image.new(@swt_widget.getDisplay, image_data)
+                ImageProxy.new(value).swt_image
+              elsif value.is_a?(Array)
+                ImageProxy.new(*value).swt_image
               else
                 value
               end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -344,6 +344,7 @@ files:
 - lib/glimmer/swt/display_proxy.rb
 - lib/glimmer/swt/dnd_proxy.rb
 - lib/glimmer/swt/font_proxy.rb
+- lib/glimmer/swt/image_proxy.rb
 - lib/glimmer/swt/layout_data_proxy.rb
 - lib/glimmer/swt/layout_proxy.rb
 - lib/glimmer/swt/menu_proxy.rb