glimmer-dsl-swt 4.22.2.2 → 4.22.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3de6dce288c5d0febfd7cdaa37195daf13284c7ff6f175442a4642f71b499fe7
-  data.tar.gz: 33e0fc58526098b0fa74c4bbc6779845b34b5052c3ddcb33d40e6f9d6548f2aa
+  metadata.gz: 20cdf050b145adb888f8e82caa9c8d90e5b076cab423bc795ed963a75c279fd4
+  data.tar.gz: 57e52e57c1fcc8dcc373dec79505fb1ee9547d4a50d4aa4e126395e689f91033
 SHA512:
-  metadata.gz: 65b37079de93d70fcdde14ea4fada7cd2feeb1aa1fb22ee7dd0dedf08d873966183de876d510492a07707812b2414193c1003a83804636aeb021cd7b229195d0
-  data.tar.gz: b7c347ae41ee4b0fc170fc910e20bcbf4e58aed1e9d8a31416a66f1253e3a7d40b3d3fe79354549b301023401bf952af15873caf89525c29103da3b447010902
+  metadata.gz: 7b6102a2d26c71dd635a5f8eadd9704ff263ee7124ac0428fe8dd53f661b893e7c08832e3fbcf17bbbc57b2e60754314d7943a2cce2a3be6bc2104205e1caef0
+  data.tar.gz: e9090d6f91a0b337e173f478c3371c47e9040d46af340e851f5d8e318ca66297fd0dc043814738b202e1ce0648987a46f4e5d27edf6fba3e81ff504779cd584d

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 4.22.2.3
+
+- Support `#content { }` on `layout_data`
+- Fix issue with data-binding `layout_data {exclude}` property using Shine `<=>` syntax
+
 ## 4.22.2.2
 
 - Snake elaborate sample

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.22.2.2
+# [<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.22.2.3
 ## 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)
