glimmer-dsl-swt 4.17.10.1 → 4.17.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73db76cf55f0b8a847889dba2f325f6316b91c355c97524e87ec822ba8b36709
-  data.tar.gz: 942dbb0e282fc67de58568d05114b03dccc13245754c16034138bca5f32fdbe6
+  metadata.gz: a26a62cdb25e9f4ce06d4c6d0d7e753fbd9f520e96873d8fa224a7c4fba52f0e
+  data.tar.gz: ef7839e1659a53123cf1b027d1620db8635d300c8b7d80565b197f0b77b84a1a
 SHA512:
-  metadata.gz: ad56996b5e3163e3d25c286d605e9d92c61cbfeccf0311222a55f8ef8ef9772a1804928ea5c62d83e09449923aa8ea9513a2cd5198fa70c6251e45711d2c76c7
-  data.tar.gz: b53328118e1e567ed87910fd5d1a22a80161da0c0b62074113b1e0afcccd83fbb0adb3039e4eaa93ea5ec070c0b47cadb80100f6ab177215de5dadea9a16c16e
+  metadata.gz: 9b2530841419cc164c720e6ca5043de7a2c0a6a54eb63c7e8a748805ad985bb04d2d752b321291319cd2f2ffdca08d5ef3f502dade6d7876897fb1b9975956a4
+  data.tar.gz: 4f3c48cf36fd274b95222d3db1d07febb6cb15b64957ec11ae519855b5e194893ec6503437019958c3f9fef45ac94e8065d750ce7c87f20aeb781d9cbc0133c5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+### 4.17.10.2
+
+- Upgraded glimmer gem to version 1.0.4
+- Fixed issues relating to data-binding `styled_text` widget
+
 ### 4.17.10.1
 
 - Upgraded glimmer gem to version 1.0.3
@@ -411,4 +416,4 @@
 
 ## 0.1.0
 
-- Extracted Glimmer DSL for SWT (glimmer-dsl-swt gem) from Glimmer
+- Extracted Glimmer DSL for SWT (glimmer-dsl-swt gem) from Glimmer

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.10.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.10.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)
@@ -455,7 +455,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.17.10.1
+jgem install glimmer-dsl-swt -v 4.17.10.2
 
 ```
 
@@ -532,7 +532,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.17.10.1
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.17.10.2
 
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
@@ -1010,7 +1010,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.10.1
+  Swt    glimmer-dsl-swt    4.17.10.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.10.1
+4.17.10.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.10.1 ruby lib
+# stub: glimmer-dsl-swt 4.17.10.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.17.10.1"
+  s.version = "4.17.10.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-11-19"
+  s.date = "2020-11-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]
@@ -172,7 +172,7 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.3"])
+    s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.4"])
     s.add_runtime_dependency(%q<super_module>.freeze, ["~> 1.4.1"])
     s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, ["~> 0.3.0"])
     s.add_runtime_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.2"])
@@ -191,7 +191,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
     s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
   else
-    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.3"])
+    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.4"])
     s.add_dependency(%q<super_module>.freeze, ["~> 1.4.1"])
     s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, ["~> 0.3.0"])
     s.add_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.2"])

data/lib/glimmer/swt/styled_text_proxy.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -27,17 +27,12 @@ module Glimmer
     #
     # 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
+      def initialize(*args)
+        super
+        on_modify_text { |event|
+          @last_modify_text = text
+        }
       end
-      
     end
   end
 end

data/lib/glimmer/swt/widget_proxy.rb

@@ -357,35 +357,34 @@ module Glimmer
               }
             end,
             :caret_position => lambda do |observer|
+              on_caret_moved { |event|
+                observer.call(@swt_widget.getSelection.x) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
+              }
               on_swt_keyup { |event|
-                observer.call(@swt_widget.getCaretOffset)
+                observer.call(@swt_widget.getSelection.x) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
               on_swt_mouseup { |event|
-                observer.call(@swt_widget.getCaretOffset)
+                observer.call(@swt_widget.getSelection.x) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
             :caret_offset => lambda do |observer|
-              on_swt_keyup { |event|
-                observer.call(@swt_widget.getCaretOffset)
-              }
-              on_swt_mouseup { |event|
-                observer.call(@swt_widget.getCaretOffset)
+              on_caret_moved { |event|
+                observer.call(@swt_widget.getCaretOffset) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
             :selection => lambda do |observer|
-              on_swt_keyup { |event|
-                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) unless @swt_widget.getSelection.x == 0 && @swt_widget.getSelection.y == 0
+              on_widget_selected { |event|
+                observer.call(@swt_widget.getSelection) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
             :selection_count => lambda do |observer|
-              on_swt_keyup { |event|
-                observer.call(@swt_widget.getSelectionCount)
+              on_widget_selected { |event|
+                observer.call(@swt_widget.getSelectionCount) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
-              on_swt_mouseup { |event|
-                observer.call(@swt_widget.getSelectionCount)
+            end,
+            :selection_range => lambda do |observer|
+              on_widget_selected { |event|
+                observer.call(@swt_widget.getSelectionRange) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
             :top_index => lambda do |observer|
@@ -714,14 +713,17 @@ module Glimmer
             setter: {name: 'setFocus', invoker: lambda { |widget, args| @swt_widget.setFocus if args.first }},
           },
           'caret_position' => {
-            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 }},
+            getter: {name: 'getCaretPosition', invoker: lambda { |widget, args| @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getSelection.x}},
+            setter: {name: 'setSelection', invoker: lambda { |widget, args| @swt_widget.setSelection(args.first, args.first + @swt_widget.getSelectionCount) if args.first }},
           },
           'selection_count' => {
             getter: {name: 'getSelectionCount'},
             setter: {name: 'setSelection', invoker: lambda { |widget, args|
-              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
+              if args.first
+                caret_position = @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getSelection.x
+                # TODO handle negative length
+                @swt_widget.setSelection(caret_position, caret_position + args.first)
+              end
             }},
           },
         }
@@ -885,4 +887,4 @@ module Glimmer
       end
     end
   end
-end
+end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.17.10.1
+  version: 4.17.10.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
   name: glimmer
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: