glimmer-dsl-swt 4.18.6.3 → 4.18.7.4

data/samples/elaborate/meta_sample.rb

@@ -215,7 +215,7 @@ class MetaSampleApplication
             
           expand_bar {
             layout_data(:fill, :fill, true, true)
-            font height: 30
+            font height: 25
                         
             SampleDirectory.sample_directories.each { |sample_directory|
               expand_item {
@@ -227,7 +227,7 @@ class MetaSampleApplication
                     fill true
                   }
                   selection bind(sample_directory, :selected_sample_name)
-                  font height: 24
+                  font height: 20
                 }
               }
             }
@@ -236,12 +236,12 @@ class MetaSampleApplication
           composite {
             fill_layout
             layout_data(:fill, :center, true, false) {
-              height_hint 120
+              height_hint 96
             }
             
             button {
               text 'Launch'
-              font height: 30
+              font height: 25
               enabled bind(SampleDirectory, 'selected_sample.launchable')
               
               on_widget_selected {
@@ -254,7 +254,7 @@ class MetaSampleApplication
             }
             button {
               text 'Reset'
-              font height: 30
+              font height: 25
               enabled bind(SampleDirectory, 'selected_sample.editable')
               
               on_widget_selected {

data/samples/elaborate/metronome.rb

@@ -0,0 +1,177 @@
+# 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'
+
+class Metronome
+  class Beat
+    attr_accessor :on
+    
+    def off!
+      self.on = false
+    end
+    
+    def on!
+      self.on = true
+    end
+  end
+  
+  class Rhythm
+    attr_reader :beat_count
+    attr_accessor :beats, :bpm
+    
+    def initialize(beat_count)
+      self.beat_count = beat_count
+      @bpm = 120
+    end
+    
+    def beat_count=(value)
+      @beat_count = value
+      reset_beats!
+    end
+    
+    def reset_beats!
+      @beats = beat_count.times.map {Beat.new}
+      @beats.first.on!
+    end
+  end
+
+  include Glimmer::UI::CustomShell
+  
+  import 'javax.sound.sampled'
+  
+  GEM_ROOT = File.expand_path(File.join('..', '..'), __dir__)
+  FILE_SOUND_METRONOME_UP = File.join(GEM_ROOT, 'sounds', 'metronome-up.wav')
+  FILE_SOUND_METRONOME_DOWN = File.join(GEM_ROOT, 'sounds', 'metronome-down.wav')
+      
+  attr_accessor :rhythm
+  
+  before_body {
+    @rhythm = Rhythm.new(4)
+  }
+  
+  body {
+    shell {
+      row_layout(:vertical) {
+        center true
+      }
+      text 'Glimmer Metronome'
+      
+      label {
+        text 'Beat Count'
+        font height: 30, style: :bold
+      }
+      
+      spinner {
+        minimum 1
+        maximum 64
+        selection bind(self, 'rhythm.beat_count', after_write: ->(v) {restart_metronome})
+        font height: 30
+      }
+      
+      label {
+        text 'BPM'
+        font height: 30, style: :bold
+      }
+      
+      spinner {
+        minimum 30
+        maximum 1000
+        selection bind(self, 'rhythm.bpm')
+        font height: 30
+      }
+      
+      @beat_container = beat_container
+      
+      on_swt_show {
+        start_metronome
+      }
+      
+      on_widget_disposed {
+        stop_metronome
+      }
+    }
+  }
+  
+  def beat_container
+    composite {
+      grid_layout(@rhythm.beat_count, true)
+      
+      @rhythm.beat_count.times { |n|
+        canvas {
+          layout_data {
+            width_hint 50
+            height_hint 50
+          }
+          rectangle(0, 0, :default, :default, 36, 36) {
+            background bind(self, "rhythm.beats[#{n}].on") {|on| on ? :red : :yellow}
+          }
+        }
+      }
+    }
+  end
+  
+  def start_metronome
+    @thread ||= Thread.new {
+      @rhythm.beat_count.times.cycle { |n|
+        sleep(60.0/@rhythm.bpm.to_f)
+        @rhythm.beats.each(&:off!)
+        @rhythm.beats[n].on!
+        sound_file = n == 0 ? FILE_SOUND_METRONOME_UP : FILE_SOUND_METRONOME_DOWN
+        play_sound(sound_file)
+      }
+    }
+    if @beat_container.nil?
+      body_root.content {
+        @beat_container = beat_container
+      }
+      body_root.layout(true, true)
+      body_root.pack(true)
+    end
+  end
+  
+  def stop_metronome
+    @thread&.kill # safe since no stored data is involved
+    @thread = nil
+    @beat_container&.dispose
+    @beat_container = nil
+  end
+  
+  def restart_metronome
+    stop_metronome
+    start_metronome
+  end
+  
+  # Play sound with the Java Sound library
+  def play_sound(sound_file)
+    begin
+      file_or_stream = java.io.File.new(sound_file)
+      audio_stream = AudioSystem.get_audio_input_stream(file_or_stream)
+      clip = AudioSystem.clip
+      clip.open(audio_stream)
+      clip.start
+    rescue => e
+      puts e.full_message
+    end
+  end
+end
+
+Metronome.launch

data/samples/elaborate/tetris.rb

@@ -156,21 +156,7 @@ class Tetris
           color = colored ? color(([:white] + Model::Tetromino::LETTER_COLORS.values).sample) : color(:white)
           x = column * icon_block_size
           y = row * icon_block_size
-          rectangle(x, y, icon_block_size, icon_block_size) {
-            background color
-          }
-          polygon(x, y, x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size) {
-            background rgb(color.red + 4*BEVEL_CONSTANT, color.green + 4*BEVEL_CONSTANT, color.blue + 4*BEVEL_CONSTANT)
-          }
-          polygon(x + icon_block_size, y, x + icon_block_size - icon_bevel_pixel_size, y + icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size, y + icon_block_size) {
-            background rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
-          }
-          polygon(x + icon_block_size, y + icon_block_size, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_block_size - icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size) {
-            background rgb(color.red - 2*BEVEL_CONSTANT, color.green - 2*BEVEL_CONSTANT, color.blue - 2*BEVEL_CONSTANT)
-          }
-          polygon(x, y, x, y + icon_block_size, x + icon_bevel_pixel_size, y + icon_block_size - icon_bevel_pixel_size, x + icon_bevel_pixel_size, y + icon_bevel_pixel_size) {
-            background rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
-          }
+          bevel(x: x, y: y, base_color: color, size: icon_block_size)
         }
       }
     }

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

@@ -33,6 +33,8 @@ 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}
@@ -199,6 +201,7 @@ class Tetris
       
       def delay
         [1.1 - (level.to_i * 0.1), 0.001].max