@@ -17,7 +17,7 @@ Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) an
 
 ![Eclipse SWT RCP NASA Mars Rover](/images/glimmer-eclipse-swt-rcp-nasa-mars-rover.png)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.22.2.2 includes [SWT 4.22](https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/), which was released on November 24, 2021. 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.
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.22.2.3 includes [SWT 4.22](https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/), which was released on November 24, 2021. 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.
 
 **Starting in version 4.20.0.0, [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) comes with the new [***Shine***](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#shine) syntax** for highly intuitive and visually expressive View/Model Attribute Mapping, relying on `<=>` for bidirectional (two-way) data-binding and `<=` for unidirectional (one-way) data-binding, providing an alternative to the `bind` keyword.
 
@@ -328,7 +328,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.22.2.2
+jgem install glimmer-dsl-swt -v 4.22.2.3
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -356,7 +356,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.22.2.2'
+gem 'glimmer-dsl-swt', '~> 4.22.2.3'
 ```
 
 And, then run:
@@ -379,7 +379,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.22.2.2
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.22.2.3
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/VERSION

@@ -1 +1 @@
-4.22.2.2
+4.22.2.3

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -1495,6 +1495,13 @@ Glimmer composites always come with `grid_layout` by default, but you can still
 
 Glimmer shell always comes with `fill_layout` having `:horizontal` type.
 
+If you ever want to force a re-layout on a `composite` or `shell`, you can call the following:
+
+```ruby
+composite_or_shell.layout(true, true)
+composite_or_shell.pack(true)
+```
+
 This is a great guide for learning more about SWT layouts:
 
 https://www.eclipse.org/articles/Article-Understanding-Layouts/Understanding-Layouts.htm
@@ -1579,6 +1586,144 @@ composite {
 
 If you data-bind any layout data properties, when they change, the shell containing their widget re-packs its children (calls `#pack` method automatically) to ensure proper relayout of all widgets.
 
+Also, if you ever want a widget to be excluded from layout entirely (in addition to having `visible false` on the widget), you can set `layout_data { exclude true }` or data-bind `exclude` property of `layout_data` to have a widget included/excluded automatically based on a condition.
+
+Here is a re-implementation of the [Login sample](/docs/reference/GLIMMER_SAMPLES.md#login) that hides/shows login/logout buttons upon login/logout (you may copy/paste in [`girb`](GLIMMER_GIRB.md)):
+
+```ruby
+require 'glimmer-dsl-swt'
+
+class LoginPresenter
+
+  attr_accessor :user_name
+  attr_accessor :password
+  attr_accessor :status
+
+  def initialize
+    @user_name = ""
+    @password = ""
+    @status = "Logged Out"
+  end
+
+  def status=(status)
+    @status = status
+  end
+  
+  def valid?
+    !@user_name.to_s.strip.empty? && !@password.to_s.strip.empty?
+  end
+
+  def logged_in?
+    self.status == "Logged In"
+  end
+
+  def logged_out?
+    !self.logged_in?
+  end
+
+  def login!
+    return unless valid?
+    self.status = "Logged In"
+  end
+
+  def logout!
+    self.user_name = ""
+    self.password = ""
+    self.status = "Logged Out"
+  end
+
+end
+
+class Login
+  include Glimmer::UI::CustomShell
+
+  before_body do
+    @presenter = LoginPresenter.new
+  end
+
+  body {
+    shell {
+      text "Login"
+      
+      composite {
+        grid_layout(2, false) #two columns with differing widths
+
+        label { text "Username:" } # goes in column 1
+        @user_name_text = text {   # goes in column 2
+          layout_data :fill, :center, true, false
+          text <=> [@presenter, :user_name]
+          enabled <= [@presenter, :logged_out?, computed_by: :status]
+          
+          on_key_pressed { |event|
+            @password_text.set_focus if event.keyCode == swt(:cr)
+          }
+        }
+
+        label { text "Password:" }
+        @password_text = text(:password, :border) {
+          layout_data :fill, :center, true, false
+          text <=> [@presenter, :password]
+          enabled <= [@presenter, :logged_out?, computed_by: :status]
+          
+          on_key_pressed { |event|
+            @presenter.login! if event.keyCode == swt(:cr)
+          }
+        }
+
+        label { text "Status:" }
+        label {
+          layout_data :fill, :center, true, false
+          text <= [@presenter, :status]
+        }
+
+        button {
+          layout_data {
+            exclude <= [@presenter, :logged_in?, computed_by: :status]
+          }
+          
+          text "Login"
+          visible <= [@presenter, :logged_out?, computed_by: :status]
+          
+          on_widget_selected { @presenter.login! }
+          on_key_pressed { |event|
+            if event.keyCode == swt(:cr)
+              @presenter.login!
+            end
+          }
+        }
+
+        button {
+          layout_data {
+            exclude <= [@presenter, :logged_out?, computed_by: :status]
+          }
+          
+          text "Logout"
+          visible <= [@presenter, :logged_in?, computed_by: :status]
+          
+          on_widget_selected { @presenter.logout! }
+          on_key_pressed { |event|
+            if event.keyCode == swt(:cr)
+              @presenter.logout!
+              @user_name_text.set_focus
+            end
+          }
+        }
+      }
+    }
+  }
+end
+
+Login.launch
+```
+
+Login (with `exclude` data-binding) - Logged Out
+
+![Login Exclude Logged Out](/images/glimmer-login-exclude-logged-out.png)
+
+Login (with `exclude` data-binding) - Logged In
+
+![Login Exclude Logged In](/images/glimmer-login-exclude-logged-in.png)
+
 **NOTE**: Layout data must never be reused between widgets. Always specify or clone again for every widget.
 
 This is a great guide for learning more about SWT layouts:

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -106,6 +106,10 @@ module Glimmer
       def attribute_getter(attribute_name)
         "#{attribute_name.to_s.camelcase(:lower)}"
       end
+      
+      def content(&block)
+        Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::LayoutDataExpression.new, 'layout_data', &block)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.22.2.2
+  version: 4.22.2.3
 platform: ruby
 authors:
 - Andy Maleh