glimmer-dsl-swt 4.19.0.1 → 4.20.0.3

data/samples/elaborate/mandelbrot_fractal.rb

@@ -103,7 +103,7 @@ class Mandelbrot
       puts "Points calculated already. Returning previously calculated points..."
       return @points
     end
-    thread_pool = Concurrent::FixedThreadPool.new(Mandelbrot.processor_count, fallback_policy: :discard)
+    @thread_pool = Concurrent::FixedThreadPool.new(Mandelbrot.processor_count, fallback_policy: :discard)
     @points = Concurrent::Array.new(height)
     Mandelbrot.work_in_progress = "Calculating Mandelbrot Points for Zoom #{zoom}x"
     Mandelbrot.progress = 0
@@ -112,15 +112,15 @@ class Mandelbrot
     height.times do |y|
       @points[y] ||= Concurrent::Array.new(width)
       width.times do |x|
-        thread_pool.post do
+        @thread_pool.post do
           @points[y][x] = calculate(x_array[x], y_array[y]).last
           point_index += 1
           Mandelbrot.progress += 1 if (point_index.to_f / point_count.to_f)*PROGRESS_MAX >= Mandelbrot.progress
         end
       end
     end
-    thread_pool.shutdown
-    thread_pool.wait_for_termination
+    @thread_pool.shutdown
+    @thread_pool.wait_for_termination
     Mandelbrot.progress = PROGRESS_MAX
     @points_calculated = true
     @points
@@ -164,7 +164,7 @@ class MandelbrotFractal
     }
     # pre-calculate zoomed mandelbrot images even before the user zooms in
     puts 'Starting background calculation thread...'
