glimmer-dsl-swt 4.18.4.0 → 4.18.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3d59d0d54c7528a521c07263fa47768f172e49ea2d5bee86c376d0425b8a5f8
-  data.tar.gz: 0da445293890975f23fbf5cce1af49ea4e8b54e2d86a99b6d0f4cfa7fe6559bd
+  metadata.gz: ed016ed2527818f682cb4247d294bf16ddcc8ccddb81f5bd26fa518b0592d4a1
+  data.tar.gz: 2c2d0e7fdc9921ab9861d1151686907d809cd072e0e5651889b4f08851c19791
 SHA512:
-  metadata.gz: a51c136d719ebe688209fa1a3bf8509dee32f1c90d535b06c08b6f5d835a0872c9487f437f06c7985007c210bf7aef3ecb29c6a11819e9ee48ffed77ea5ee40f
-  data.tar.gz: 8c285b55812b44969dbe3ab527b1ad1d5cc2325d2455cdf676412bfdc41f1094ce7402c3f0f5181546be9d539299f5c669de553c0b04339c3ffa3ef5c81c3fbb
+  metadata.gz: 646cec122f5b18ffdd57be914bdd84f7a5af7729cf66aa98ecfe35477d7bb9c445bb6c0b00436c7aa06a40052cd5d96613a4d3b4470d97990ebb60cf6813323d
+  data.tar.gz: c6af13d3fe035da72d5e60b88cbe1c6ab498e07cd061113c46a248c110f2044349b99050fd576ebc4f2923efa49965a0539da512325e9a76d0512c4c6816c88c

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+### 4.18.4.1
+
+- Support data-binding of `code_text` with lines enabled.
+- Upgrade the Glimmer Meta-Sample with code_text lines: {width: 2}
+- With code_text lines enabled, support setting/data-binding properties on root composite via nesting `root { }` underneath
+- With code_text lines enabled, support setting/data-binding properties on line numbers styled text widget via nesting `line_numbers { }` underneath
+- Update the Hello, Code Text! sample to remove borders and line numbers background in the JavaScript example
+- Fix issue with updating layout upon later reopening layout/layout data via `proxy.content {}` method
+
 ### 4.18.4.0
 
 - Extract line numbers part of text_editor widget from Gladiator into Glimmer code_text and make it an option (e.g. lines: true or lines: {width: 4})

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.0
+# [<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
 ## 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)
