glimmer-dsl-swt 4.17.4.2 → 4.17.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c47c4a09134e8146b6296480549750951211f3a54146d5c3b3136762bd5ee127
-  data.tar.gz: 6d6d3b1909b5dcc33102c50321b5f878b06489f807bea8259123c4c01b8547d8
+  metadata.gz: a2111fbe2df8040f64a319e5e62b15982cdc4749a6cd0c548b97f2b37f01b276
+  data.tar.gz: 283eb8a7a8faedde6ab6224ebe06fda3fca7cdff44ec99b32baca35da9df7d04
 SHA512:
-  metadata.gz: 240ae88ff1b8fb6d34833e348dad32ce4c2d17aded1b0579c6955e00e50c399cdbffae1876655f5129079eeef062bad80eb36cacb3d4ff5840e17ae1436e9e4f
-  data.tar.gz: 007670d907089de08b83b48ec968b2394b7ecb4ac4c51156535666aa83ce32647a0ca42a508971058e94d993facfa4a331db6e7b8e44e926245e7b9c5be015f4
+  metadata.gz: 2cb656a29e5d9da0759b295bc5dba9f1a174e8a83a1ffa2921c4b5efb6fd10542f0a46e475807cbd884c7f14270afa0983b5e49b392f97e9ddd41a6a4ecbbf30
+  data.tar.gz: 9283a302b3aaa99f5ec50f0d0996b951bb72ce0309ae9ca978429621d81f14c4005251286229d3555f31754c0e9a727db2f15f9245fab28f902ef1456e1fa07e

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+### 4.17.5.0
+
+- Support auto-scaling by aspect ratio of width and height (write specs)
+- Support SWT ExpandBar via expand_bar keyword
+- Hello, Expand Bar! Sample
+- Hello, Styled Text! Sample
+- Use expand_bar in Glimmer Meta-Sample
+
 ### 4.17.4.2
 
 - Support StyledText data-binding of caret_offset, selection_count, selection, top_index, and top_pixel, useful for code_text

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.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.17.5.0
 ## 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)
