glimmer-dsl-swt 4.18.4.9 → 4.18.5.2

data/samples/elaborate/meta_sample.rb

@@ -219,7 +219,7 @@ class MetaSampleApplication
             SampleDirectory.sample_directories.each { |sample_directory|
               expand_item {
                 layout_data(:fill, :fill, true, true)
-                text " #{sample_directory.name} Samples"
+                text " #{sample_directory.name} Samples (#{sample_directory.samples.count})"
                 
                 radio_group { |radio_group_proxy|
                   row_layout(:vertical) {

data/samples/elaborate/tetris.rb

@@ -182,6 +182,7 @@ class Tetris
           time = Time.now
           sleep @game.delay
           break if @game.game_over? || body_root.disposed?
+          # ensure entire game tetromino down movement happens as one GUI update event with sync_exec (to avoid flicker/stutter)
           sync_exec {
             @game.down! unless @game.paused?
           }

data/samples/elaborate/tic_tac_toe.rb

@@ -22,11 +22,21 @@
 require_relative "tic_tac_toe/board"
 
 class TicTacToe
-  include Glimmer
+  include Glimmer::UI::CustomShell
 
-  def initialize
+  before_body {
     @tic_tac_toe_board = Board.new
-    @shell = shell {
+  }
+  
+  after_body {
+    observe(@tic_tac_toe_board, :game_status) { |game_status|
+      display_win_message if game_status == Board::WIN
+      display_draw_message if game_status == Board::DRAW
+    }
+  }
+
+  body {
+    shell {
       text "Tic-Tac-Toe"
       minimum_size 176, 200
       composite {
@@ -46,11 +56,7 @@ class TicTacToe
         }
       }
     }
-    observe(@tic_tac_toe_board, :game_status) { |game_status|
-      display_win_message if game_status == Board::WIN
-      display_draw_message if game_status == Board::DRAW
-    }
-  end
+  }
 
   def display_win_message
     display_game_over_message("Player #{@tic_tac_toe_board.winning_sign} has won!")
@@ -65,12 +71,8 @@ class TicTacToe
       text 'Game Over'
       message message_text
     }.open
-    @tic_tac_toe_board.reset
-  end
-
-  def open
-    @shell.open
+    @tic_tac_toe_board.reset!
   end
 end
 
-TicTacToe.new.open
+TicTacToe.launch

data/samples/elaborate/tic_tac_toe/board.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -60,10 +60,10 @@ class TicTacToe
       win
     end
   
-    def reset
+    def reset!
       (1..3).each do |row|
         (1..3).each do |column|
-          self[row, column].reset
+          self[row, column].reset!
         end
       end
       @winning_sign = Cell::EMPTY

data/samples/elaborate/tic_tac_toe/cell.rb

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -25,14 +25,14 @@ class TicTacToe
     attr_accessor :sign, :empty
   
     def initialize
-      reset
+      reset!
     end
   
     def mark(sign)
       self.sign = sign
     end
   
-    def reset
+    def reset!
       self.sign = EMPTY
     end
   

data/samples/hello/hello_button.rb

@@ -20,15 +20,15 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class HelloButton
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
   attr_accessor :count
   
-  def initialize
+  before_body {
     @count = 0
-  end
+  }
   
-  def launch
+  body {
     shell {
       text 'Hello, Button!'
       
@@ -39,8 +39,8 @@ class HelloButton
           self.count += 1
         }
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloButton.new.launch
+HelloButton.launch

data/samples/hello/hello_canvas.rb

@@ -19,46 +19,148 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-include Glimmer
-
-shell {
-  text 'Hello, Canvas Image Icon!'
-  minimum_size 320, 400
-
-  canvas {
-    background :yellow
-    rectangle(0, 0, 220, 400) {
-      background :red
-    }
-    rectangle(50, 20, 300, 150, 30, 50) {
-      background :magenta
-    }
-    rectangle(150, 200, 100, 70, true) {
-      background :dark_magenta
-      foreground :yellow
-    }
-    rectangle(50, 200, 30, 70, false) {
-      background :magenta
-      foreground :dark_blue
-    }
-    rectangle(205, 50, 88, 96) {
-      foreground :yellow
-    }
-    text('Picasso', 60, 80) {
-      background :yellow
-      foreground :dark_magenta
-      font name: 'Courier', height: 30
-    }
-    oval(110, 310, 100, 100) {
-      # patterns provide a differnet way to make gradients
-      background_pattern 0, 0, 105, 0, :yellow, rgb(128, 138, 248)
-    }
-    arc(210, 210, 100, 100, 30, -77) {
-      background :red
-    }
-    polygon(250, 210, 260, 170, 270, 210, 290, 230) {
-      background :dark_yellow
+class HelloCanvas
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :selected_shape
+  
+  before_body {
+    @image_object = image(File.expand_path('../../icons/scaffold_app.png', __dir__), width: 50)
+  }
+  
+  body {
+    shell {
+      text 'Hello, Canvas!'
+      minimum_size 320, 400
+    
+      @canvas = canvas {
+        background :yellow
+        rectangle(0, 0, 220, 400) {
+          background :red
+        }
+        rectangle(50, 20, 300, 150, 30, 50) {
+          background :magenta
+        }
+        rectangle(150, 200, 100, 70, true) {
+          background :dark_magenta
+          foreground :yellow
+        }
+        rectangle(50, 200, 30, 70, false) {
+          background :magenta
+          foreground :dark_blue
+        }
+        rectangle(205, 50, 88, 96) {
+          foreground :yellow
+        }
+        text('Picasso', 60, 80) {
+          background :yellow
+          foreground :dark_magenta
+          font name: 'Courier', height: 30
+        }
+        oval(110, 310, 100, 100) {
+          # patterns provide a differnet way to make gradients
+          background_pattern 0, 0, 105, 0, :yellow, rgb(128, 138, 248)
+        }
+        arc(210, 210, 100, 100, 30, -77) {
+          background :red
+        }
+        polygon(250, 210, 260, 170, 270, 210, 290, 230) {
+          background :dark_yellow
+        }
+        polyline(250, 110, 260, 70, 270, 110, 290, 130, 250, 110)
+        3.times { |n|
+          line(250, 120 + n*10, 270 + n*10, 80 + n*10) {
+            foreground :yellow
+          }
+        }
+        10.times {|n|
+          point(220 + n*5, 100 + n*5) {
+            foreground :yellow
+          }
+        }
+        image(@image_object, 205, 55)
+      
+        menu {
+          menu_item {
+            text 'Change Background Color...'
+            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:background) && shape.background }
+            on_widget_selected {
+              @selected_shape&.background = color_dialog.open
+              self.selected_shape = nil
+            }
+          }
+          menu_item {
+            text 'Change Background Pattern Color 1...'
+            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:background_pattern) && shape.background_pattern }
+            on_widget_selected {
+              if @selected_shape
+                background_pattern_args = @selected_shape.background_pattern_args
+                background_pattern_args[5] = color_dialog.open
+                @selected_shape.background_pattern = background_pattern_args
+                self.selected_shape = nil
+              end
+            }
+          }
+          menu_item {
+            text 'Change Background Pattern Color 2...'
+            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:background_pattern) && shape.background_pattern }
+            on_widget_selected {
+              if @selected_shape
+                background_pattern_args = @selected_shape.background_pattern_args
+                background_pattern_args[6] = color_dialog.open
+                @selected_shape.background_pattern = background_pattern_args
+                self.selected_shape = nil
+              end
+            }
+          }
+          menu_item(:separator)
+          menu_item {
+            text 'Change Foreground Color...'
+            enabled bind(self, :selected_shape) {|shape| shape.respond_to?(:foreground) && shape.foreground }
+            on_widget_selected {
+              @selected_shape&.foreground = color_dialog.open
+              self.selected_shape = nil
+            }
+          }
+        }
+      
+        on_mouse_down { |mouse_event|
+          @drag_detected = false
+          @canvas.cursor = :hand
+          self.selected_shape = @canvas.shape_at_location(mouse_event.x, mouse_event.y)
+        }
+        
+        on_drag_detected { |drag_detect_event|
+          @drag_detected = true
+          @drag_current_x = drag_detect_event.x
+          @drag_current_y = drag_detect_event.y
+        }
+        
+        on_mouse_move { |mouse_event|
+          if @drag_detected
+            @selected_shape&.move_by(mouse_event.x - @drag_current_x, mouse_event.y - @drag_current_y)
+            @drag_current_x = mouse_event.x
+            @drag_current_y = mouse_event.y
+          end
+        }
+        
+        on_menu_detected { |menu_detect_event|
+          @menu_detected = true
+        }
+        
+        on_mouse_up { |mouse_event|
+          @canvas.cursor = :arrow
+          @drag_detected = false
+          if @menu_detected
+            @menu_detected = nil
+          else
+            self.selected_shape = nil
+          end
+        }
+      }
     }
-    polyline(250, 110, 260, 70, 270, 110, 290, 130, 250, 110)
   }
-}.open
+end
+
+HelloCanvas.launch
+        

