glimmer-dsl-swt 4.18.4.1 → 4.18.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed016ed2527818f682cb4247d294bf16ddcc8ccddb81f5bd26fa518b0592d4a1
-  data.tar.gz: 2c2d0e7fdc9921ab9861d1151686907d809cd072e0e5651889b4f08851c19791
+  metadata.gz: 3c4acc7755917941e9c8fd7d94f7712d29701ca4eefd1b31b20a9a46d41ec557
+  data.tar.gz: 3f59ee7617453a88165fa57594bcff2dea9831c70a821c11326ace68d66b8936
 SHA512:
-  metadata.gz: 646cec122f5b18ffdd57be914bdd84f7a5af7729cf66aa98ecfe35477d7bb9c445bb6c0b00436c7aa06a40052cd5d96613a4d3b4470d97990ebb60cf6813323d
-  data.tar.gz: c6af13d3fe035da72d5e60b88cbe1c6ab498e07cd061113c46a248c110f2044349b99050fd576ebc4f2923efa49965a0539da512325e9a76d0512c4c6816c88c
+  metadata.gz: 22e115579a74734199b02ce5e43cb15fd789424f063e0d805ff3e1058ec63067e01ea63df4b794e530a0268803bdd898211db3f31a99fe27c63f9ed21c1cb857
+  data.tar.gz: 85a7683f0e431252bf4e5490895fa029bfc961a17be3a6fa8e1d15ab4a6927acd8ddf834a46ada2dbaa1ce0aaaf68979c477edebae48e77de9c601a5dfd0d658

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+### 4.18.4.2
+
+- Remove Tetris Clear button from High Score dialog (since it is available via menu and is rarely used)
+- Make right control button rotate right with Tetris
+- Avoid adding the widget listeners for read_only data-binding (instead of just relying on ModelBinding raising exceptions)
+- Clean up the meta sample code_text style by removing root composite margins/spacing
+- Made background for top label of Hello, Table! transparent for Windows
+- Fix `glimmer samples` command and Meta-Sample on Windows
+- Fix Tetris on Windows
+- Fix Hello, Canvas on Windows
+- Fix Hello, Canvas Transform when launched from `glimmer samples`
+- Fix Table editing write_on_cancel option use on Windows
+- Fix issue with adding content to the end of a styled text widget breaking line number scrolling
+- Fix issue with code_text not showing line numbers for extra new lines at the end
+
 ### 4.18.4.1
 
 - Support data-binding of `code_text` with lines enabled.

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 4.18.4.1
+# [<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 4.18.4.2
 ## JRuby Desktop Development GUI Framework
 [![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)
@@ -490,7 +490,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.4.1
+jgem install glimmer-dsl-swt -v 4.18.4.2
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -508,7 +508,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 4.18.4.1'
+gem 'glimmer-dsl-swt', '~> 4.18.4.2'
 ```
 
 And, then run:
@@ -566,7 +566,7 @@ bin/glimmer samples
 Below are the full usage instructions that come up when running `glimmer` without args.
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.4.1
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.4.2
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 
@@ -588,8 +588,8 @@ Tasks are run via rake. Some tasks take arguments in square brackets.
 
 Available tasks are below (if you do not see any, please add `require 'glimmer/rake_task'` to Rakefile and rerun or run rake -T):
 
-Select a Glimmer task to run: (Press ↑/↓ arrow to move, Enter to select and letters to filter)
-‣ glimmer list:gems:customshell[query]                       # List Glimmer custom shell gems available at rubygems.org (query is optional) [alt: list:gems:cs]
+Select a Glimmer task to run: (Press ↑/↓ arrow to move, Enter to select and letters to filter)
+‣ glimmer list:gems:customshell[query]                       # List Glimmer custom shell gems available at rubygems.org (query is optional) [alt: list:gems:cs]
   glimmer list:gems:customwidget[query]                      # List Glimmer custom widget gems available at rubygems.org (query is optional) [alt: list:gems:cw]
   glimmer list:gems:dsl[query]                               # List Glimmer DSL gems available at rubygems.org (query is optional)
   glimmer package[type]                                      # Package app for distribution (generating config, jar, and native files) (type is optional)
@@ -1045,7 +1045,7 @@ Output:
                                                                          
   Css    glimmer-dsl-css    1.1.0     AndyMaleh    Glimmer DSL for CSS
   Opal   glimmer-dsl-opal   0.10.2     AndyMaleh    Glimmer DSL for Opal
-  Swt    glimmer-dsl-swt    4.18.4.1  AndyMaleh    Glimmer DSL for SWT
+  Swt    glimmer-dsl-swt    4.18.4.2  AndyMaleh    Glimmer DSL for SWT
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk
   Xml    glimmer-dsl-xml    1.1.0     AndyMaleh    Glimmer DSL for XML
 ```

data/VERSION

@@ -1 +1 @@
-4.18.4.1
+4.18.4.2

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.18.4.1 ruby lib
+# stub: glimmer-dsl-swt 4.18.4.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.4.1"
+  s.version = "4.18.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2021-02-03"
+  s.date = "2021-02-04"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI cross-platform desktop development library written in JRuby, an OS-threaded faster JVM version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models (test-first) afterwards. Not only does Glimmer provide a large set of GUI widgets, but it also supports drawing Canvas Graphics like Shapes and Animations. To get started quickly, Glimmer offers scaffolding options for Apps, Gems, and Custom Widgets. Glimmer also includes native-executable packaging support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in Ruby as truly native DMG/PKG/APP files on the Mac + App Store, MSI/EXE files on Windows, and Gem Packaged Shell Scripts on Linux.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -156,6 +156,7 @@ Gem::Specification.new do |s|
     "samples/hello/hello_canvas.rb",
     "samples/hello/hello_canvas_animation.rb",
     "samples/hello/hello_canvas_transform.rb",
+    "samples/hello/hello_canvas_transform/hello_canvas_transform_image.png",
     "samples/hello/hello_checkbox.rb",
     "samples/hello/hello_checkbox_group.rb",
     "samples/hello/hello_code_text.rb",

data/lib/glimmer/swt/custom/code_text.rb

@@ -95,15 +95,19 @@ module Glimmer
               
               @line_numbers_styled_text_proxy = styled_text(swt(swt(swt_style), :h_scroll!, :v_scroll!)) {
                 layout_data(:right, :fill, false, true)
-                text ' '*lines_width.to_i
                 text bind(self, :styled_text_proxy_text, read_only: true) { |text_value|
-                  line_count = text_value.to_s.split("\n").count
+                  line_count = "#{text_value} ".split("\n").count
                   line_count = 1 if line_count == 0
                   lines_text_size = [line_count.to_s.size, @lines_width].max
                   if lines_text_size > @lines_width
-                    async_exec { swt_widget.layout }
+                    async_exec {
+                      swt_widget.layout
+                    }
                     @lines_width = lines_text_size
                   end
+                  async_exec {
+                    @line_numbers_styled_text_proxy&.top_pixel = styled_text_proxy_top_pixel
+                  }
                   line_count.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n") + "\n"
                 }
                 top_pixel bind(self, :styled_text_proxy_top_pixel, read_only: true)

data/lib/glimmer/swt/table_proxy.rb

@@ -497,12 +497,12 @@ module Glimmer
         @finish_edit = lambda do |event=nil|
           new_value = @table_editor_widget_proxy&.send(widget_value_property)
           if table_item.isDisposed
-            @cancel_edit.call
+            @cancel_edit.call unless write_on_cancel
           elsif !new_value.nil? && !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
+              @cancel_edit.call unless write_on_cancel
             else
               if before_write&.arity == 0
                 before_write&.call

data/lib/glimmer/swt/widget_proxy.rb

@@ -565,9 +565,11 @@ module Glimmer
 
       # Used for data-binding only. Consider renaming or improving to avoid the confusion it causes
       def add_observer(observer, property_name)
-        property_listener_installers = @swt_widget.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact
-        widget_listener_installers = property_listener_installers.map{|installer| installer[property_name.to_s.to_sym]}.compact if !property_listener_installers.empty?
-        widget_listener_installers.to_a.first&.call(observer)
+        if !observer.respond_to?(:binding_options) || !observer.binding_options[:read_only]
+          property_listener_installers = @swt_widget.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact
+          widget_listener_installers = property_listener_installers.map{|installer| installer[property_name.to_s.to_sym]}.compact if !property_listener_installers.empty?
+          widget_listener_installers.to_a.first&.call(observer)
+        end
       end
 
       def remove_observer(observer, property_name)

data/samples/elaborate/meta_sample.rb

@@ -20,7 +20,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'fileutils'
-require 'etc'
 
 class Sample
   include Glimmer::DataBinding::ObservableModel
@@ -31,7 +30,7 @@ class Sample
     end
   
     def user_glimmer_directory
-      File.join(Etc.getpwuid.dir, '.glimmer-dsl-swt')
+      File.join(File.expand_path('~'), '.glimmer-dsl-swt')
     end
     
     def ensure_user_glimmer_directory
@@ -264,12 +263,21 @@ class MetaSampleApplication
           }
         }
             
