glimmer-dsl-swt 4.18.7.6 → 4.20.0.0

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/stock_ticker.rb

@@ -110,13 +110,13 @@ class StockTicker
                 tab[:canvas].set_size(new_x_location, @tabs.first[:canvas].bounds.height)
                 tab[:canvas].cursor = :hand
                 tab[:scrolled_composite].set_min_size(new_x_location, @tabs.first[:canvas].bounds.height)
-                tab[:scrolled_composite].set_origin(tab[:scrolled_composite].origin.x + 1, tab[:scrolled_composite].origin.y) if (tab[:scrolled_composite].origin.x + tab[:scrolled_composite].client_area.width) == canvas_width
+                tab[:scrolled_composite].set_origin(tab[:scrolled_composite].origin.x + 1, tab[:scrolled_composite].origin.y) if (tab[:scrolled_composite].origin.x + tab[:scrolled_composite].client_area.width + (OS.mac? ? 0 : 20)) == canvas_width
               end
             else
               tab[:canvas_header].content {
                 text(stock.name, 15, new_y - 10) {
                   foreground @stock_colors[stock_index]
-                  font height: 14
+                  font height: 13
                 }
               }
             end

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

@@ -0,0 +1,69 @@
+# Copyright (c) 2007-2021 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-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
+  
+    def initialize
+      self.country_options = ['', 'Canada', 'US', 'Mexico']
+      reset_country!
+    end
+  
+    def reset_country!
+      self.country = 'Canada'
+    end
+  end
+
+  include Glimmer::UI::CustomShell
+  
+  before_body {
+    @person = Person.new
+  }
+  
+  body {
+    shell {
+      row_layout(:vertical) {
+        fill true
+      }
+      
+      text 'Hello, C Combo!'
+      
+      c_combo(:read_only) {
+        selection <=> [@person, :country] # also binds to country_options by convention
+        font height: 45 # unlike `combo`, `c_combo` changes height when setting the font height
+      }
+      
+      button {
+        text 'Reset Selection'
+        
+        on_widget_selected do
+          @person.reset_country!
+        end
+      }
+    }
+  }
+end
+
+HelloCCombo.launch

data/samples/hello/hello_c_tab.rb

@@ -0,0 +1,174 @@
+# Copyright (c) 2007-2021 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.
+
+# Country flag images were made by [Freepik](https://www.flaticon.com/authors/freepik) from [www.flaticon.com](http://www.flaticon.com)
+
+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
+  
+  body {
+    shell {
+      row_layout
+      text 'Hello, C Tab!'
+      minimum_size 200, 200
+      
+      c_tab_folder { # accepts styles: :close, :top, :bottom, :flat, :border, :single, :multi
+        layout_data {
+          width 1024
+          height 200
+        }
+        c_tab_item(:close) {
+          text 'English'
+          tool_tip_text 'English Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/usa.png', __dir__)
+          
+          label {
+            text 'Hello, World!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+        
+        c_tab_item(:close) {
+          text 'French'
+          tool_tip_text 'French Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/france.png', __dir__)
+          
+          label {
+            text 'Bonjour, Univers!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+        
+        c_tab_item(:close) {
+          text 'Spanish'
+          tool_tip_text 'Spanish Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/mexico.png', __dir__)
+          
+          label {
+            text 'Hola, Mundo!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+        
+        c_tab_item(:close) {
+          text 'German'
+          tool_tip_text 'German Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/germany.png', __dir__)
+
+          label {
+            text 'Hallo, Welt!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+
+        c_tab_item(:close) {
+          text 'Italian'
+          tool_tip_text 'Italian Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/italy.png', __dir__)
+
+          label {
+            text 'Ciao, Mondo!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+
+        c_tab_item(:close) {
+          text 'Dutch'
+          tool_tip_text 'Dutch Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/netherlands.png', __dir__)
+
+          label {
+            text 'Hallo, Wereld!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+
+        c_tab_item(:close) {
+          text 'Danish'
+          tool_tip_text 'Danish Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/denmark.png', __dir__)
+
+          label {
+            text 'Hej, Verden!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+
+        c_tab_item(:close) {
+          text 'Finnish'
+          tool_tip_text 'Finnish Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/finland.png', __dir__)
+
+          label {
+            text 'Hei, Maailma!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+
+        c_tab_item(:close) {
+          text 'Norwegian'
+          tool_tip_text 'Norwegian Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/norway.png', __dir__)
+
+          label {
+            text 'Hei, Verden!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+
+      }
+
+    }
+
+  }
+end
+
+HelloCTab.launch

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]
             }
           }
         }