data/samples/hello/hello_checkbox.rb

@@ -24,10 +24,10 @@ class HelloCheckbox
     attr_accessor :skiing, :snowboarding, :snowmobiling, :snowshoeing
     
     def initialize
-      reset_activities
+      reset_activities!
     end
     
-    def reset_activities
+    def reset_activities!
       self.skiing = false
       self.snowboarding = true
       self.snowmobiling = false
@@ -35,11 +35,13 @@ class HelloCheckbox
     end
   end
   
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
-  def launch
-    person = Person.new
-    
+  before_body {
+    @person = Person.new
+  }
+  
+  body {
     shell {
       text 'Hello, Checkbox!'
       row_layout :vertical
@@ -52,22 +54,22 @@ class HelloCheckbox
       composite {
         checkbox {
           text 'Skiing'
-          selection bind(person, :skiing)
+          selection bind(@person, :skiing)
         }
         
         checkbox {
           text 'Snowboarding'
-          selection bind(person, :snowboarding)
+          selection bind(@person, :snowboarding)
         }
         
         checkbox {
           text 'Snowmobiling'
-          selection bind(person, :snowmobiling)
+          selection bind(@person, :snowmobiling)
         }
         
         checkbox {
           text 'Snowshoeing'
-          selection bind(person, :snowshoeing)
+          selection bind(@person, :snowshoeing)
         }
       }
       
@@ -75,11 +77,11 @@ class HelloCheckbox
         text 'Reset Activities'
         
         on_widget_selected do
-          person.reset_activities
+          @person.reset_activities!
         end
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloCheckbox.new.launch
+HelloCheckbox.launch

data/samples/hello/hello_checkbox_group.rb

@@ -39,11 +39,13 @@ class HelloCheckboxGroup
     end
   end
   
-  include Glimmer
+  include Glimmer::UI::CustomShell
   
-  def launch
-    person = Person.new
-    
+  before_body {
+    @person = Person.new
+  }
+  
+  body {
     shell {
       text 'Hello, Checkbox Group!'
       row_layout :vertical
@@ -54,18 +56,18 @@ class HelloCheckboxGroup
       }
       
       checkbox_group {
-        selection bind(person, :activities)
+        selection bind(@person, :activities)
       }
     
       button {
         text 'Reset Activities'
         
         on_widget_selected do
-          person.reset_activities
+          @person.reset_activities
         end
       }
-    }.open
-  end
+    }
+  }
 end
 
-HelloCheckboxGroup.new.launch
+HelloCheckboxGroup.launch