glimmer-dsl-swt 4.20.13.9 → 4.20.13.13

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 {