-        @code_text = code_text(lines: {width: 2}) {
-          text bind(SampleDirectory, 'selected_sample.code', read_only: true)
-          editable bind(SampleDirectory, 'selected_sample.editable')
+        @code_text = code_text(lines: {width: 3}) {
+          root {
+            grid_layout(2, false) {
+              horizontal_spacing 0
+              margin_width 0
+              margin_height 0
+            }
+          }
           line_numbers {
             background :white
           }
+          text bind(SampleDirectory, 'selected_sample.code', read_only: true)
+          editable bind(SampleDirectory, 'selected_sample.editable')
+          left_margin 7
+          right_margin 7
         }
         
         weights 4, 11

data/samples/elaborate/tetris.rb

@@ -69,14 +69,12 @@ class Tetris
           game.left!
         when swt(:arrow_right), 'd'.bytes.first
           game.right!
-        when swt(:shift), swt(:alt)
+        when swt(:shift), swt(:alt), swt(:ctrl)
           if key_event.keyLocation == swt(:right) # right shift key
             game.rotate!(:right)
           elsif key_event.keyLocation == swt(:left) # left shift key
             game.rotate!(:left)
           end
-        when swt(:ctrl)
-          game.rotate!(:left)
         end
       }
       

data/samples/elaborate/tetris/model/game.rb