+#         99999
       end
       
       def beep

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

@@ -0,0 +1,81 @@
+# 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.
+
+# Creates a class-based custom shape representing the `bevel` keyword by convention
+class Tetris
+  module View
+    class Bevel
+      include Glimmer::UI::CustomShape
+      
+      options :base_color, :size, :bevel_pixel_size
+      option :x, default: 0
+      option :y, default: 0
+      
+      before_body {
+        self.bevel_pixel_size = 0.16*size.to_f if bevel_pixel_size.nil?
+      }
+      
+      body {
+        rectangle(x, y, size, size) {
+          background bind(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|
+              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|
+              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|
+              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|
+              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|
+              # use gray instead of white for the border
+              color_value == Model::Block::COLOR_CLEAR ? :gray : color_value
+            }
+          }
+        }
+      }
+    end
+  end
+end

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

@@ -19,6 +19,8 @@
 # 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_relative 'bevel'
+
 class Tetris
   module View
     class Block
@@ -27,36 +29,9 @@ class Tetris
       options :game_playfield, :block_size, :row, :column
   
       body {
-        canvas {
-          background bind(game_playfield[row][column], :color)
-          polygon(0, 0, block_size, 0, block_size - 4, 4, 4, 4) {
-            background bind(game_playfield[row][column], :color) { |color_value|
-              color = color(color_value)
-              rgb(color.red + 4*BEVEL_CONSTANT, color.green + 4*BEVEL_CONSTANT, color.blue + 4*BEVEL_CONSTANT)
-            }
-          }
-          polygon(block_size, 0, block_size - 4, 4, block_size - 4, block_size - 4, block_size, block_size) {
-            background bind(game_playfield[row][column], :color) { |color_value|
-              color = color(color_value)
-              rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
-            }
-          }
-          polygon(block_size, block_size, 0, block_size, 4, block_size - 4, block_size - 4, block_size - 4) {
-            background bind(game_playfield[row][column], :color) { |color_value|
-              color = color(color_value)
-              rgb(color.red - 2*BEVEL_CONSTANT, color.green - 2*BEVEL_CONSTANT, color.blue - 2*BEVEL_CONSTANT)
-            }
-          }
-          polygon(0, 0, 0, block_size, 4, block_size - 4, 4, 4) {
-            background bind(game_playfield[row][column], :color) { |color_value|
-              color = color(color_value)
-              rgb(color.red - BEVEL_CONSTANT, color.green - BEVEL_CONSTANT, color.blue - BEVEL_CONSTANT)
-            }
-          }
-          rectangle(0, 0, block_size, block_size) {
-            foreground bind(game_playfield[row][column], :color) { |color_value|
-              color_value == Model::Block::COLOR_CLEAR ? :gray : color_value
-            }
+        canvas { |canvas_proxy|
+          bevel(size: block_size) {
+            base_color bind(game_playfield[row][column], :color)
           }
         }
       }

data/samples/hello/hello_canvas.rb

@@ -53,6 +53,9 @@ class HelloCanvas
         }
         rectangle(50, 20, 300, 150, 30, 50) {
           background :magenta
+          rectangle(:default, :default, :max, :max, 30, 50) {
+            foreground :yellow
+          }
           rectangle([:default, -70], :default, :default, [:default, 1]) {
             foreground :cyan
             text {

data/samples/hello/hello_canvas_animation_data_binding.rb

@@ -0,0 +1,66 @@
+# 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'
+require 'bigdecimal'
+
+class HelloAnimationDataBinding
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :delay_time
+  
+  before_body {
+    @delay_time = 0.050
+  }
+  
+  body {
+    shell {
+      text 'Hello, Canvas Animation Data Binding!'
+      minimum_size 320, 320
+      
+      canvas {
+        grid_layout
+        
+        spinner {
+          layout_data(:center, :center, true, true) {
+            minimum_width 75
+          }
+          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})
+        }
+        animation {
+          every bind(self, :delay_time)
+          
+          frame { |index|
+            background rgb(index%100, index%100 + 100, index%55 + 200)
+            oval(index*3%300, index*3%300, 20, 20) {
+              background :yellow
+            }
+          }
+        }
+      }
+    }
+  }
+end
+
+HelloAnimationDataBinding.launch