glimmer 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a991d3df0f065a0caa7cd20d43c026561b99b334b4db9d67d37d54a9aa125a70
-  data.tar.gz: c9660908ac2b7b8d2c00a8af33c793ad8f2789bb513553fb1e8e2b4abf2f3db1
+  metadata.gz: 3682b8fe5b49d283cd803bf1c3bece41e8ca38c54d75836591cdefacc3674ac0
+  data.tar.gz: 1bfa3019ab0281f603a2e63a6044025cbb338d865cc75b3c517c7fef02429441
 SHA512:
-  metadata.gz: 289e423f490a3bb338fa91ab5502b03936c5e03088f48dafbb74aa4b31e606637e873c8b26a46167cb10306cab22ae09a733318ef98382ff424207fb06c93fac
-  data.tar.gz: d6d865f226ab24151983c5c9a3c0dc18bd73d7d4c8ca02a4e99fe4d231500ade3215d245add615e11d1713e39b8a9da5e47006bc13d8406ad4b7208679e38d07
+  metadata.gz: 973bf3fa1920c64d8bdda424513471120790040d362f3a2b32e7f30180220a0993b65875c6dffc5e6a6efa5ae6ce030c51a94da31b9c3fba16d2fce335552049
+  data.tar.gz: b001f5dbce277aff4ee1dbc9eb4b27a424c4b92a08a6ba98e13006a1a2bff8009cde411c88430f0f763d9acc03890cb9fac40d9bb46bfe9ad453cc576e4c2084

data/README.markdown

@@ -1,4 +1,4 @@
-# Glimmer 0.7.2 Beta (JRuby Desktop UI DSL + Data-Binding)
+# Glimmer 0.7.3 Beta (JRuby Desktop UI DSL + Data-Binding)
 [![Gem Version](https://badge.fury.io/rb/glimmer.svg)](http://badge.fury.io/rb/glimmer)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer?branch=master)
 
@@ -6,7 +6,7 @@ Glimmer is a native-UI cross-platform desktop development library written in Rub
 
 ## Examples
 
-### Hello World
+### Hello, World!
 
 Glimmer code (from `samples/hello/hello_world.rb`):
 ```ruby
@@ -71,7 +71,7 @@ NOTE: Glimmer is in beta mode. Please help make better by adopting for small or
 ## Table of Contents
 
 <!-- TOC START min:1 max:3 link:true asterisk:false update:true -->
-- [Glimmer 0.7.2 Beta (JRuby Desktop UI DSL + Data-Binding)](#glimmer-058-beta-jruby-desktop-ui-dsl--data-binding)
+- [Glimmer 0.7.3 Beta (JRuby Desktop UI DSL + Data-Binding)](#glimmer-058-beta-jruby-desktop-ui-dsl--data-binding)
   - [Examples](#examples)
     - [Hello World](#hello-world)
     - [Tic Tac Toe](#tic-tac-toe)
@@ -164,7 +164,7 @@ Please follow these instructions to make the `glimmer` command available on your
 
 Run this command to install directly:
 ```
-jgem install glimmer -v 0.7.2
+jgem install glimmer -v 0.7.3
 ```
 
 `jgem` is JRuby's version of `gem` command. 
@@ -175,7 +175,7 @@ Otherwise, you may also run `jruby -S gem install ...`
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer', '~> 0.7.2'
+gem 'glimmer', '~> 0.7.3'
 ```
 
 And, then run:

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/lib/glimmer/launcher.rb

@@ -3,8 +3,6 @@ require 'rake'
 
 require_relative 'rake_task'
 
-load File.expand_path('./Rakefile') if File.exist?(File.expand_path('./Rakefile'))
-
 module Glimmer
   class Launcher
     OPERATING_SYSTEMS_SUPPORTED = ["mac", "windows", "linux"]
@@ -137,6 +135,7 @@ module Glimmer
     private
 
     def launch_application
+      load File.expand_path('./Rakefile') if File.exist?(File.expand_path('./Rakefile'))
       threads = @application_paths.map do |application_path|
         Thread.new do
           self.class.launch(

data/lib/glimmer/swt/shell_proxy.rb

@@ -20,33 +20,39 @@ module Glimmer
       alias opened_before? opened_before
 
       # Instantiates ShellProxy with same arguments expected by SWT Shell
-      def initialize(*args)
-        if args.first.is_a?(ShellProxy)
-          args[0] = args[0].swt_widget
-        end
-        style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
-        if style_args.any?
-          style_arg_start_index = args.index(style_args.first)
-          style_arg_last_index = args.index(style_args.last)
-          args[style_arg_start_index..style_arg_last_index] = SWTProxy[style_args]
-        end
-        if args.first.nil? || (!args.first.is_a?(Display) && !args.first.is_a?(Shell))
-          @display = DisplayProxy.instance.swt_display
-          args = [@display] + args
-        end
-        args = args.compact
-        @swt_widget = Shell.new(*args)
-        @display ||= @swt_widget.getDisplay
-        @swt_widget.setLayout(FillLayout.new)
-        @swt_widget.setMinimumSize(WIDTH_MIN, HEIGHT_MIN)
-        on_event_show do
-          Thread.new do      
-            sleep(0.25)
-            async_exec do
-              @swt_widget.setActive
+      # if swt_widget keyword arg was passed, then it is assumed the shell has already been instantiated
+      # and the proxy wraps it instead of creating a new one.
+      def initialize(*args, swt_widget: nil)
+        if swt_widget
+          @swt_widget = swt_widget
+        else
+          if args.first.is_a?(ShellProxy)
+            args[0] = args[0].swt_widget
+          end
+          style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
+          if style_args.any?
+            style_arg_start_index = args.index(style_args.first)
+            style_arg_last_index = args.index(style_args.last)
+            args[style_arg_start_index..style_arg_last_index] = SWTProxy[style_args]
+          end
+          if args.first.nil? || (!args.first.is_a?(Display) && !args.first.is_a?(Shell))
+            @display = DisplayProxy.instance.swt_display
+            args = [@display] + args
+          end
+          args = args.compact
+          @swt_widget = Shell.new(*args)
+          @swt_widget.setLayout(FillLayout.new)
+          @swt_widget.setMinimumSize(WIDTH_MIN, HEIGHT_MIN)
+          on_event_show do
+            Thread.new do      
+              sleep(0.25)
+              async_exec do
+                @swt_widget.setActive
+              end
             end
           end
         end
+        @display ||= @swt_widget.getDisplay
       end
 
       # Centers shell within monitor it is in
@@ -98,14 +104,15 @@ module Glimmer
       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)
-        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)
+        @swt_widget.setSize(width, height)
+        @swt_widget.setLocation(x, y)
       end
 
       def content(&block)

data/lib/glimmer/swt/widget_proxy.rb

@@ -102,6 +102,20 @@ module Glimmer
         end
       end
 
+      def pack_same_size
+        bounds = @swt_widget.getBounds
+        listener = on_control_resized {
+          @swt_widget.setSize(bounds.width, bounds.height)
+          @swt_widget.setLocation(bounds.x, bounds.y)
+        }
+        if @swt_widget.is_a?(Composite)
+          @swt_widget.layout(true, true)
+        else
+          @swt_widget.pack(true)
+        end
+        @swt_widget.removeControlListener(listener.swt_listener)
+      end
+
       def widget_property_listener_installers
         @swt_widget_property_listener_installers ||= {
           Java::OrgEclipseSwtWidgets::Control => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -327,5 +327,5 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
-summary: Desktop application development library
+summary: Desktop development library for Ruby
 test_files: []