@@ -249,7 +249,7 @@ Glimmer App:
   - [Glimmer Command](#glimmer-command)
     - [Basic Usage](#basic-usage)
     - [Advanced Usage](#advanced-usage)
-    - [Samples](#samples)
+    - [Glimmer Samples](#glimmer-samples)
     - [Scaffolding](#scaffolding)
       - [App](#app)
       - [Desktopify](#desktopify)
@@ -282,6 +282,7 @@ Glimmer App:
       - [Color](#color)
       - [Font](#font)
     - [Image](#image)
+      - [Image Options](#image-options)
     - [Cursor](#cursor)
     - [Layouts](#layouts)
     - [Layout Data](#layout-data)
@@ -340,6 +341,8 @@ Glimmer App:
       - [Hello, Custom Widget!](#hello-custom-widget)
       - [Hello, Custom Shell!](#hello-custom-shell)
       - [Hello, Sash Form!](#hello-sash-form)
+      - [Hello, Styled Text!](#hello-styled-text)
+      - [Hello, Expand Bar!](#hello-expand-bar)
     - [Elaborate Samples](#elaborate-samples)
       - [User Profile](#user-profile)
       - [Login](#login)
@@ -433,7 +436,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.17.4.2
+jgem install glimmer-dsl-swt -v 4.17.5.0
 ```
 
 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 +514,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.2
+Glimmer (Ruby Desktop Development GUI Library) - JRuby Gem: glimmer-dsl-swt v4.17.5.0
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 
@@ -622,18 +625,18 @@ You should see output like the following:
 
 ```
 $ glimmer scaffold[greeter]
-	create	.gitignore
-	create	Rakefile
-	create	Gemfile
-	create	LICENSE.txt
-	create	README.rdoc
-	create	.document
-	create	lib
-	create	lib/greeter.rb
-	create	spec
-	create	spec/spec_helper.rb
-	create	spec/greeter_spec.rb
-	create	.rspec
+  create  .gitignore
+  create  Rakefile
+  create  Gemfile
+  create  LICENSE.txt
+  create  README.rdoc
+  create  .document
+  create  lib
+  create  lib/greeter.rb
+  create  spec
+  create  spec/spec_helper.rb
+  create  spec/greeter_spec.rb
+  create  .rspec
 Juwelier has prepared your gem in ./greeter
 Created greeter/.gitignore
 Created greeter/.ruby-version
@@ -731,15 +734,15 @@ Successfully installed github_api-0.19.0
 Successfully installed nokogiri-1.10.10-java
 Successfully installed juwelier-2.4.9
 7 gems installed
-	create	.gitignore
-	create	Rakefile
-	create	Gemfile
-	create	LICENSE.txt
-	create	README.markdown
-	create	.document
-	create	lib
-	create	lib/snowboard_utah.rb
-	create	.rspec
+  create  .gitignore
+  create  Rakefile
+  create  Gemfile
+  create  LICENSE.txt
+  create  README.markdown
+  create  .document
+  create  lib
+  create  lib/snowboard_utah.rb
+  create  .rspec
 Juwelier has prepared your gem in ./snowboard_utah
 Created snowboard_utah/.gitignore
 Created snowboard_utah/.ruby-version
@@ -988,7 +991,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.2  AndyMaleh    Glimmer DSL for SWT    
+  Swt    glimmer-dsl-swt    4.17.5.0  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                                                                         
 ```
@@ -1784,6 +1787,23 @@ Glimmer recently included **EXPERIMENTAL** gif animation support for the `backgr
 
 Learn more about images in general at this SWT Image guide: https://www.eclipse.org/articles/Article-SWT-images/graphics-resources.html
 
+#### Image Options
+
+Options may be passed in a hash at the end of `image` arguments:
+
+- `width`: width of image
+- `height`: height of image
+
+If only the width or height alone are specified, the other is calculated while maintaining the image aspect ratio.
+
+Example:
+
+```
+label {
+  image 'someimage.png', width: 400, height: 300
+}
+```
+
 ### Cursor
 
 SWT widget `cursor` property represents the mouse cursor you see on the screen when you hover over that widget.
@@ -3587,6 +3607,42 @@ Hello, Sash Form! Red Label Maximized
 
 ![Hello Sash Form Red Maximized](images/glimmer-hello-sash-form-red-maximized.png)
 
+#### Hello, Styled Text!
+
+This sample demonstrates the use of a `styled_text` in Glimmer.
+
+Code:
+
+[samples/hello/hello_styled_text.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_styled_text.rb)
+
+Hello, Styled Text!
+
+![Hello Styled Text](images/glimmer-hello-styled-text.png)
+
+#### Hello, Expand Bar!
+
+This sample demonstrates the use of a `expand_bar` and `expand_item` in Glimmer.
+
+Code:
+
+[samples/hello/hello_expand_bar.rb](https://github.com/AndyObtiva/glimmer-dsl-swt/blob/master/samples/hello/hello_expand_bar.rb)
+
+Hello, Expand Bar! All Expanded
+
+![Hello Expand Bar All Expanded](images/glimmer-hello-expand-bar-all-expanded.png)
+
+Hello, Expand Bar! Productivity Expanded
+
+![Hello Expand Bar Productivity Expanded](images/glimmer-hello-expand-bar-productivity-expanded.png)
+
+Hello, Expand Bar! Tools Expanded
+
+![Hello Expand Bar Tools Expanded](images/glimmer-hello-expand-bar-tools-expanded.png)
+
+Hello, Expand Bar! Reading Expanded
+
+![Hello Expand Bar Reading Expanded](images/glimmer-hello-expand-bar-reading-expanded.png)
+
 ### Elaborate Samples
 
 For more elaborate samples, check the following:

data/VERSION

@@ -1 +1 @@
-4.17.4.2
+4.17.5.0

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.2 ruby lib
+# stub: glimmer-dsl-swt 4.17.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.17.4.2"
+  s.version = "4.17.5.0"
 
   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-23"
+  s.date = "2020-10-24"
   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]
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/dsl/swt/dnd_expression.rb",
     "lib/glimmer/dsl/swt/dsl.rb",
     "lib/glimmer/dsl/swt/exec_expression.rb",
+    "lib/glimmer/dsl/swt/expand_item_expression.rb",
     "lib/glimmer/dsl/swt/font_expression.rb",
     "lib/glimmer/dsl/swt/image_expression.rb",
     "lib/glimmer/dsl/swt/layout_data_expression.rb",
@@ -87,6 +88,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/swt/custom/code_text.rb",
     "lib/glimmer/swt/display_proxy.rb",
     "lib/glimmer/swt/dnd_proxy.rb",
+    "lib/glimmer/swt/expand_item_proxy.rb",
     "lib/glimmer/swt/font_proxy.rb",
     "lib/glimmer/swt/image_proxy.rb",
     "lib/glimmer/swt/layout_data_proxy.rb",
@@ -126,12 +128,14 @@ Gem::Specification.new do |s|
     "samples/hello/hello_custom_shell.rb",
     "samples/hello/hello_custom_widget.rb",
     "samples/hello/hello_drag_and_drop.rb",
+    "samples/hello/hello_expand_bar.rb",
     "samples/hello/hello_list_multi_selection.rb",
     "samples/hello/hello_list_single_selection.rb",
     "samples/hello/hello_menu_bar.rb",
     "samples/hello/hello_message_box.rb",
     "samples/hello/hello_pop_up_context_menu.rb",
     "samples/hello/hello_sash_form.rb",
+    "samples/hello/hello_styled_text.rb",
     "samples/hello/hello_tab.rb",
     "samples/hello/hello_world.rb",
     "vendor/swt/linux/swt.jar",

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

@@ -0,0 +1,60 @@
+# 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'
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/expand_item_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      class ExpandItemExpression < StaticExpression
+        include ParentExpression
+  
+        include_package 'org.eclipse.swt.widgets'
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          initial_condition = (keyword == 'expand_item') and parent.respond_to?(:swt_widget)
+          if initial_condition
+            if parent.swt_widget.is_a?(ExpandBar)
+              return true
+            else
+              Glimmer::Config.logger.error {"expand_item widget may only be used directly under a expand_bar widget!"}
+            end
+          end
+          false
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::ExpandItemProxy.new(parent, args)
+        end
+        
+        def add_content(parent, &block)
+          super
+          parent.post_add_content
+        end
+                
+      end
+    end
+  end
+end

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

@@ -43,8 +43,8 @@ module Glimmer
           code = text
           return @syntax_highlighting if @last_code == code
           @last_code = code
-          lexer = Rouge::Lexer.find_fancy('ruby', code)
-          lex = lexer.lex(code).to_a
+          @lexer ||= Rouge::Lexer.find_fancy('ruby', code)
+          lex = @lexer.lex(code).to_a
           code_size = 0
           lex_hashes = lex.map do |pair|
             {token_type: pair.first, token_text: pair.last}

data/lib/glimmer/swt/expand_item_proxy.rb

@@ -0,0 +1,98 @@
+# 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'
+require 'glimmer/swt/swt_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.ExpandItem
+    #
+    # Functions differently from other widget proxies.
+    #
+    # Glimmer instantiates an SWT Composite alongside the SWT ExpandItem
+    # and returns it for `#swt_widget` to allow adding widgets into it.
+    #
+    # In order to get the SWT ExpandItem object, one must call `#swt_expand_item`.
+    #
+    # Behind the scenes, this creates a tab item widget proxy separately from a composite that
+    # is set as the control of the tab item and `#swt_widget`.
+    #
+    # In order to retrieve the tab item widget proxy, one must call `#widget_proxy`
+    #
+    # Follows the Proxy Design Pattern
+    class ExpandItemProxy < WidgetProxy
+      ATTRIBUTES = ['text', 'height', 'expanded']
+      
+      include_package 'org.eclipse.swt.widgets'
+
+      attr_reader :widget_proxy, :swt_expand_item
+
+      def initialize(parent, style, &contents)
+        super("composite", parent, style, &contents)
+        layout = FillLayout.new(SWTProxy[:vertical])
+        layout.marginWidth = 0
+        layout.marginHeight = 0
+        layout.spacing = 0
+        swt_widget.layout = layout        
+        @widget_proxy = SWT::WidgetProxy.new('expand_item', parent, style)
+        @swt_expand_item = @widget_proxy.swt_widget
+        @swt_expand_item.control = swt_widget        
+        @swt_expand_item.expanded = true
+      end
+      
+      def post_add_content
+        @swt_expand_item.setHeight(swt_widget.computeSize(SWTProxy[:default], SWTProxy[:default]).y) unless @swt_expand_item.getHeight > 0
+        WidgetProxy.new('composite', self, []) # adding filler since it seems like the last child gets a bad style, so this gets it instead
+      end
+      
+      def has_attribute?(attribute_name, *args)
+        if ATTRIBUTES.include?(attribute_name.to_s)
+          true
+        else
+          super(attribute_name, *args)
+        end
+      end
+
+      def set_attribute(attribute_name, *args)
+        if ATTRIBUTES.include?(attribute_name.to_s)
+          @widget_proxy.set_attribute(attribute_name, *args)
+        else
+          super(attribute_name, *args)
+        end
+      end
+
+      def get_attribute(attribute_name)
+        if ATTRIBUTES.include?(attribute_name.to_s)
+          @widget_proxy.get_attribute(attribute_name)
+        else
+          super(attribute_name)
+        end
+      end
+      
+      def dispose
+        swt_expand_item.setControl(nil)
+        swt_widget.dispose
+        swt_expand_item.dispose
+      end
+    end
+  end
+end

data/lib/glimmer/swt/image_proxy.rb

@@ -60,6 +60,8 @@ module Glimmer
           @swt_image = Image.new(DisplayProxy.instance.swt_display, @image_data)
           width = options[:width]
           height = options[:height]
+          height = (@image_data.height.to_f / @image_data.width.to_f)*width.to_f if !width.nil? && height.nil?
+          width = (@image_data.width.to_f / @image_data.height.to_f)*height.to_f if !height.nil? && width.nil?
           scale_to(width, height) unless width.nil? || height.nil?
         else
           @swt_image = Image.new(*@args)

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -47,7 +47,7 @@ module Glimmer
         super("composite", parent, style, &contents)
         @widget_proxy = SWT::WidgetProxy.new('tab_item', parent, style)
         @swt_tab_item = @widget_proxy.swt_widget
-        @widget_proxy.swt_widget.control = self.swt_widget
+        @swt_tab_item.control = swt_widget
       end
 
       def has_attribute?(attribute_name, *args)

data/lib/glimmer/swt/widget_proxy.rb

@@ -61,6 +61,7 @@ module Glimmer
         'toggle'              => [:toggle],
         'tool_bar'            => [:push],
         'tool_item'           => [:push],
+        'expand_bar'          => [:v_scroll],
         'tree'                => [:virtual, :border, :h_scroll, :v_scroll],
       }
 

data/samples/elaborate/meta_sample.rb

@@ -100,6 +100,7 @@ class MetaSampleApplication
   
   def launch
     shell {
+      minimum_size 1280, 768
       text 'Glimmer Meta-Sample (The Sample of Samples)'
       
       on_swt_show {
@@ -109,29 +110,28 @@ class MetaSampleApplication
       sash_form {
         composite {
           grid_layout 1, false
-          
-          scrolled_composite {
+            
+          expand_bar {
             layout_data(:fill, :fill, true, true)
+            font height: 30
             
-            composite {
-              SampleDirectory.sample_directories.each { |sample_directory|
-                group {
-                  layout_data(:fill, :fill, true, true)
-                  grid_layout 2, false
-                  text "#{sample_directory.name} Samples"
-                  font height: 30
-                  
-                  sample_directory.samples.each { |sample|
-                    label_radio = radio {
-                      selection bind(sample, :selected)
-                    }
-                    label {
-                      text sample.name
-                      font height: 30
-                      
-                      on_mouse_up {
-                        sample.selected = true
-                      }
+            SampleDirectory.sample_directories.each { |sample_directory|
+              expand_item {
+                layout_data(:fill, :fill, true, true)
+                grid_layout 2, false
+                text "#{sample_directory.name} Samples"
+                
+                sample_directory.samples.each { |sample|
+                  label_radio = radio {
+                    selection bind(sample, :selected)
+                  }
+                  label {
+                    layout_data :fill, :center, true, false
+                    text sample.name
+                    font height: 24
+                    
+                    on_mouse_up {
+                      sample.selected = true
                     }
                   }
                 }
@@ -140,11 +140,11 @@ class MetaSampleApplication
           }
           
           button {
-            layout_data(:center, :center, false, false) {
-              height_hint 150
+            layout_data(:fill, :center, true, false) {
+              height_hint 120
             }
             text 'Launch Sample'
-            font height: 45
+            font height: 30
             on_widget_selected {
               SampleDirectory.selected_sample.launch
             }

data/samples/hello/hello_expand_bar.rb

@@ -0,0 +1,108 @@
+# 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.
+
+class HelloExpandBar
+  include Glimmer
+  
+  def launch
+    shell {
+      grid_layout(1, false) {
+        margin_width 0
+        margin_height 0
+      }
+      minimum_size 320, 240
+      text 'Hello, Expand Bar!'
+      
+      @status_label = label(:center) {
+        text ' '
+        layout_data :fill, :center, true, false
+        font height: 24
+      }
+      
+      expand_bar {
+        layout_data :fill, :fill, true, true
+        
+        expand_item {
+          text 'Productivity'
+          
+          button {
+            text 'Word Processing'
+          }
+          button {
+            text 'Spreadsheets'
+          }
+          button {
+            text 'Presentations'
+          }
+          button {
+            text 'Database'
+          }
+        }
+        
+        expand_item {
+          text 'Tools'
+          
+          button {
+            text 'Calculator'
+          }
+          button {
+            text 'Unit Converter'
+          }
+          button {
+            text 'Currency Converter'
+          }
+          button {
+            text 'Scientific Calculator'
+          }
+        }
+        
+        expand_item {
+          text 'Reading'
+          
+          button {
+            text 'eBooks'
+          }
+          button {
+            text 'News'
+          }
+          button {
+            text 'Blogs'
+          }
+          button {
+            text 'Papers'
+          }
+        }
+        
+        on_item_expanded { |expand_event|
+          @status_label.text = "#{expand_event.item.text} Expanded!"
+        }
+        
+        on_item_collapsed { |expand_event|
+          @status_label.text = "#{expand_event.item.text} Collapsed!"
+        }
+        
+        
+      }
+    }.open
+  end
+end
+
+HelloExpandBar.new.launch

data/samples/hello/hello_styled_text.rb

@@ -0,0 +1,138 @@
+# 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.
+
+verbiage = <<-MULTI_LINE_STRING
+
+Glimmer DSL for SWT is a native-GUI cross-platform desktop development library written in JRuby, 
+an OS-threaded faster version of Ruby. 
+Glimmer's main innovation is a declarative Ruby DSL that enables productive and efficient authoring 
+of desktop application user-interfaces while 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. 
+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.
+
+MULTI_LINE_STRING
+
+class StyledTextPresenter
+  include Glimmer
+  attr_accessor :text, :caret_offset, :selection_count, :selection, :top_pixel
+    
+  def line_index_for_offset(line_offset)
+    text[0..line_offset].split("\n").size
+  end
+end
+
+include Glimmer
+
+@presenter = StyledTextPresenter.new
+@presenter.text = verbiage*8
+@presenter.caret_offset = 0
+@presenter.selection_count = 0
+@presenter.selection = Point.new(0, 0)
+@presenter.top_pixel = 0
+
+shell {
+  text 'Hello, Styled Text!'
+  
+  composite {
+    @styled_text = styled_text {
+      layout_data :fill, :fill, true, true
+      text bind(@presenter, :text)
+      left_margin 5
+      top_margin 5
+      right_margin 5
+      bottom_margin 5
+      # caret offset scrolls text to view when out of page
+      caret_offset bind(@presenter, :caret_offset)
+      # selection_count is not needed if selection is used
+      selection_count bind(@presenter, :selection_count)
+      # selection contains both caret_offset and selection_count, but setting it does not scroll text into view if out of page
+      selection bind(@presenter, :selection)
+      # top_pixel indicates vertically what pixel scrolling is at in a long multi-page text document
+      top_pixel bind(@presenter, :top_pixel)
+      
+      # This demonstrates how to set styles via a listener
+      on_line_get_style { |line_style_event|        
+        line_offset = line_style_event.lineOffset
+        if @presenter.line_index_for_offset(line_offset) % 52 < 13
+          line_size = line_style_event.lineText.size
+          style_range = StyleRange.new(line_offset, line_size, color(:blue).swt_color, nil, swt(:italic))
+          style_range.font = Font.new(display.swt_display, 'Times New Roman', 18, swt(:normal))
+          line_style_event.styles = [style_range].to_java(StyleRange)
+        elsif @presenter.line_index_for_offset(line_offset) % 52 < 26
+          line_size = line_style_event.lineText.size
+          style_range = StyleRange.new(line_offset, line_size, color(:dark_green).swt_color, color(:yellow).swt_color, swt(:bold))
+          line_style_event.styles = [style_range].to_java(StyleRange)
+        elsif @presenter.line_index_for_offset(line_offset) % 52 < 39
+          line_size = line_style_event.lineText.size
+          style_range = StyleRange.new(line_offset, line_size, color(:red).swt_color, nil, swt(:normal))
+          style_range.underline = true
+          style_range.font = Font.new(display.swt_display, 'Arial', 16, swt(:normal))
+          line_style_event.styles = [style_range].to_java(StyleRange)
+        else
+          line_size = line_style_event.lineText.size
+          style_range = StyleRange.new(line_offset, line_size, color(:dark_magenta).swt_color, color(:cyan).swt_color, swt(:normal))
+          style_range.strikeout = true
+          line_style_event.styles = [style_range].to_java(StyleRange)        
+        end
+      }
+    }
+    
+    composite {
+      row_layout :horizontal
+      
+      label {
+        text 'Caret Offset:'
+      }
+      text {
+        text bind(@presenter, :caret_offset, on_read: ->(o) {"%04d" % [o] })
+      }
+      label {
+        text 'Selection Count:'
+      }
+      text {
+        text bind(@presenter, :selection_count, on_read: ->(o) {"%04d" % [o] })
+      }
+      label {
+        text 'Selection Start:'
+      }
+      text {
+        text bind(@presenter, 'selection.x', on_read: ->(o) {"%04d" % [o] })
+      }
+      label {
+        text 'Selection End:'
+      }
+      text {
+        text bind(@presenter, 'selection.y', on_read: ->(o) {"%04d" % [o] })
+      }
+      label {
+        text 'Top Pixel:'
+      }
+      text {
+        text bind(@presenter, :top_pixel, on_read: ->(o) {"%04d" % [o] })
+      }      
+    }    
+  }
+}.open

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.17.4.2
+  version: 4.17.5.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -356,6 +356,7 @@ files:
 - lib/glimmer/dsl/swt/dnd_expression.rb
 - lib/glimmer/dsl/swt/dsl.rb
 - lib/glimmer/dsl/swt/exec_expression.rb
+- lib/glimmer/dsl/swt/expand_item_expression.rb
 - lib/glimmer/dsl/swt/font_expression.rb
 - lib/glimmer/dsl/swt/image_expression.rb
 - lib/glimmer/dsl/swt/layout_data_expression.rb
@@ -387,6 +388,7 @@ files:
 - lib/glimmer/swt/custom/code_text.rb
 - lib/glimmer/swt/display_proxy.rb
 - lib/glimmer/swt/dnd_proxy.rb
+- lib/glimmer/swt/expand_item_proxy.rb
 - lib/glimmer/swt/font_proxy.rb
 - lib/glimmer/swt/image_proxy.rb
 - lib/glimmer/swt/layout_data_proxy.rb
@@ -426,12 +428,14 @@ files:
 - samples/hello/hello_custom_shell.rb
 - samples/hello/hello_custom_widget.rb
 - samples/hello/hello_drag_and_drop.rb
+- samples/hello/hello_expand_bar.rb
 - samples/hello/hello_list_multi_selection.rb
 - samples/hello/hello_list_single_selection.rb
 - samples/hello/hello_menu_bar.rb
 - samples/hello/hello_message_box.rb
 - samples/hello/hello_pop_up_context_menu.rb
 - samples/hello/hello_sash_form.rb
+- samples/hello/hello_styled_text.rb
 - samples/hello/hello_tab.rb
 - samples/hello/hello_world.rb
 - vendor/swt/linux/swt.jar