@@ -360,6 +360,7 @@ If you see anything that needs to be improved, please do not hesitate to contact
       - [Hello, Button!](#hello-button)
       - [Hello, Link!](#hello-link)
       - [Hello, Dialog!](#hello-dialog)
+      - [Hello, Code Text!](#hello-code-text)
       - [Hello, Canvas!](#hello-canvas)
       - [Hello, Canvas Animation!](#hello-canvas-animation)
       - [Hello, Canvas Transform!](#hello-canvas-transform)
@@ -489,9 +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.0
-
-
+jgem install glimmer-dsl-swt -v 4.18.4.1
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -509,8 +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.0
-'
+gem 'glimmer-dsl-swt', '~> 4.18.4.1'
 ```
 
 And, then run:
@@ -568,9 +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.0
-
-
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.4.1
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 
@@ -1049,9 +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.0
-
-  AndyMaleh    Glimmer DSL for SWT
+  Swt    glimmer-dsl-swt    4.18.4.1  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.0
+4.18.4.1

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.0 ruby lib
+# stub: glimmer-dsl-swt 4.18.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.4.0"
+  s.version = "4.18.4.1"
 
   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-02"
+  s.date = "2021-02-03"
   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]

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

@@ -34,21 +34,42 @@ module Glimmer
       
         alias lines? lines
         attr_accessor :styled_text_proxy_text, :styled_text_proxy_top_pixel
-        attr_reader :styled_text_proxy, :lines_width
+        attr_reader :styled_text_proxy, :lines_width, :line_numbers_styled_text_proxy
         
-        def text=(value)
-          @styled_text_proxy&.swt_widget&.text = value
+        def method_missing(method_name, *args, &block)
+          dsl_mode = @dsl_mode || args.last.is_a?(Hash) && args.last[:dsl]
+          if dsl_mode
+            args.pop if args.last.is_a?(Hash) && args.last[:dsl]
+            super(method_name, *args, &block)
+          elsif @styled_text_proxy&.respond_to?(method_name, *args, &block)
+            @styled_text_proxy&.send(method_name, *args, &block)
+          else
+            super
+          end
         end
         
-        def text(*args, dsl: false, &block)
-          # If dsl: true is passed, operate using Glimmer DSL (which is the default that happens through super method_missing)
-          if dsl
-            super(*args, &block)
+        def respond_to?(method_name, *args, &block)
+          dsl_mode = @dsl_mode || args.last.is_a?(Hash) && args.last[:dsl]
+          if dsl_mode
+            args = args[0...-1] if args.last.is_a?(Hash) && args.last[:dsl]
+            super(method_name, *args, &block)
           else
-            @styled_text_proxy&.swt_widget&.text
+            super || @styled_text_proxy&.respond_to?(method_name, *args, &block)
           end
         end
         
+        def has_instance_method?(method_name)
+          respond_to?(method_name)
+        end
+        
+        def root_block=(block)
+          body_root.content(&block)
+        end
+        
+        def line_numbers_block=(block)
+          @line_numbers_styled_text_proxy.content(&block)
+        end
+        
         before_body {
           require 'rouge'
           require 'ext/rouge/themes/glimmer'
@@ -59,6 +80,11 @@ module Glimmer
           elsif lines.is_a?(Hash)
             @lines_width = lines[:width]
           end
+          @dsl_mode = true
+        }
+        
+        after_body {
+          @dsl_mode = nil
         }
         
         body {
@@ -67,10 +93,10 @@ module Glimmer
             composite {
               grid_layout(2, false)
               
-              @line_numbers_text = styled_text(:multi, :border) {
+              @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|
+                text bind(self, :styled_text_proxy_text, read_only: true) { |text_value|
                   line_count = text_value.to_s.split("\n").count
                   line_count = 1 if line_count == 0
                   lines_text_size = [line_count.to_s.size, @lines_width].max
@@ -79,7 +105,7 @@ module Glimmer
                     @lines_width = lines_text_size
                   end
                   line_count.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n") + "\n"
-                }, dsl: true)
+                }
                 top_pixel bind(self, :styled_text_proxy_top_pixel, read_only: true)
                 font name: @font_name, height: OS.mac? ? 15 : 12
                 background color(:widget_background)
@@ -110,8 +136,9 @@ module Glimmer
         
         def code_text_widget
           @styled_text_proxy = styled_text(swt_style) {
+#             custom_widget_property_owner # TODO implement to route properties here without declaring method_missing
             layout_data :fill, :fill, true, true if lines
-            text(bind(self, :styled_text_proxy_text), dsl: true) if lines
+            text bind(self, :styled_text_proxy_text) if lines
             top_pixel bind(self, :styled_text_proxy_top_pixel) if lines
             font name: @font_name, height: 15
             foreground rgb(75, 75, 75)

data/lib/glimmer/swt/layout_proxy.rb

@@ -72,7 +72,9 @@ module Glimmer
         @swt_layout.marginRight = 0 if @swt_layout.respond_to?(:marginRight)
         @swt_layout.marginBottom = 0 if @swt_layout.respond_to?(:marginBottom)
         @swt_layout.marginLeft = 0 if @swt_layout.respond_to?(:marginLeft)
+        old_layout = @widget_proxy.swt_widget.getLayout
         @widget_proxy.swt_widget.setLayout(@swt_layout)
+        @widget_proxy.swt_widget.layout if old_layout
       end
 
       def has_attribute?(attribute_name, *args)
@@ -83,7 +85,8 @@ module Glimmer
         apply_property_type_converters(attribute_name, args)
         if args.first != @swt_layout.send(attribute_getter(attribute_name))
           @swt_layout.send(attribute_setter(attribute_name), *args)
-          @widget_proxy.swt_widget.getShell.pack
+          @widget_proxy.swt_widget.layout
+          @widget_proxy.swt_widget.getShell.layout
         end
       end
 

data/lib/glimmer/swt/widget_proxy.rb

@@ -165,6 +165,7 @@ module Glimmer
           DEFAULT_INITIALIZERS[underscored_widget_name.to_s.to_sym]&.call(@swt_widget)
           @parent_proxy.post_initialize_child(self)
         end
+        @keyword = underscored_widget_name.to_s
         if respond_to?(:on_widget_disposed)
           on_widget_disposed {
             clear_shapes

data/samples/elaborate/meta_sample.rb

@@ -264,9 +264,12 @@ class MetaSampleApplication
           }
         }
             
-        @code_text = code_text {
+        @code_text = code_text(lines: {width: 2}) {
           text bind(SampleDirectory, 'selected_sample.code', read_only: true)
           editable bind(SampleDirectory, 'selected_sample.editable')
+          line_numbers {
+            background :white
+          }
         }
         
         weights 4, 11

data/samples/hello/hello_code_text.rb

@@ -49,7 +49,19 @@ shell {
     tab_item {
       fill_layout
       text 'JavaScript (pastie theme)'
-      code_text(language: 'javascript', theme: 'pastie', lines: {width: 2}) {
+      # No border (SWT styles are passed explicitly)
+      code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'pastie', lines: {width: 2}) {
+        # With lines, the custom widget has a root composite, which can be configured separately
+        root {
+          grid_layout(2, false) {
+            margin_width 2
+          }
+          background :white
+        }
+        # With lines, the line numbers widget can be configured separately
+        line_numbers {
+          background :white
+        }
         text <<~CODE
           function greet(greeting) {
             alert(greeting);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.4.0
+  version: 4.18.4.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement