glimmer-dsl-swt 4.20.0.5 → 4.20.4.0

data/lib/glimmer/swt/widget_proxy.rb

@@ -232,9 +232,12 @@ module Glimmer
       def has_attribute?(attribute_name, *args)
         # TODO test that attribute getter responds too
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
+        property_type_converter = property_type_converters[attribute_name.to_s.to_sym]
         auto_exec do
           if widget_custom_attribute
             @swt_widget.respond_to?(widget_custom_attribute[:setter][:name])
+          elsif property_type_converter
+            true
           else
             super
           end
@@ -765,7 +768,7 @@ module Glimmer
 
       def can_add_listener?(underscored_listener_name)
         auto_exec do
-          !self.class.find_listener(@swt_widget.getClass, underscored_listener_name).empty?
+          @swt_widget && !self.class.find_listener(@swt_widget.getClass, underscored_listener_name).empty?
         end
       end
 

data/lib/glimmer/ui/custom_shape.rb

@@ -248,7 +248,7 @@ module Glimmer
       # Otherwise, if a block is passed, it adds it as content to this custom shape
       def content(&block)
         if block_given?
-          body_root.content(&block)
+          Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::CustomShapeExpression.new, self.class.keyword, &block)
         else
           @content
         end

data/lib/glimmer/ui/custom_widget.rb

@@ -296,7 +296,7 @@ module Glimmer
       # Otherwise, if a block is passed, it adds it as content to this custom widget
       def content(&block)
         if block_given?
-          body_root.content(&block)
+          Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::CustomWidgetExpression.new, self.class.keyword, &block)
         else
           @content
         end

data/samples/elaborate/calculator.rb

@@ -45,7 +45,7 @@ class Calculator
       
       # Setting styled_text to multi in order for alignment options to activate
       styled_text(:multi, :wrap, :border) {
-        text bind(@presenter, :result)
+        text <= [@presenter, :result]
         alignment swt(:right)
         right_margin 5
         font height: 40

data/samples/elaborate/contact_manager.rb

@@ -110,7 +110,7 @@ class ContactManager
           }
         }
 