@@ -20,7 +20,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'fileutils'
-require 'etc'
 require 'json'
 require 'glimmer/data_binding/observer'
 require 'glimmer/config'
@@ -112,7 +111,7 @@ class Tetris
       end
       
       def tetris_dir
-        @tetris_dir ||= File.join(Etc.getpwuid.dir, '.glimmer-tetris')
+        @tetris_dir ||= File.join(File.expand_path('~'), '.glimmer-tetris')
       end
       
       def tetris_high_score_file

data/samples/elaborate/tetris/view/high_score_dialog.rb

@@ -71,13 +71,6 @@ class Tetris
           composite {
             row_layout :horizontal
                         
-            button {
-              text 'Clear'
-              
-              on_widget_selected {
-                game.clear_high_scores!
-              }
-            }
             @play_close_button = button {
               text bind(game, :game_over) {|game_over| game_over ? 'Play Again?' : 'Close'}
               focus true # initial focus

data/samples/hello/hello_canvas_transform.rb

@@ -1,6 +1,6 @@
 include Glimmer
 
-glimmer_logo = File.expand_path('../../images/glimmer-logo-hi-res.png', __dir__)
+glimmer_logo = File.expand_path('./hello_canvas_transform/hello_canvas_transform_image.png', __dir__)
 
 shell {
   text 'Hello, Canvas Transform!'

data/samples/hello/hello_table.rb

@@ -192,6 +192,7 @@ class HelloTable
         layout_data :center, :center, true, false
         
         text 'BASEBALL PLAYOFF SCHEDULE'
+        background :transparent
         foreground rgb(94, 107, 103)
         font name: 'Optima', height: 38, style: :bold
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.4.1
+  version: 4.18.4.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -489,6 +489,7 @@ files:
 - samples/hello/hello_canvas.rb
 - samples/hello/hello_canvas_animation.rb
 - samples/hello/hello_canvas_transform.rb
+- samples/hello/hello_canvas_transform/hello_canvas_transform_image.png
 - samples/hello/hello_checkbox.rb
 - samples/hello/hello_checkbox_group.rb
 - samples/hello/hello_code_text.rb