glimmer-dsl-swt 4.20.13.9 → 4.20.13.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7f34d2baa127f20cc05b387d51afed496456ee236e5a206594c1b5bd672aa56
-  data.tar.gz: e19feae85a8f5b29fee1c40eb259618b95b235ce7b41e847e8277a124e5ae362
+  metadata.gz: 982e9293313f88fc19f63d148e0b59b1dcda227e25bc47d9eb07377359b90084
+  data.tar.gz: c90ad4be0b5ebf2aaa28b5b0376934e518f7fbe878a3ecb4a37982fa5feac554
 SHA512:
-  metadata.gz: e8fa48e0b887ed4a772eda18f997ed91f5ad2005d3aeae9aa1e1fccd2baffbdeb3e9578a56c2ca51b04eda425dc7b1ef420bf9bb6ab1b2fe28bde0aefc820dd2
-  data.tar.gz: 89a9947c73556344f300e7db6fe8d43913f1d089c041d5416b9c0b69367549764978c990737da74c157d573118d81c0a771ff06025676b5b3ba781f30e095853
+  metadata.gz: 6946dfd8d245a2ef28df3df0c7eb3b74213f4c912c69a6de5ce0bd4f42d7b69f87671df845a816c532d6b580bd0f9da535639368aba6ed0abd76d689c66ded07
+  data.tar.gz: c630515458b13ab4b08c6c662c27759c9a0adb8903e5f0a5e20aba958792d3949f48ae47d9849ffddbe52d4a7b33887955979d76ffe6223871cc51e8f844c443

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+### 4.20.13.10
+
+- Update Glimmer Style Guide, scaffolding, and samples to have `before_body` and `after_body` in custom widgets/shells/shapes always take a `do; end` block since they contain logic not visuals
+
+### 4.20.13.9
+
+- Update Klondike Solitaire to have playing card suit symbols and avoid clipping of cards on the boundaries
+
 ### 4.20.13.8
 
 - Glimmer Klondike Solitaire 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.20.13.9
+# [<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.20.13.10
 ## 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)
@@ -15,7 +15,7 @@
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.13.9 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 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. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.13.10 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 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. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
 
 **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 (keep in mind that it is still a beta, so default back to `bind` whenever needed).
 