-        table(:multi) { |table_proxy|
+        table(:editable, :multi) { |table_proxy|
           layout_data {
             horizontal_alignment :fill
             vertical_alignment :fill
@@ -132,7 +132,7 @@ class ContactManager
             width 200
           }
           
-          items bind(@contact_manager_presenter, :results), column_properties(:first_name, :last_name, :email)
+          items <=> [@contact_manager_presenter, :results, column_properties: [:first_name, :last_name, :email]]
           
           on_mouse_up { |event|
             table_proxy.edit_table_item(event.table_item, event.column_index)

data/samples/elaborate/meta_sample.rb

@@ -226,7 +226,7 @@ class MetaSampleApplication
                   row_layout(:vertical) {
                     fill true
                   }
-                  selection bind(sample_directory, :selected_sample_name)
+                  selection <=> [sample_directory, :selected_sample_name]
                   font height: 20
                 }
               }
@@ -242,7 +242,7 @@ class MetaSampleApplication
             button {
               text 'Launch'
               font height: 25
-              enabled bind(SampleDirectory, 'selected_sample.launchable')
+              enabled <= [SampleDirectory, 'selected_sample.launchable']
               
               on_widget_selected {
                 begin
@@ -255,7 +255,7 @@ class MetaSampleApplication
             button {
               text 'Reset'
               font height: 25
-              enabled bind(SampleDirectory, 'selected_sample.editable')
+              enabled <= [SampleDirectory, 'selected_sample.editable']
               
               on_widget_selected {
                 SampleDirectory.selected_sample.reset_code!
@@ -277,8 +277,8 @@ class MetaSampleApplication
           line_numbers {
             background :white
           }
-          text bind(SampleDirectory, 'selected_sample.code', read_only: true)
-          editable bind(SampleDirectory, 'selected_sample.editable')
+          text <=> [SampleDirectory, 'selected_sample.code']
+          editable <= [SampleDirectory, 'selected_sample.editable']
           left_margin 7
           right_margin 7
         }

data/samples/elaborate/tetris.rb

@@ -102,14 +102,14 @@ class Tetris
   }
   
   after_body {
-    @game_over_observer = observe(@game, :game_over) do |game_over|
+    observe(@game, :game_over) do |game_over|
       if game_over
         show_high_score_dialog
       else
         start_moving_tetrominos_down
       end
     end
-    @show_high_scores_observer = observe(@game, :show_high_scores) do |show_high_scores|
+    observe(@game, :show_high_scores) do |show_high_scores|
       if show_high_scores
         show_high_score_dialog
       else

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

@@ -35,44 +35,44 @@ class Tetris
       
       body {
         rectangle(x, y, size, size) {
-          background bind(self, :base_color)
+          background <= [self, :base_color]
           polygon(0, 0, size, 0, size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size, bevel_pixel_size) {
-            background bind(self, :base_color) { |color_value|
+            background <= [self, :base_color, on_read: ->(color_value) {
               unless color_value.nil?
                 color = color(color_value)
                 rgb(color.red + 4*BEVEL_CONSTANT, color.green + 4*BEVEL_CONSTANT, color.blue + 4*BEVEL_CONSTANT)
               end
-            }
+            }]
           }
           polygon(size, 0, size - bevel_pixel_size, bevel_pixel_size, size - bevel_pixel_size, size - bevel_pixel_size, size, size) {
-            background bind(self, :base_color) { |color_value|
+            background <= [self, :base_color, on_read: ->(color_value) {
               unless color_value.nil?
                 color = color(color_value)
                 rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
               end
-            }
+            }]
           }
           polygon(size, size, 0, size, bevel_pixel_size, size - bevel_pixel_size, size - bevel_pixel_size, size - bevel_pixel_size) {
-            background bind(self, :base_color) { |color_value|
+            background <= [self, :base_color, on_read: ->(color_value) {
               unless color_value.nil?
                 color = color(color_value)
                 rgb(color.red - 2*BEVEL_CONSTANT, color.green - 2*BEVEL_CONSTANT, color.blue - 2*BEVEL_CONSTANT)
               end
-            }
+            }]
           }
           polygon(0, 0, 0, size, bevel_pixel_size, size - bevel_pixel_size, bevel_pixel_size, bevel_pixel_size) {
-            background bind(self, :base_color) { |color_value|
+            background <= [self, :base_color, on_read: ->(color_value) {
               unless color_value.nil?
                 color = color(color_value)
                 rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
               end
-            }
+            }]
           }
           rectangle(0, 0, size, size) {
-            foreground bind(self, :base_color) { |color_value|
+            foreground <= [self, :base_color, on_read: ->(color_value) {
               # use gray instead of white for the border
               color_value == Model::Block::COLOR_CLEAR ? :gray : color_value
-            }
+            }]
           }
         }
       }

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

@@ -31,7 +31,7 @@ class Tetris
       body {
         canvas { |canvas_proxy|
           bevel(size: block_size) {
-            base_color bind(game_playfield[row][column], :color)
+            base_color <= [game_playfield[row][column], :color]
           }
         }
       }

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

@@ -40,12 +40,12 @@ class Tetris
             type :vertical
             center true
           }
-          text 'Tetris'
+          text 'Glimmer Tetris'
           
           tetris_menu_bar(game: game)
           
           label(:center) {
-            text bind(game, :game_over) {|game_over| game_over ? 'Game Over!' : 'High Scores'}
+            text <= [game, :game_over, on_read: ->(game_over) { game_over ? 'Game Over!' : 'High Scores' }]
             font name: FONT_NAME, height: FONT_TITLE_HEIGHT, style: FONT_TITLE_STYLE
           }
           @high_score_table = table {
@@ -66,13 +66,13 @@ class Tetris
               text 'Level'
             }
             
-            items bind(game, :high_scores, read_only_sort: true), column_properties(:name, :score, :lines, :level)
+            items <=> [game, :high_scores, read_only_sort: true, column_properties: [:name, :score, :lines, :level]]
           }
           composite {
             row_layout :horizontal
                         
             @play_close_button = button {
-              text bind(game, :game_over) {|game_over| game_over ? 'Play Again?' : 'Close'}
+              text <= [game, :game_over, on_read: ->(game_over) { game_over ? 'Play Again?' : 'Close'}]
               focus true # initial focus
               
               on_widget_selected {

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

@@ -55,7 +55,7 @@ class Tetris
             font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           label(:center) {
-            text bind(game, :score)
+            text <= [game, :score]
             font height: @font_height
           }
           
@@ -66,7 +66,7 @@ class Tetris
             font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           label(:center) {
-            text bind(game, :lines)
+            text <= [game, :lines]
             font height: @font_height
           }
           
@@ -77,7 +77,7 @@ class Tetris
             font name: @font_name, height: @font_height, style: FONT_TITLE_STYLE
           }
           label(:center) {
-            text bind(game, :level)
+            text <= [game, :level]
             font height: @font_height
           }
         }

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

@@ -35,7 +35,7 @@ class Tetris
             
             menu_item {
               text '&Start'
-              enabled bind(game, :game_over)
+              enabled <= [game, :game_over]
               accelerator COMMAND_KEY, :s
               
               on_widget_selected {
@@ -45,9 +45,9 @@ class Tetris
             menu_item(:check) {
               text '&Pause'
               accelerator COMMAND_KEY, :p
-              enabled bind(game, :game_over, on_read: :!) {|value| value && !game.show_high_scores}
-              enabled bind(game, :show_high_scores, on_read: :!) {|value| value && !game.game_over}
-              selection bind(game, :paused)
+              enabled <= [game, :game_over, on_read: ->(value) { value && !game.show_high_scores }]
+              enabled <= [game, :show_high_scores, on_read: ->(value) { value && !game.game_over }]
+              selection <=> [game, :paused]
             }
             menu_item {
               text '&Restart'
@@ -76,7 +76,7 @@ class Tetris
               menu_item(:check) {
                 text '&Show'
                 accelerator COMMAND_KEY, :shift, :h
-                selection bind(game, :show_high_scores)
+                selection <=> [game, :show_high_scores]
               }
               menu_item {
                 text '&Clear'
@@ -94,24 +94,24 @@ class Tetris
             menu_item(:check) {
               text '&Beeping'
               accelerator COMMAND_KEY, :b
-              selection bind(game, :beeping)
+              selection <=> [game, :beeping]
             }
             menu {
               text 'Up Arrow'
               menu_item(:radio) {
                 text '&Instant Down'
                 accelerator COMMAND_KEY, :shift, :i
-                selection bind(game, :instant_down_on_up, computed_by: :up_arrow_action)
+                selection <=> [game, :instant_down_on_up, computed_by: :up_arrow_action]
               }
               menu_item(:radio) {
                 text 'Rotate &Right'
                 accelerator COMMAND_KEY, :shift, :r
-                selection bind(game, :rotate_right_on_up, computed_by: :up_arrow_action)
+                selection <=> [game, :rotate_right_on_up, computed_by: :up_arrow_action]
               }
               menu_item(:radio) {
                 text 'Rotate &Left'
                 accelerator COMMAND_KEY, :shift, :l
-                selection bind(game, :rotate_left_on_up, computed_by: :up_arrow_action)
+                selection <=> [game, :rotate_left_on_up, computed_by: :up_arrow_action]
               }
             }
           } # end of menu

data/samples/elaborate/timer.rb

@@ -84,7 +84,7 @@ class Timer
         menu_item {
           text '&Start'
           accelerator COMMAND_KEY, 's'
-          enabled bind(self, :countdown, on_read: :!)
+          enabled <= [self, :countdown, on_read: :!]
           
           on_widget_selected {
             start_countdown
@@ -92,7 +92,7 @@ class Timer
         }
         menu_item {
           text 'St&op'
-          enabled bind(self, :countdown)
+          enabled <= [self, :countdown]
           accelerator COMMAND_KEY, 'o'
           
           on_widget_selected {
@@ -148,8 +148,8 @@ class Timer
         text_limit 2
         digits 0
         maximum 59
-        selection bind(self, :min)
-        enabled bind(self, :countdown, on_read: :!)
+        selection <=> [self, :min]
+        enabled <= [self, :countdown, on_read: :!]
         on_widget_default_selected {
           start_countdown
         }
@@ -162,8 +162,8 @@ class Timer
         text_limit 2
         digits 0
         maximum 59
-        selection bind(self, :sec)
-        enabled bind(self, :countdown, on_read: :!)
+        selection <=> [self, :sec]
+        enabled <= [self, :countdown, on_read: :!]
         on_widget_default_selected {
           start_countdown
         }
@@ -179,7 +179,7 @@ class Timer
       }
       @start_button = button {
         text '&Start'
-        enabled bind(self, :countdown, on_read: :!)
+        enabled <= [self, :countdown, on_read: :!]
         on_widget_selected {
           start_countdown
         }
@@ -189,7 +189,7 @@ class Timer
       }
       @stop_button = button {
         text 'St&op'
-        enabled bind(self, :countdown)
+        enabled <= [self, :countdown]
         on_widget_selected {
           stop_countdown
         }

data/samples/hello/hello_canvas_animation_data_binding.rb

@@ -49,7 +49,7 @@ class HelloAnimationDataBinding
           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)
+          every <= [self, :delay_time]
           
           frame { |index|
             background rgb(index%100, index%100 + 100, index%55 + 200)

data/samples/hello/hello_checkbox_group.rb

@@ -58,7 +58,7 @@ class HelloCheckboxGroup
       }
       
       checkbox_group {
-        selection bind(@person, :activities)
+        selection <=> [@person, :activities]
       }
     
       button {

data/samples/hello/hello_code_text.rb

@@ -85,7 +85,7 @@ class HelloCodeText
           fill_layout
           text 'Ruby (glimmer theme)'
           code_text(language: 'ruby', theme: 'glimmer', lines: true) {
-            text bind(self, :ruby_code)
+            text <=> [self, :ruby_code]
           }
         }
         tab_item {
@@ -101,14 +101,14 @@ class HelloCodeText
             line_numbers {
               background :white
             }
-            text bind(self, :js_code)
+            text <=> [self, :js_code]
           }
         }
         tab_item {
           fill_layout
           text 'HTML (github theme)'
           code_text(language: 'html', theme: 'github') { # default is lines: false
-            text bind(self, :html_code)
+            text <=> [self, :html_code]
           }
         }
       }

data/samples/hello/hello_cool_bar.rb

@@ -73,7 +73,7 @@ class HelloCoolBar
           }
           # a combo can be nested in a tool_bar (it auto-generates a tool_item for itself behind the scenes)
           combo {
-            selection bind(self, :font_size)
+            selection <=> [self, :font_size]
           }
         }
       }

data/samples/hello/hello_cursor.rb

@@ -51,7 +51,7 @@ class HelloCursor
       }
       radio_group {
         grid_layout 5, true
-        selection bind(self, :selected_cursor)
+        selection <=> [self, :selected_cursor]
       }
     }
   }

data/samples/hello/hello_custom_shell.rb

@@ -138,7 +138,7 @@ class HelloCustomShell
           width 360
         }
         
-        items bind(@email_system, :emails), column_properties(:date, :subject, :from)
+        items <=> [@email_system, :emails, column_properties: [:date, :subject, :from]]
         
         on_mouse_up { |event|
           email = event.table_item.get_data

data/samples/hello/hello_directory_dialog.rb

@@ -44,7 +44,7 @@ class HelloDirectoryDialog
       
       label {
         layout_data :fill, :center, true, false
-        text bind(self, :selected_directory)
+        text <= [self, :selected_directory]
         font height: 14
       }