-    Thread.new {
+    @thread = Thread.new {
       future_zoom = 1.5
       loop {
         puts "Creating mandelbrot for background calculation at zoom: #{future_zoom}"
@@ -180,16 +180,21 @@ class MandelbrotFractal
   body {
     shell(:no_resize) {
       grid_layout
-      text bind(self, :mandelbrot_shell_title)
+      text <= [self, :mandelbrot_shell_title]
       minimum_size mandelbrot.width + 29, mandelbrot.height + 77
       image @mandelbrot_image
+            
+      on_shell_closed {
+        @thread.kill # should not be dangerous in this case
+        puts "Mandelbrot background calculation stopped!"
+      }
       
       progress_bar {
         layout_data :fill, :center, true, false
 
         minimum 0
         maximum Mandelbrot::PROGRESS_MAX
-        selection bind(Mandelbrot, :progress)
+        selection <= [Mandelbrot, :progress]
       }
           
       @scrolled_composite = scrolled_composite {

data/samples/elaborate/meta_sample.rb

@@ -268,8 +268,10 @@ class MetaSampleApplication
           root {
             grid_layout(2, false) {
               horizontal_spacing 0
-              margin_width 0
-              margin_height 0
+              margin_left 0
+              margin_right 0
+              margin_top 0
+              margin_bottom 0
             }
           }
           line_numbers {

data/samples/elaborate/metronome.rb

@@ -69,7 +69,7 @@ class Metronome
   }
   
   body {
-    shell {
+    shell(:no_resize) {
       row_layout(:vertical) {
         center true
       }
@@ -83,7 +83,7 @@ class Metronome
       spinner {
         minimum 1
         maximum 64
-        selection bind(self, 'rhythm.beat_count', after_write: ->(v) {restart_metronome})
+        selection <=> [self, 'rhythm.beat_count', after_write: ->(v) {restart_metronome}]
         font height: 30
       }
       
@@ -95,7 +95,7 @@ class Metronome
       spinner {
         minimum 30
         maximum 1000
-        selection bind(self, 'rhythm.bpm')
+        selection <=> [self, 'rhythm.bpm']
         font height: 30
       }
       
@@ -122,7 +122,7 @@ class Metronome
             height_hint 50
           }
           rectangle(0, 0, :default, :default, 36, 36) {
-            background bind(self, "rhythm.beats[#{n}].on") {|on| on ? :red : :yellow}
+            background <= [self, "rhythm.beats[#{n}].on", on_read: ->(on) { on ? :red : :yellow}]
           }
         }
       }

data/samples/elaborate/tetris/model/game.rb

@@ -33,8 +33,6 @@ class Tetris
     class Game
       PLAYFIELD_WIDTH = 10
       PLAYFIELD_HEIGHT = 20
-#       PLAYFIELD_WIDTH = 5
-#       PLAYFIELD_HEIGHT = 5
       PREVIEW_PLAYFIELD_WIDTH = 4
       PREVIEW_PLAYFIELD_HEIGHT = 2
       SCORE_MULTIPLIER = {1 => 40, 2 => 100, 3 => 300, 4 => 1200}
@@ -201,7 +199,6 @@ class Tetris
       
       def delay
         [1.1 - (level.to_i * 0.1), 0.001].max
-#         99999
       end
       
       def beep

data/samples/elaborate/tic_tac_toe.rb

@@ -47,8 +47,8 @@ class TicTacToe
           (1..3).each { |column|
             button {
               layout_data :fill, :fill, true, true
-              text        bind(@tic_tac_toe_board[row, column], :sign)
-              enabled     bind(@tic_tac_toe_board[row, column], :empty)
+              text        <= [@tic_tac_toe_board[row, column], :sign]
+              enabled     <= [@tic_tac_toe_board[row, column], :empty]
               font        style: :bold, height: 20
               on_widget_selected {
                 @tic_tac_toe_board.mark(row, column)

data/samples/hello/hello_button.rb

@@ -35,7 +35,7 @@ class HelloButton
       text 'Hello, Button!'
       
       button {
-        text bind(self, :count) {|value| "Click To Increment: #{value}  "}
+        text <= [self, :count, on_read: ->(value) { "Click To Increment: #{value}  " }]
         
         on_widget_selected {
           self.count += 1

data/samples/hello/hello_c_combo.rb

@@ -21,6 +21,7 @@
 
 require 'glimmer-dsl-swt'
 
+# This is a sample for the c_combo widget, a more customizable version of combo
 class HelloCCombo
   class Person
     attr_accessor :country, :country_options
@@ -50,7 +51,7 @@ class HelloCCombo
       text 'Hello, C Combo!'
       
       c_combo(:read_only) {
-        selection bind(@person, :country) # also binds to country_options by convention
+        selection <=> [@person, :country] # also binds to country_options by convention
         font height: 45 # unlike `combo`, `c_combo` changes height when setting the font height
       }
       

data/samples/hello/hello_c_tab.rb

@@ -23,6 +23,7 @@
 
 require 'glimmer-dsl-swt'
 
+# This is a sample for the Custom Tab widgets (c_tab_folder & c_tab_item), which are more customizable versions of tab_folder and tab_item.
 class HelloCTab
   include Glimmer::UI::CustomShell
   

data/samples/hello/hello_canvas.rb

@@ -59,7 +59,7 @@ class HelloCanvas
           rectangle([:default, -70], :default, :default, [:default, 1]) {
             foreground :cyan
             text {
-              string bind(self, :artist)
+              string <=> [self, :artist]
               x :default, 1 # add 1 pixel to default x (shape centered within parent horizontally)
               y :default, 1 # add 1 pixel to default y (shape centered within parent vertically)
               background :yellow
@@ -105,7 +105,7 @@ class HelloCanvas
         menu {
           menu_item {
             text 'Change Background Color...'
-            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:background) && shape.background }
+            enabled <=> [self, :selected_shape, on_read: ->(shape) { shape.respond_to?(:background) && shape.background }]
             on_widget_selected {
               @selected_shape&.background = color_dialog.open
               self.selected_shape = nil
@@ -113,7 +113,7 @@ class HelloCanvas
           }
           menu_item {
             text 'Change Background Pattern Color 1...'
-            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:background_pattern) && shape.background_pattern }
+            enabled <=> [self, :selected_shape, on_read: ->(shape) { shape.respond_to?(:background_pattern) && shape.background_pattern }]
             on_widget_selected {
               if @selected_shape
                 background_pattern_args = @selected_shape.background_pattern_args
@@ -125,7 +125,7 @@ class HelloCanvas
           }
           menu_item {
             text 'Change Background Pattern Color 2...'
-            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:background_pattern) && shape.background_pattern }
+            enabled <=> [self, :selected_shape, on_read: ->(shape) { shape.respond_to?(:background_pattern) && shape.background_pattern }]
             on_widget_selected {
               if @selected_shape
                 background_pattern_args = @selected_shape.background_pattern_args
@@ -138,7 +138,7 @@ class HelloCanvas
           menu_item(:separator)
           menu_item {
             text 'Change Foreground Color...'
-            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:foreground) && shape.foreground }
+            enabled <=> [self, :selected_shape, on_read: ->(shape) { shape.respond_to?(:foreground) && shape.foreground }]
             on_widget_selected {
               @selected_shape&.foreground = color_dialog.open
               self.selected_shape = nil

data/samples/hello/hello_canvas_animation_data_binding.rb

@@ -46,7 +46,7 @@ class HelloAnimationDataBinding
           digits 3
           minimum 1
           maximum 100
-          selection bind(self, :delay_time, on_read: ->(v) {(BigDecimal(v.to_s)*1000).to_f}, on_write: ->(v) {(BigDecimal(v.to_s)/1000).to_f})
+          selection <=> [self, :delay_time, on_read: ->(v) {(BigDecimal(v.to_s)*1000).to_f}, on_write: ->(v) {(BigDecimal(v.to_s)/1000).to_f}]
         }
         animation {
           every bind(self, :delay_time)

data/samples/hello/hello_canvas_data_binding.rb

@@ -81,7 +81,7 @@ class HelloCanvasDataBinding
             }
             maximum CANVAS_WIDTH
             increment 3
-            selection bind(self, :x1_value)
+            selection <=> [self, :x1_value]
           }
           spinner {
             layout_data(:fill, :center, false, false) {
@@ -89,7 +89,7 @@ class HelloCanvasDataBinding
             }
             maximum CANVAS_HEIGHT
             increment 3
-            selection bind(self, :y1_value)
+            selection <=> [self, :y1_value]
           }
           label {
             layout_data(:fill, :center, false, false) {
@@ -109,7 +109,7 @@ class HelloCanvasDataBinding
             }
             maximum CANVAS_WIDTH
             increment 3
-            selection bind(self, :x2_value)
+            selection <=> [self, :x2_value]
           }
           spinner {
             layout_data(:fill, :center, false, false) {
@@ -117,7 +117,7 @@ class HelloCanvasDataBinding
             }
             maximum CANVAS_HEIGHT
             increment 3
-            selection bind(self, :y2_value)
+            selection <=> [self, :y2_value]
           }
           label {
             layout_data(:fill, :center, false, false) {
@@ -143,7 +143,7 @@ class HelloCanvasDataBinding
             }
             maximum 255
             increment 10
-            selection bind(self, :foreground_red)
+            selection <=> [self, :foreground_red]
           }
           spinner {
             layout_data(:fill, :center, false, false) {
@@ -151,7 +151,7 @@ class HelloCanvasDataBinding
             }
             maximum 255
             increment 10
-            selection bind(self, :foreground_green)
+            selection <=> [self, :foreground_green]
           }
           spinner {
             layout_data(:fill, :center, false, false) {
@@ -159,7 +159,7 @@ class HelloCanvasDataBinding
             }
             maximum 255
             increment 10
-            selection bind(self, :foreground_blue)
+            selection <=> [self, :foreground_blue]
           }
           label {
             layout_data(:fill, :center, false, false) {
@@ -178,13 +178,13 @@ class HelloCanvasDataBinding
               horizontal_span 3
             }
             maximum 255
-            selection bind(self, :line_width_value)
+            selection <=> [self, :line_width_value]
           }
           combo(:read_only) {
             layout_data(:fill, :center, false, false) {
               horizontal_span 3
             }
-            selection bind(self, :line_style_value)
+            selection <=> [self, :line_style_value]
           }
           canvas {
             layout_data(:center, :center, false, false) {
@@ -195,13 +195,13 @@ class HelloCanvasDataBinding
             background :white
             
             line {
-              x1 bind(self, :x1_value)
-              y1 bind(self, :y1_value)
-              x2 bind(self, :x2_value)
-              y2 bind(self, :y2_value)
-              foreground bind(self, :foreground_value, computed_by: [:foreground_red, :foreground_green, :foreground_blue])
-              line_width bind(self, :line_width_value)
-              line_style bind(self, :line_style_value)
+              x1 <=> [self, :x1_value]
+              y1 <=> [self, :y1_value]
+              x2 <=> [self, :x2_value]
+              y2 <=> [self, :y2_value]
+              foreground <=> [self, :foreground_value, computed_by: [:foreground_red, :foreground_green, :foreground_blue]]
+              line_width <=> [self, :line_width_value]
+              line_style <=> [self, :line_style_value]
             }
           }
         }

data/samples/hello/hello_checkbox.rb

@@ -56,22 +56,22 @@ class HelloCheckbox
       composite {
         checkbox {
           text 'Skiing'
-          selection bind(@person, :skiing)
+          selection <=> [@person, :skiing]
         }
         
         checkbox {
           text 'Snowboarding'
-          selection bind(@person, :snowboarding)
+          selection <=> [@person, :snowboarding]
         }
         
         checkbox {
           text 'Snowmobiling'
-          selection bind(@person, :snowmobiling)
+          selection <=> [@person, :snowmobiling]
         }
         
         checkbox {
           text 'Snowshoeing'
-          selection bind(@person, :snowshoeing)
+          selection <=> [@person, :snowshoeing]
         }
       }
       

data/samples/hello/hello_code_text.rb

@@ -83,47 +83,14 @@ class HelloCodeText
       tab_folder {
         tab_item {
           fill_layout
-          text 'Ruby (glimmer)'
+          text 'Ruby (glimmer theme)'
           code_text(language: 'ruby', theme: 'glimmer', lines: true) {
             text bind(self, :ruby_code)
           }
         }
         tab_item {
           fill_layout
-          text 'Ruby (pastie)'
-          code_text(language: 'ruby', theme: 'pastie', lines: {width: 2}) {
-            text bind(self, :ruby_code)
-          }
-        }
-        tab_item {
-          fill_layout
-          text 'Ruby (github)'
-          code_text(language: 'ruby', theme: 'github', lines: false) {
-            text bind(self, :ruby_code)
-          }
-        }
-        tab_item {
-          fill_layout
-          text 'JavaScript (glimmer)'
-          # No border (SWT styles are passed explicitly)
-          code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'glimmer', lines: true) {
-            # 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 bind(self, :js_code)
-          }
-        }
-        tab_item {
-          fill_layout
-          text 'JavaScript (pastie)'
+          text 'JavaScript (pastie theme)'
           code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'pastie', lines: {width: 2}) {
             root {
               grid_layout(2, false) {
@@ -139,28 +106,7 @@ class HelloCodeText
         }
         tab_item {
           fill_layout
-          text 'JavaScript (github)'
-          code_text(:multi, :h_scroll, :v_scroll, language: 'javascript', theme: 'github') { # default is lines: false
-            text bind(self, :js_code)
-          }
-        }
-        tab_item {
-          fill_layout
-          text 'HTML (glimmer)'
-          code_text(language: 'html', theme: 'glimmer', lines: true) {
-            text bind(self, :html_code)
-          }
-        }
-        tab_item {
-          fill_layout
-          text 'HTML (pastie)'
-          code_text(language: 'html', theme: 'pastie', lines: {width: 2}) {
-            text bind(self, :html_code)
-          }
-        }
-        tab_item {
-          fill_layout
-          text 'HTML (github)'
+          text 'HTML (github theme)'
           code_text(language: 'html', theme: 'github') { # default is lines: false
             text bind(self, :html_code)
           }

data/samples/hello/hello_color_dialog.rb

@@ -45,7 +45,7 @@ class HelloColorDialog
       
       canvas(:border) {
         layout_data :center, :center, true, false
-        background bind(self, :selected_color)
+        background <=> [self, :selected_color]
         
         on_mouse_up {
           self.selected_color = color_dialog.open

data/samples/hello/hello_combo.rb

@@ -50,7 +50,7 @@ class HelloCombo
       text 'Hello, Combo!'
       
       combo(:read_only) {
-        selection bind(@person, :country) # also binds to country_options by convention
+        selection <=> [@person, :country] # also binds to country_options by convention
       }
       
       button {