@@ -326,7 +326,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.13.9
+jgem install glimmer-dsl-swt -v 4.20.13.10
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -354,7 +354,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.20.13.9'
+gem 'glimmer-dsl-swt', '~> 4.20.13.10'
 ```
 
 And, then run:
@@ -375,7 +375,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.9
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.10
       
 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.20.13.9
+4.20.13.10

data/docs/reference/GLIMMER_STYLE_GUIDE.md

@@ -10,6 +10,7 @@
 - Widget listeners are always declared starting with `on_` prefix and affixing listener event method name afterwards in underscored lowercase form. Their multi-line blocks rely on the `do; end` style.
 - Widget listeners are always followed by a block using curly braces (Only when declared in DSL. When invoked on widget object directly outside of GUI declarations, standard Ruby conventions apply)
 - Data-binding is done via `bind` keyword, which always takes arguments wrapped in parentheses
-- Custom widget `body`, `before_body`, and `after_body` blocks open their blocks and close them with curly braces.
+- Custom widget/shell/shape `body` blocks open and close with curly braces.
+- Custom widget/shell/shape `before_body` and `after_body` blocks are declared as `do; end` blocks.
 - Custom widgets receive additional keyword arguments called options, which come after the SWT styles.
 - Pure logic multi-line blocks that do not constitute GUI DSL view elements (such as `Thread.new`, `loop`, `each` and `observe` blocks) rely on the `do; end` style to clearly separate logic code from view code.

data/lib/glimmer/rake_task/scaffold.rb

@@ -607,7 +607,7 @@ module Glimmer
           
           if %i[gem app desktopify].include?(shell_type)
             custom_shell_file_content += <<-MULTI_LINE_STRING
-      before_body {
+      before_body do
         Display.app_name = '#{shell_type == :gem ? human_name(custom_shell_name) : human_name(namespace)}'
         Display.app_version = VERSION
         @display = display {
@@ -618,13 +618,13 @@ module Glimmer
             #{shell_type == :desktopify ? 'display_about_dialog' : 'display_preferences_dialog'}
           }
         }
-      }
+      end
             MULTI_LINE_STRING
           else
             custom_shell_file_content += <<-MULTI_LINE_STRING
-      # before_body {
+      # before_body do
       #
-      # }
+      # end
             MULTI_LINE_STRING
           end
     
@@ -632,9 +632,9 @@ module Glimmer
   
       ## Use after_body block to setup observers for widgets in body
       #
-      # after_body {
+      # after_body do
       #
-      # }
+      # end
   
       ## Add widget content inside custom shell body
       ## Top-most widget must be a shell or another custom shell
@@ -767,15 +767,15 @@ end
       ## Use before_body block to pre-initialize variables to use in body
       #
       #
-      # before_body {
+      # before_body do
       #
-      # }
+      # end
   
       ## Use after_body block to setup observers for widgets in body
       #
-      # after_body {
+      # after_body do
       #
-      # }
+      # end
   
       ## Add widget content under custom widget body
       ##
@@ -817,15 +817,15 @@ end
       ## Use before_body block to pre-initialize variables to use in body
       #
       #
-      # before_body {
+      # before_body do
       #
-      # }
+      # end
   
       ## Use after_body block to setup observers for shapes in body
       #
-      # after_body {
+      # after_body do
       #
-      # }
+      # end
   
       ## Add shape content under custom shape body
       #

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

@@ -121,7 +121,7 @@ module Glimmer
           @line_numbers_styled_text_proxy.content(&block)
         end
         
-        before_body {
+        before_body do
           require 'rouge'
           require 'ext/rouge/themes/glimmer'
           @swt_style = swt_style == 0 ? [:border, :multi, :v_scroll, :h_scroll] : swt_style
@@ -132,11 +132,11 @@ module Glimmer
             @lines_width = lines[:width]
           end
           @dsl_mode = true
-        }
+        end
         
-        after_body {
+        after_body do
           @dsl_mode = nil
-        }
+        end
         
         body {
           if lines

data/samples/elaborate/calculator.rb

@@ -15,7 +15,7 @@ class Calculator
 
   attr_reader :presenter
 
-  before_body {
+  before_body do
     @presenter = Model::Presenter.new
     
     Display.setAppName('Glimmer Calculator')
@@ -30,7 +30,7 @@ class Calculator
         display_about_dialog
       }
     }
-  }
+  end
 
   body {
     shell {

data/samples/elaborate/contact_manager.rb

@@ -26,10 +26,10 @@ require_relative "contact_manager/contact_manager_presenter"
 class ContactManager
   include Glimmer::UI::CustomShell
 
-  before_body {
+  before_body do
     @contact_manager_presenter = ContactManagerPresenter.new
     @contact_manager_presenter.list
-  }
+  end
 
   body {
     shell {

data/samples/elaborate/klondike_solitaire.rb

@@ -15,17 +15,7 @@ class KlondikeSolitaire
   TABLEAU_WIDTH = 2*MARGIN + 7*(PLAYING_CARD_WIDTH + PLAYING_CARD_SPACING)
   TABLEAU_HEIGHT = 400
 
-
-  ## Add options like the following to configure CustomShell by outside consumers
-  #
-  # options :title, :background_color
-  # option :width, default: 320
-  # option :height, default: 240
-
-  ## Use before_body block to pre-initialize variables to use in body
-  #
-  #
-  before_body {
+  before_body do
     @game = Model::Game.new
     Display.app_name = 'Glimmer Klondike Solitaire'
     @display = display {
@@ -36,17 +26,8 @@ class KlondikeSolitaire
         display_about_dialog
       }
     }
-  }
-
-  ## Use after_body block to setup observers for widgets in body
-  #
-  # after_body {
-  #
-  # }
+  end
 
-  ## Add widget content inside custom shell body
-  ## Top-most widget must be a shell or another custom shell
-  #
   body {
     shell(:no_resize) {
       row_layout(:vertical) {

data/samples/elaborate/klondike_solitaire/view/empty_playing_card.rb

@@ -5,10 +5,15 @@ class KlondikeSolitaire
     class EmptyPlayingCard
       include Glimmer::UI::CustomShape
       
-      option :suit
-  
+      options :card_x, :card_y, :suit
+      
+      before_body do
+        self.card_x ||= 0
+        self.card_y ||= 0
+      end
+      
       body {
-        rectangle(0, 0, 49, 79, 15, 15) {
+        rectangle(card_x, card_y, 49, 79, 15, 15) {
           foreground :gray
           
           if suit

data/samples/elaborate/klondike_solitaire/view/foundation_pile.rb

@@ -10,12 +10,12 @@ class KlondikeSolitaire
       
       attr_accessor :current_image, :model
       
-      before_body {
+      before_body do
         self.current_image = image(50, 80) {empty_playing_card(suit: suit)}
         self.model = game.foundation_piles[Model::PlayingCard::SUITS.index(suit)]
-      }
+      end
   
-      after_body {
+      after_body do
         observe(model, 'playing_cards.last') do |last_card|
           if last_card
             body_root.content {
@@ -28,7 +28,7 @@ class KlondikeSolitaire
             }
           end
         end
-      }
+      end
       
       body {
         shape(pile_x, pile_y) {

data/samples/elaborate/klondike_solitaire/view/hidden_playing_card.rb

@@ -3,8 +3,15 @@ class KlondikeSolitaire
     class HiddenPlayingCard
       include Glimmer::UI::CustomShape
   
+      options :card_x, :card_y
+      
+      before_body do
+        self.card_x ||= 0
+        self.card_y ||= 0
+      end
+      
       body {
-        rectangle(0, 0, 49, 79, 15, 15) {
+        rectangle(card_x, card_y, 49, 79, 15, 15) {
           background :red
           
           # border

data/samples/elaborate/klondike_solitaire/view/playing_card.rb

@@ -5,10 +5,10 @@ class KlondikeSolitaire
   
       options :card_x, :card_y, :model, :parent_pile
       
-      before_body {
+      before_body do
         self.card_x ||= 0
         self.card_y ||= 0
-      }
+      end
   
       body {
         rectangle(card_x, card_y, 49, 79, 15, 15) {

data/samples/elaborate/login.rb

@@ -65,9 +65,9 @@ end
 class Login
   include Glimmer::UI::CustomShell
 
-  before_body {
+  before_body do
     @presenter = LoginPresenter.new
-  }
+  end
 
   body {
     shell {

data/samples/elaborate/mandelbrot_fractal.rb

@@ -149,33 +149,33 @@ class MandelbrotFractal
       
   option :zoom, default: 1.0
   
-  before_body {
+  before_body do
     Display.app_name = 'Mandelbrot Fractal'
     # pre-calculate mandelbrot image
     @mandelbrot_image = build_mandelbrot_image
-  }
+  end
   
-  after_body {
-    observe(Mandelbrot, :work_in_progress) {
+  after_body do
+    observe(Mandelbrot, :work_in_progress) do
       update_mandelbrot_shell_title!
-    }
-    observe(Mandelbrot, :zoom) {
+    end
+    observe(Mandelbrot, :zoom) do
       update_mandelbrot_shell_title!
-    }
+    end
     # pre-calculate zoomed mandelbrot images even before the user zooms in
     puts 'Starting background calculation thread...'
-    @thread = Thread.new {
+    @thread = Thread.new do
       future_zoom = 1.5
-      loop {
+      loop do
         puts "Creating mandelbrot for background calculation at zoom: #{future_zoom}"
         the_mandelbrot = Mandelbrot.for(max_iterations: color_palette.size - 1, zoom: future_zoom, background: true)
         pixels = the_mandelbrot.calculate_points
         build_mandelbrot_image(mandelbrot_zoom: future_zoom)
         @canvas.cursor = :cross unless @canvas.disposed?
         future_zoom += 0.5
-      }
-    }
-  }
+      end
+    end
+  end
   
   body {
     shell(:no_resize) {

data/samples/elaborate/meta_sample.rb

@@ -192,13 +192,13 @@ end
 class MetaSampleApplication
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     Sample.ensure_user_glimmer_directory
     selected_sample_directory = SampleDirectory.sample_directories.first
     selected_sample = selected_sample_directory.samples.first
     selected_sample_directory.selected_sample_name = selected_sample.name
     Display.app_name = 'Glimmer Meta-Sample'
-  }
+  end
   
   body {
     shell(:fill_screen) {

data/samples/elaborate/metronome.rb

@@ -64,9 +64,9 @@ class Metronome
       
   attr_accessor :rhythm
   
-  before_body {
+  before_body do
     @rhythm = Rhythm.new(4)
-  }
+  end
   
   body {
     shell(:no_resize) {

data/samples/elaborate/stock_ticker.rb

@@ -65,7 +65,7 @@ class StockTicker
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @stocks = [
       Stock.new('DELL', 81),
       Stock.new('AAPL', 121),
@@ -126,16 +126,16 @@ class StockTicker
         end
       end
     end
-  }
+  end
   
-  after_body {
-    @thread = Thread.new {
-      loop {
+  after_body do
+    @thread = Thread.new do
+      loop do
         @stocks.each(&:tick!)
         sleep(0.01)
-      }
-    }
-  }
+      end
+    end
+  end
   
   body {
     shell {

data/samples/elaborate/tetris.rb

@@ -43,7 +43,7 @@ class Tetris
   
   attr_reader :game
   
-  before_body {
+  before_body do
     @mutex = Mutex.new
     @game = Model::Game.new(playfield_width, playfield_height)
         
@@ -99,9 +99,9 @@ class Tetris
         exit(0)
       }
     }
-  }
+  end
   
-  after_body {
+  after_body do
     observe(@game, :game_over) do |game_over|
       if game_over
         show_high_score_dialog
@@ -117,7 +117,7 @@ class Tetris
       end
     end
     @game.start!
-  }
+  end
   
   body {
     shell(:no_resize) {

data/samples/elaborate/tetris/view/bevel.rb

@@ -29,9 +29,9 @@ class Tetris
       option :x, default: 0
       option :y, default: 0
       
-      before_body {
+      before_body do
         self.bevel_pixel_size = 0.16*size.to_f if bevel_pixel_size.nil?
-      }
+      end
       
       body {
         rectangle(x, y, size, size) {

data/samples/elaborate/tetris/view/score_lane.rb

@@ -29,10 +29,10 @@ class Tetris
   
       options :block_size, :game
       
-      before_body {
+      before_body do
         @font_name = FONT_NAME
         @font_height = FONT_TITLE_HEIGHT
-      }
+      end
   
       body {
         composite {

data/samples/elaborate/tic_tac_toe.rb

@@ -26,16 +26,16 @@ require_relative "tic_tac_toe/board"
 class TicTacToe
   include Glimmer::UI::CustomShell
 
-  before_body {
+  before_body do
     @tic_tac_toe_board = Board.new
-  }
+  end
   
-  after_body {
-    observe(@tic_tac_toe_board, :game_status) { |game_status|
+  after_body do
+    observe(@tic_tac_toe_board, :game_status) do |game_status|
       display_win_message if game_status == Board::WIN
       display_draw_message if game_status == Board::DRAW
-    }
-  }
+    end
+  end
 
   body {
     shell {

data/samples/elaborate/timer.rb

@@ -20,7 +20,7 @@ class Timer
   ## Use before_body block to pre-initialize variables to use in body
   #
   #
-  before_body {
+  before_body do
     Display.setAppName('Glimmer Timer')
     
     @display = display {
@@ -34,11 +34,11 @@ class Timer
 
     @min = 0
     @sec = 0
-  }
+  end
 
   ## Use after_body block to setup observers for widgets in body
   #
-  after_body {
+  after_body do
     Thread.new {
       loop {
         sleep(1)
@@ -56,7 +56,7 @@ class Timer
         end
       }
     }
-  }
+  end
 
   ## Add widget content inside custom shell body
   ## Top-most widget must be a shell or another custom shell

data/samples/elaborate/weather.rb

@@ -33,13 +33,13 @@ class Weather
   
   attr_accessor :city, :temp, :temp_min, :temp_max, :feels_like, :humidity
   
-  before_body {
+  before_body do
     @weather_mutex = Mutex.new
     self.city = 'Montreal, QC, CA'
     fetch_weather!
-  }
+  end
   
-  after_body {
+  after_body do
     Thread.new do
       loop do
         sleep(10)
@@ -47,7 +47,7 @@ class Weather
         fetch_weather!
       end
     end
-  }
+  end
   
   body {
     shell(:no_resize) {

data/samples/hello/hello_button.rb

@@ -26,9 +26,9 @@ class HelloButton
   
   attr_accessor :count
   
-  before_body {
+  before_body do
     @count = 0
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_c_combo.rb

@@ -38,9 +38,9 @@ class HelloCCombo
 
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_canvas.rb

@@ -27,19 +27,19 @@ class HelloCanvas
   attr_accessor :selected_shape
   attr_accessor :artist
   
-  before_body {
+  before_body do
     @image_object = image(File.expand_path('../../icons/scaffold_app.png', __dir__), width: 50)
     @artist = ''
-  }
+  end
   
-  after_body {
+  after_body do
     Thread.new {
       'Picasso'.chars.each do |character|
         sleep(1)
         self.artist += character
       end
     }
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_canvas_animation.rb

@@ -27,14 +27,14 @@ class HelloCanvasAnimation
   
   attr_accessor :animation_every, :animation_fps, :animation_frame_count, :animation_duration_limit, :animation_started, :animation_finished
   
-  before_body {
+  before_body do
     @animation_every = 0.050 # seconds
     @animation_fps = 0
     @animation_frame_count = 100
     @animation_duration_limit = 0 # seconds
     @animation_started = true
     @animation_finished = false
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_canvas_data_binding.rb

@@ -37,7 +37,7 @@ class HelloCanvasDataBinding
     [:solid, :dash, :dot, :dashdot, :dashdotdot]
   end
   
-  before_body {
+  before_body do
     self.x1_value = 0
     self.y1_value = 0
     self.x2_value = CANVAS_WIDTH
@@ -47,7 +47,7 @@ class HelloCanvasDataBinding
     self.foreground_blue = 228
     self.line_width_value = 3
     self.line_style_value = :dot
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_checkbox.rb

@@ -39,9 +39,9 @@ class HelloCheckbox
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_checkbox_group.rb

@@ -43,9 +43,9 @@ class HelloCheckboxGroup
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_code_text.rb

@@ -26,7 +26,7 @@ class HelloCodeText
   
   attr_accessor :ruby_code, :js_code, :html_code
   
-  before_body {
+  before_body do
     self.ruby_code = <<~RUBY
       greeting = 'Hello, World!'
       
@@ -73,7 +73,7 @@ class HelloCodeText
         </body>
       </html>
     HTML
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_color_dialog.rb

@@ -26,9 +26,9 @@ class HelloColorDialog
   
   attr_accessor :selected_color
   
-  before_body {
+  before_body do
     self.selected_color = :black
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_combo.rb

@@ -37,9 +37,9 @@ class HelloCombo
 
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_computed.rb

@@ -44,13 +44,13 @@ class HelloComputed
 
   include Glimmer::UI::CustomShell
 
-  before_body {
+  before_body do
     @contact = Contact.new(
       first_name: 'Barry',
       last_name: 'McKibbin',
       year_of_birth: 1985
     )
-  }
+  end
 
   body {
     shell {
@@ -66,51 +66,43 @@ class HelloComputed
         
         label {text 'First &Name: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :first_name]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text '&Last Name: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :last_name]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text '&Year of Birth: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :year_of_birth]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text 'Name: '}
         label {
+          fill_horizontally_layout_data
           text <= [@contact, :name, computed_by: [:first_name, :last_name]]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text 'Age: '}
         label {
+          fill_horizontally_layout_data
           text <= [@contact, :age, on_write: :to_i, computed_by: [:year_of_birth]]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
       }
     }
   }
+  
+  def fill_horizontally_layout_data
+    layout_data {
+      horizontal_alignment :fill
+      grab_excess_horizontal_space true
+    }
+  end
 end
 
 HelloComputed.launch

data/samples/hello/hello_cool_bar.rb

@@ -30,9 +30,9 @@ class HelloCoolBar
     (10..30).to_a.map(&:to_s)
   end
   
-  before_body {
+  before_body do
     self.font_size = '30'
-  }
+  end
 
   body {
     shell {

data/samples/hello/hello_cursor.rb

@@ -31,11 +31,11 @@ class HelloCursor
     Glimmer::SWT::SWTProxy.cursor_options
   end
   
-  after_body {
+  after_body do
     observe(self, :selected_cursor) {
       body_root.cursor = selected_cursor
     }
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_custom_shape.rb

@@ -27,12 +27,12 @@ class StickFigure
   
   options :x, :y, :width, :height
   
-  before_body {
+  before_body do
     @head_width = width*0.2
     @head_height = height*0.2
     @trunk_height = height*0.4
     @extremity_length = height*0.4
-  }
+  end
   
   body {
     shape(x + @head_width/2.0 + @extremity_length, y) {

data/samples/hello/hello_custom_shell.rb

@@ -34,9 +34,9 @@ class EmailShell
   # single option with default value
   option :to, default: '"John Irwin" <john.irwin@example.com>'
   
-  before_body {
+  before_body do
     @swt_style |= swt(:shell_trim, :modeless)
-  }
+  end
   
   body {
     # pass received swt_style through to shell to customize it (e.g. :dialog_trim for a blocking shell)

data/samples/hello/hello_custom_widget.rb

@@ -34,12 +34,12 @@ class GreetingLabel
   # internal attribute (not a custom widget option)
   attr_accessor :color
   
-  before_body {
+  before_body do
     @font = {height: 24, style: :bold}
     @color = :black
-  }
+  end
   
-  after_body {
+  after_body do
     return if colors.nil?
     
     Thread.new {
@@ -48,7 +48,7 @@ class GreetingLabel
         sleep(1)
       }
     }
-  }
+  end
   
   body {
     # pass received swt_style through to label to customize (e.g. :center to center text)

data/samples/hello/hello_date_time.rb

@@ -28,10 +28,10 @@ class HelloDateTime
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
     @person.date_of_birth = DateTime.new(2013, 7, 12, 18, 37, 23)
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_directory_dialog.rb

@@ -26,9 +26,9 @@ class HelloDirectoryDialog
   
   attr_accessor :selected_directory
   
-  before_body {
+  before_body do
     @selected_directory = 'Please select a directory.'
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_file_dialog.rb

@@ -26,9 +26,9 @@ class HelloFileDialog
   
   attr_accessor :selected_file
   
-  before_body {
+  before_body do
     @selected_file = 'Please select a file.'
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_font_dialog.rb

@@ -26,9 +26,9 @@ class HelloFontDialog
   
   attr_accessor :selected_font_data
   
-  before_body {
+  before_body do
     @selected_font_data = FontData.new('Times New Roman', 40, swt(:bold))
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_group.rb

@@ -41,9 +41,9 @@ class HelloGroup
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_list_multi_selection.rb

@@ -52,9 +52,9 @@ class HelloListMultiSelection
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_list_single_selection.rb

@@ -37,9 +37,9 @@ class HelloListSingleSelection
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_progress_bar.rb

@@ -28,13 +28,13 @@ class HelloProgressBar
     attr_accessor :minimum, :maximum, :selection, :delay
   end
         
-  before_body {
+  before_body do
     @progress_model = ProgressModel.new
     @progress_model.minimum = 0
     @progress_model.maximum = 100
     @progress_model.selection = 0
     @progress_model.delay = 0.01
-  }
+  end
 
   body {
     shell {

data/samples/hello/hello_radio.rb

@@ -41,9 +41,9 @@ class HelloRadio
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_radio_group.rb

@@ -48,9 +48,9 @@ class HelloRadioGroup
 
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_scale.rb

@@ -26,9 +26,9 @@ class HelloScale
   
   attr_accessor :value
   
-  before_body {
+  before_body do
     @value = 50
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_spinner.rb

@@ -28,10 +28,10 @@ class HelloSpinner
   
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
     @person.donation = 500 # in cents
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_table.rb

@@ -183,9 +183,9 @@ class HelloTable
 
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     Display.app_name = 'Hello, Table!'
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_text.rb

@@ -5,7 +5,7 @@ class HelloText
   
   attr_accessor :default, :center, :left, :right, :password, :telephone, :read_only, :wrap, :multi
   
-  before_body {
+  before_body do
     self.default = 'default is :border style'
     self.center = 'centered'
     self.left = 'left-aligned'
@@ -15,7 +15,7 @@ class HelloText
     self.read_only = 'Telephone area code is 555'
     self.wrap = 'wraps if text content is too long like this example'
     self.multi = "multi-line enables hitting enter,\nbut does not wrap by default"
-  }
+  end
   
   body {
     shell {

data/samples/hello/hello_tool_bar.rb

@@ -30,9 +30,9 @@ class HelloToolBar
     (10..30).to_a.map(&:to_s)
   end
   
-  before_body {
+  before_body do
     self.font_size = '30'
-  }
+  end
 
   body {
     shell {

data/samples/hello/hello_tray_item.rb

@@ -27,7 +27,7 @@ class HelloTrayItem
   # boolean that indicates if application is visible
   attr_accessor :show_application
   
-  before_body {
+  before_body do
     # application starts visible
     @show_application = true
     # pre-render an icon image using the Canvas Shape DSL
@@ -48,7 +48,7 @@ class HelloTrayItem
         foreground :white
       }
     }
-  }
+  end
   
   body {
     shell(:shell_trim, :on_top) { # make it always appear on top of everything

data/samples/hello/hello_tree.rb

@@ -288,13 +288,13 @@ class HelloTree
 
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     Employee.selected_employee = Employee.ceo
-  }
+  end
   
-  after_body {
+  after_body do
     @tree.items.first.expanded = true
-  }
+  end
 
   body {
     shell {

metadata

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