glimmer-dsl-swt 4.17.4.1 → 4.17.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cddf113bb01ca3a0023665a0005d6ae1b78745ee877178c19b8e55c53ff31ce
-  data.tar.gz: 147ec77329bcda0e0ff86b6a0443a4cdcc9b63f87b2cf29ccae2bc05bb5dd2db
+  metadata.gz: c47c4a09134e8146b6296480549750951211f3a54146d5c3b3136762bd5ee127
+  data.tar.gz: 6d6d3b1909b5dcc33102c50321b5f878b06489f807bea8259123c4c01b8547d8
 SHA512:
-  metadata.gz: 9d4b03838352129fb30d8ee1e5652bc0e41f9524613e2cdb03ec11acf3e5552804472c09aa33efffeef02279b6f92f7cad1b465046bb74e9f5d1a24087251dd3
-  data.tar.gz: 5b8c69a4ab87b47b1e024b764329e946da803949243f841bf62970c19153740298bc46628eec89da516958d4df5584a1120342ef4d515fbe00656961fea198be
+  metadata.gz: 240ae88ff1b8fb6d34833e348dad32ce4c2d17aded1b0579c6955e00e50c399cdbffae1876655f5129079eeef062bad80eb36cacb3d4ff5840e17ae1436e9e4f
+  data.tar.gz: 007670d907089de08b83b48ec968b2394b7ecb4ac4c51156535666aa83ce32647a0ca42a508971058e94d993facfa4a331db6e7b8e44e926245e7b9c5be015f4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+### 4.17.4.2
+
+- Support StyledText data-binding of caret_offset, selection_count, selection, top_index, and top_pixel, useful for code_text
+- Support `width, height` hash options for ImageProxy and image properties on widgets
+- Default SWT styles for tool_bar (:border) and tool_item (:push)
+
 ### 4.17.4.1
 
 - Optimize code_text line style listener algorithm or avoid setting code_text style via listener for performance reasons

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.17.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.17.4.2
 ## JRuby Desktop Development GUI Library
 [![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)
@@ -10,7 +10,7 @@
 
 (The Original Glimmer Library Since 2007. Beware of Imitators!)
 
-[**Glimmer**](https://github.com/AndyObtiva/glimmer) is a native-GUI cross-platform desktop development library written in [JRuby](https://www.jruby.org/), an OS-threaded faster version of [Ruby](https://www.ruby-lang.org/en/). [Glimmer](https://rubygems.org/gems/glimmer)'s main innovation is a declarative [Ruby DSL](#glimmer-dsl-syntax) that enables productive and efficient authoring of desktop application user-interfaces while relying on the robust [Eclipse SWT library](https://www.eclipse.org/swt/). [Glimmer](https://rubygems.org/gems/glimmer) additionally innovates by having built-in [data-binding](#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. To get started quickly, [Glimmer](https://rubygems.org/gems/glimmer) offers [scaffolding](#scaffolding) options for [Apps](#in-production), [Gems](#custom-shell-gem), and [Custom Widgets](#custom-widgets). [Glimmer](https://rubygems.org/gems/glimmer) also includes native-executable [packaging](#packaging--distribution) support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in [Ruby](https://www.ruby-lang.org/en/) as truly native DMG/PKG/APP files on the [Mac](https://www.apple.com/ca/macos) + [App Store](https://developer.apple.com/macos/distribution/), MSI/EXE files on [Windows](https://www.microsoft.com/en-ca/windows), and [Gem Packaged Shell Scripts](#custom-shell-gem) on [Linux](https://www.linux.org/).
+[Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer) is a native-GUI cross-platform desktop development library written in [JRuby](https://www.jruby.org/), an OS-threaded faster version of [Ruby](https://www.ruby-lang.org/en/). [Glimmer](https://github.com/AndyObtiva/glimmer)'s main innovation is a declarative [Ruby DSL](#glimmer-dsl-syntax) that enables productive and efficient authoring of desktop application user-interfaces while relying on the robust [Eclipse SWT library](https://www.eclipse.org/swt/). [Glimmer](https://rubygems.org/gems/glimmer) additionally innovates by having built-in [data-binding](#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. To get started quickly, [Glimmer](https://rubygems.org/gems/glimmer) offers [scaffolding](#scaffolding) options for [Apps](#in-production), [Gems](#custom-shell-gem), and [Custom Widgets](#custom-widgets). [Glimmer](https://rubygems.org/gems/glimmer) also includes native-executable [packaging](#packaging--distribution) support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in [Ruby](https://www.ruby-lang.org/en/) as truly native DMG/PKG/APP files on the [Mac](https://www.apple.com/ca/macos) + [App Store](https://developer.apple.com/macos/distribution/), MSI/EXE files on [Windows](https://www.microsoft.com/en-ca/windows), and [Gem Packaged Shell Scripts](#custom-shell-gem) on [Linux](https://www.linux.org/).
 
 [Glimmer receives two updates per month](https://rubygems.org/gems/glimmer-dsl-swt/versions). You can trust [Glimmer](https://rubygems.org/gems/glimmer) with your Ruby desktop GUI development needs. Please make [Glimmer](https://rubygems.org/gems/glimmer) even better by providing feedback and [contributing](#contributing) when possible.
 
@@ -433,7 +433,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.17.4.1
+jgem install glimmer-dsl-swt -v 4.17.4.2
 ```
 
 Note: Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT.
@@ -511,7 +511,7 @@ bin/glimmer samples
 Below are the full usage instructions that come up when running `glimmer` without args.
 
 ```
-Glimmer (Ruby Desktop Development GUI Library) - JRuby Gem: glimmer-dsl-swt v4.17.4.1
+Glimmer (Ruby Desktop Development GUI Library) - JRuby Gem: glimmer-dsl-swt v4.17.4.2
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 
@@ -988,7 +988,7 @@ Output:
                                                                          
   Css    glimmer-dsl-css    1.1.0     AndyMaleh    Glimmer DSL for CSS    
   Opal   glimmer-dsl-opal   0.4.0     AndyMaleh    Glimmer DSL for Opal   
-  Swt    glimmer-dsl-swt    4.17.4.1  AndyMaleh    Glimmer DSL for SWT    
+  Swt    glimmer-dsl-swt    4.17.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.17.4.1
+4.17.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.17.4.1 ruby lib
+# stub: glimmer-dsl-swt 4.17.4.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.17.4.1"
+  s.version = "4.17.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 = "2020-10-22"
+  s.date = "2020-10-23"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Library)".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -98,6 +98,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/swt/scrolled_composite_proxy.rb",
     "lib/glimmer/swt/shell_proxy.rb",
     "lib/glimmer/swt/style_constantizable.rb",
+    "lib/glimmer/swt/styled_text_proxy.rb",
     "lib/glimmer/swt/swt_proxy.rb",
     "lib/glimmer/swt/tab_item_proxy.rb",
     "lib/glimmer/swt/table_column_proxy.rb",

data/lib/glimmer/dsl/swt/widget_expression.rb

@@ -57,3 +57,4 @@ require 'glimmer/swt/tree_proxy'
 require 'glimmer/swt/table_proxy'
 require 'glimmer/swt/table_column_proxy'
 require 'glimmer/swt/sash_form_proxy'
+require 'glimmer/swt/styled_text_proxy'

data/lib/glimmer/swt/image_proxy.rb

@@ -58,6 +58,9 @@ module Glimmer
         elsif @file_path
           @image_data = ImageData.new(input_stream || @file_path)
           @swt_image = Image.new(DisplayProxy.instance.swt_display, @image_data)
+          width = options[:width]
+          height = options[:height]
+          scale_to(width, height) unless width.nil? || height.nil?
         else
           @swt_image = Image.new(*@args)
           @image_data = @swt_image.image_data

data/lib/glimmer/swt/sash_form_proxy.rb

@@ -32,7 +32,7 @@ module Glimmer
       end
       
       def set_attribute(attribute_name, *args)
-        if attribute_name.to_s == "weights"
+        if attribute_name.to_s == 'weights'
           @weights = args
           @weights = @weights.first if @weights.first.is_a?(Array)
         else

data/lib/glimmer/swt/styled_text_proxy.rb

@@ -0,0 +1,43 @@
+# Copyright (c) 2007-2020 Andy Maleh
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.custom.StyledText
+    #
+    # Follows the Proxy Design Pattern
+    class StyledTextProxy < WidgetProxy
+      def set_attribute(attribute_name, *args)
+        if attribute_name.to_s == 'selection'
+          if args.first
+            async_exec { @swt_widget.setCaretOffset(args.first.x) }
+            async_exec { @swt_widget.setSelection(args.first) }
+          end
+        else
+          super(attribute_name, *args)
+        end
+      end
+      
+    end
+  end
+end

data/lib/glimmer/swt/widget_proxy.rb

@@ -44,26 +44,28 @@ module Glimmer
       include Packages
 
       DEFAULT_STYLES = {
-        "arrow"               => [:arrow],
-        "button"              => [:push],
-        "checkbox"            => [:check],
-        "check"               => [:check],
-        "drag_source"         => [:drop_copy],
-        "drop_target"         => [:drop_copy],
-        "list"                => [:border, :v_scroll],
-        "menu_item"           => [:push],
-        "radio"               => [:radio],
-        "scrolled_composite"  => [:border, :h_scroll, :v_scroll],
-        "spinner"             => [:border],
-        "styled_text"         => [:border, :multi, :v_scroll, :h_scroll],
-        "table"               => [:virtual, :border, :full_selection],
-        "text"                => [:border],
-        "toggle"              => [:toggle],
-        "tree"                => [:virtual, :border, :h_scroll, :v_scroll],
+        'arrow'               => [:arrow],
+        'button'              => [:push],
+        'checkbox'            => [:check],
+        'check'               => [:check],
+        'drag_source'         => [:drop_copy],
+        'drop_target'         => [:drop_copy],
+        'list'                => [:border, :v_scroll],
+        'menu_item'           => [:push],
+        'radio'               => [:radio],
+        'scrolled_composite'  => [:border, :h_scroll, :v_scroll],
+        'spinner'             => [:border],
+        'styled_text'         => [:border, :multi, :v_scroll, :h_scroll],
+        'table'               => [:virtual, :border, :full_selection],
+        'text'                => [:border],
+        'toggle'              => [:toggle],
+        'tool_bar'            => [:push],
+        'tool_item'           => [:push],
+        'tree'                => [:virtual, :border, :h_scroll, :v_scroll],
       }
 
       DEFAULT_INITIALIZERS = {
-        "composite" => lambda do |composite|
+        'composite' => lambda do |composite|
           if composite.get_layout.nil?
             layout = GridLayout.new
             layout.marginWidth = 15
@@ -71,18 +73,18 @@ module Glimmer
             composite.layout = layout
           end
         end,
-        "scrolled_composite" => lambda do |scrolled_composite|
+        'scrolled_composite' => lambda do |scrolled_composite|
           scrolled_composite.expand_horizontal = true
           scrolled_composite.expand_vertical = true
         end,
-        "table" => lambda do |table|
+        'table' => lambda do |table|
           table.setHeaderVisible(true)
           table.setLinesVisible(true)
         end,
-        "table_column" => lambda do |table_column|
+        'table_column' => lambda do |table_column|
           table_column.setWidth(80)
         end,
-        "group" => lambda do |group|
+        'group' => lambda do |group|
           group.layout = GridLayout.new if group.get_layout.nil?
         end,
       }
@@ -216,7 +218,11 @@ module Glimmer
       def get_attribute(attribute_name)
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
         if widget_custom_attribute
-          @swt_widget.send(widget_custom_attribute[:getter][:name])
+          if widget_custom_attribute[:getter][:invoker]
+            widget_custom_attribute[:getter][:invoker].call(@swt_widget, [])
+          else
+            @swt_widget.send(widget_custom_attribute[:getter][:name])
+          end
         else
           @swt_widget.send(attribute_getter(attribute_name))
         end
@@ -330,43 +336,33 @@ module Glimmer
               }
             end,
             :caret_position => lambda do |observer|
-              on_swt_keydown { |event|
-                observer.call(@swt_widget.getCaretPosition)
-              }
               on_swt_keyup { |event|
-                observer.call(@swt_widget.getCaretPosition)
+                observer.call(@swt_widget.getCaretOffset)
               }
-              on_swt_mousedown { |event|
-                observer.call(@swt_widget.getCaretPosition)
+              on_swt_mouseup { |event|
+                observer.call(@swt_widget.getCaretOffset)
+              }
+            end,
+            :caret_offset => lambda do |observer|
+              on_swt_keyup { |event|
+                observer.call(@swt_widget.getCaretOffset)
               }
               on_swt_mouseup { |event|
-                observer.call(@swt_widget.getCaretPosition)
+                observer.call(@swt_widget.getCaretOffset)
               }
             end,
             :selection => lambda do |observer|
-              on_swt_keydown { |event|
-                observer.call(@swt_widget.getSelection)
-              }
               on_swt_keyup { |event|
-                observer.call(@swt_widget.getSelection)
-              }
-              on_swt_mousedown { |event|
-                observer.call(@swt_widget.getSelection)
+                observer.call(@swt_widget.getSelection) unless @swt_widget.getSelection.x == 0 && @swt_widget.getSelection.y == 0
               }
               on_swt_mouseup { |event|
-                observer.call(@swt_widget.getSelection)
+                observer.call(@swt_widget.getSelection) unless @swt_widget.getSelection.x == 0 && @swt_widget.getSelection.y == 0
               }
             end,
             :selection_count => lambda do |observer|
-              on_swt_keydown { |event|
-                observer.call(@swt_widget.getSelectionCount)
-              }
               on_swt_keyup { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
-              on_swt_mousedown { |event|
-                observer.call(@swt_widget.getSelectionCount)
-              }
               on_swt_mouseup { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
@@ -380,6 +376,15 @@ module Glimmer
                 end
               }
             end,            
+            :top_pixel => lambda do |observer|
+              @last_top_pixel = @swt_widget.getTopPixel
+              on_paint_control { |event|
+                if @swt_widget.getTopPixel != @last_top_pixel
+                  @last_top_pixel = @swt_widget.getTopPixel
+                  observer.call(@last_top_pixel)
+                end
+              }
+            end,
           },
           Java::OrgEclipseSwtWidgets::Button => {
             :selection => lambda do |observer|
@@ -660,20 +665,20 @@ module Glimmer
       end
 
       def widget_custom_attribute_mapping
+        # TODO scope per widget class type just like other mappings
         @swt_widget_custom_attribute_mapping ||= {
           'focus' => {
             getter: {name: 'isFocusControl'},
             setter: {name: 'setFocus', invoker: lambda { |widget, args| @swt_widget.setFocus if args.first }},
           },
           'caret_position' => {
-            getter: {name: 'getCaretPosition'},
+            getter: {name: 'getCaretPosition', invoker: lambda { |widget, args| @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getCaretOffset}},
             setter: {name: 'setSelection', invoker: lambda { |widget, args| @swt_widget.setSelection(args.first) if args.first }},
           },
           'selection_count' => {
             getter: {name: 'getSelectionCount'},
             setter: {name: 'setSelection', invoker: lambda { |widget, args| 
-              # TODO consider the idea of aliasing getCaretPosition in StyledText
-              caret_position = @swt_widget.getCaretPosition rescue @swt_widget.getCaretOffset
+              caret_position = @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getCaretOffset
               @swt_widget.setSelection(caret_position, caret_position + args.first) if args.first 
             }},
           },
@@ -713,11 +718,9 @@ module Glimmer
       end
 
       def apply_property_type_converters(attribute_name, args)
-        if args.count == 1
-          value = args.first
-          converter = property_type_converters[attribute_name.to_sym]
-          args[0] = converter.call(value) if converter
-        end
+        value = args
+        converter = property_type_converters[attribute_name.to_sym]
+        args[0..-1] = [converter.call(*value)] if converter
         if args.count == 1 && args.first.is_a?(ColorProxy)
           g_color = args.first
           args[0] = g_color.swt_color
@@ -738,8 +741,8 @@ module Glimmer
             SWTProxy[*value]
           },
           :background => color_converter,
-          :background_image => lambda do |value|
-            image_proxy = ImageProxy.create(value)
+          :background_image => lambda do |*value|
+            image_proxy = ImageProxy.create(*value)
             
             if image_proxy&.file_path&.end_with?('.gif')
               image = image_proxy.swt_image
@@ -797,8 +800,8 @@ module Glimmer
               value
             end
           end,
-          :image => lambda do |value|
-            ImageProxy.create(value).swt_image
+          :image => lambda do |*value|
+            ImageProxy.create(*value).swt_image
           end,
           :images => lambda do |array|
             array.to_a.map do |value|

data/samples/elaborate/meta_sample.rb

@@ -118,7 +118,7 @@ class MetaSampleApplication
                 group {
                   layout_data(:fill, :fill, true, true)
                   grid_layout 2, false
-                  text sample_directory.name
+                  text "#{sample_directory.name} Samples"
                   font height: 30
                   
                   sample_directory.samples.each { |sample|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.17.4.1
+  version: 4.17.4.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -398,6 +398,7 @@ files:
 - lib/glimmer/swt/scrolled_composite_proxy.rb
 - lib/glimmer/swt/shell_proxy.rb
 - lib/glimmer/swt/style_constantizable.rb
+- lib/glimmer/swt/styled_text_proxy.rb
 - lib/glimmer/swt/swt_proxy.rb
 - lib/glimmer/swt/tab_item_proxy.rb
 - lib/glimmer/swt/table_column_proxy.rb