glimmer-dsl-swt 4.18.4.0 → 4.18.4.5

data/samples/elaborate/login.rb

@@ -1,123 +1,123 @@
-# 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.
-
-class LoginPresenter
-
-  attr_accessor :user_name
-  attr_accessor :password
-  attr_accessor :status
-
-  def initialize
-    @user_name = ""
-    @password = ""
-    @status = "Logged Out"
-  end
-
-  def status=(status)
-    @status = status
-
-    notify_observers("logged_in")
-    notify_observers("logged_out")
-  end
-  
-  def valid?
-    !@user_name.to_s.strip.empty? && !@password.to_s.strip.empty?
-  end
-
-  def logged_in
-    self.status == "Logged In"
-  end
-
-  def logged_out
-    !self.logged_in
-  end
-
-  def login
-    return unless valid?
-    self.status = "Logged In"
-  end
-
-  def logout
-    self.user_name = ""
-    self.password = ""
-    self.status = "Logged Out"
-  end
-
-end
-
-class Login
-  include Glimmer
-
-  def launch
-    presenter = LoginPresenter.new
-    @shell = shell {
-      text "Login"
-      composite {
-        grid_layout 2, false #two columns with differing widths
-
-        label { text "Username:" } # goes in column 1
-        @user_name_text = text {   # goes in column 2
-          text bind(presenter, :user_name)
-          enabled bind(presenter, :logged_out)
-          on_key_pressed { |event|
-            @password_text.set_focus if event.keyCode == swt(:cr)
-          }
-        }
-
-        label { text "Password:" }
-        @password_text = text(:password, :border) {
-          text bind(presenter, :password)
-          enabled bind(presenter, :logged_out)
-          on_key_pressed { |event|
-            presenter.login if event.keyCode == swt(:cr)
-          }
-        }
-
-        label { text "Status:" }
-        label { text bind(presenter, :status) }
-
-        button {
-          text "Login"
-          enabled bind(presenter, :logged_out)
-          on_widget_selected { presenter.login }
-          on_key_pressed { |event|
-            presenter.login if event.keyCode == swt(:cr)
-          }
-        }
-
-        button {
-          text "Logout"
-          enabled bind(presenter, :logged_in)
-          on_widget_selected { presenter.logout }
-          on_key_pressed { |event|
-            if event.keyCode == swt(:cr)
-              presenter.logout
-              @user_name_text.set_focus
-            end
-          }
-        }
-      }
-    }
-    @shell.open
-  end
-end
-
-Login.new.launch
+# 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.
+
+class LoginPresenter
+
+  attr_accessor :user_name
+  attr_accessor :password
+  attr_accessor :status
+
+  def initialize
+    @user_name = ""
+    @password = ""
+    @status = "Logged Out"
+  end
+
+  def status=(status)
+    @status = status
+
+    notify_observers("logged_in")
+    notify_observers("logged_out")
+  end
+  
+  def valid?
+    !@user_name.to_s.strip.empty? && !@password.to_s.strip.empty?
+  end
+
+  def logged_in
+    self.status == "Logged In"
+  end
+
+  def logged_out
+    !self.logged_in
+  end
+
+  def login
+    return unless valid?
+    self.status = "Logged In"
+  end
+
+  def logout
+    self.user_name = ""
+    self.password = ""
+    self.status = "Logged Out"
+  end
+
+end
+
+class Login
+  include Glimmer
+
+  def launch
+    presenter = LoginPresenter.new
+    @shell = shell {
+      text "Login"
+      composite {
+        grid_layout 2, false #two columns with differing widths
+
+        label { text "Username:" } # goes in column 1
+        @user_name_text = text {   # goes in column 2
+          text bind(presenter, :user_name)
+          enabled bind(presenter, :logged_out)
+          on_key_pressed { |event|
+            @password_text.set_focus if event.keyCode == swt(:cr)
+          }
+        }
+
+        label { text "Password:" }
+        @password_text = text(:password, :border) {
+          text bind(presenter, :password)
+          enabled bind(presenter, :logged_out)
+          on_key_pressed { |event|
+            presenter.login if event.keyCode == swt(:cr)
+          }
+        }
+
+        label { text "Status:" }
+        label { text bind(presenter, :status) }
+
+        button {
+          text "Login"
+          enabled bind(presenter, :logged_out)
+          on_widget_selected { presenter.login }
+          on_key_pressed { |event|
+            presenter.login if event.keyCode == swt(:cr)
+          }
+        }
+
+        button {
+          text "Logout"
+          enabled bind(presenter, :logged_in)
+          on_widget_selected { presenter.logout }
+          on_key_pressed { |event|
+            if event.keyCode == swt(:cr)
+              presenter.logout
+              @user_name_text.set_focus
+            end
+          }
+        }
+      }
+    }
+    @shell.open
+  end
+end
+
+Login.new.launch

data/samples/elaborate/meta_sample.rb

@@ -20,7 +20,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'fileutils'
-require 'etc'
 
 class Sample
   include Glimmer::DataBinding::ObservableModel
@@ -31,7 +30,7 @@ class Sample
     end
   
     def user_glimmer_directory
-      File.join(Etc.getpwuid.dir, '.glimmer-dsl-swt')
+      File.join(File.expand_path('~'), '.glimmer-dsl-swt')
     end
     
     def ensure_user_glimmer_directory
@@ -204,7 +203,7 @@ class MetaSampleApplication
     shell(:fill_screen) {
       minimum_size 1280, 768
       text 'Glimmer Meta-Sample (The Sample of Samples)'
-      image File.expand_path('meta_sample/meta_sample_logo.png', __dir__)
+      image File.expand_path('../../icons/scaffold_app.png', __dir__)
       
       sash_form {
         composite {
@@ -264,9 +263,21 @@ class MetaSampleApplication
           }
         }
             
-        @code_text = code_text {
+        @code_text = code_text(lines: {width: 3}) {
+          root {
+            grid_layout(2, false) {
+              horizontal_spacing 0
+              margin_width 0
+              margin_height 0
+            }
+          }
+          line_numbers {
+            background :white
+          }
           text bind(SampleDirectory, 'selected_sample.code', read_only: true)
           editable bind(SampleDirectory, 'selected_sample.editable')
+          left_margin 7
+          right_margin 7
         }
         
         weights 4, 11

data/samples/elaborate/tetris.rb

@@ -51,11 +51,12 @@ class Tetris
     end
     
     Display.app_name = 'Glimmer Tetris'
+
     display {
-      @keyboard_listener = on_swt_keydown { |key_event|
+      @keyboard_down_listener = on_swt_keydown { |key_event|
         case key_event.keyCode
         when swt(:arrow_down), 's'.bytes.first
-          game.down!
+          game.down! if OS.mac?
         when swt(:arrow_up)
           case game.up_arrow_action
           when :instant_down
@@ -75,10 +76,18 @@ class Tetris
           elsif key_event.keyLocation == swt(:left) # left shift key
             game.rotate!(:left)
           end
-        when swt(:ctrl)
-          game.rotate!(:left)
         end
       }
+
+      # invoke game.down! on keyup with Windows/Linux since they seem to group-render similar events, preventing intermediate renders (causing invisiblity while holding keys)
+      if !OS.mac?
+        @keyboard_up_listener = on_swt_keyup { |key_event|
+          case key_event.keyCode
+          when swt(:arrow_down), 's'.bytes.first
+            game.down!
+          end
+        }
+      end
       
       # if running in app mode, set the Mac app about dialog (ignored in platforms)
       @about_observer = on_about {
@@ -130,10 +139,6 @@ class Tetris
       score_lane(game: game, block_size: BLOCK_SIZE) {
         layout_data(:fill, :fill, true, true)
       }
-
-      on_widget_disposed {
-        deregister_observers
-      }
     }
   }
   
@@ -169,7 +174,7 @@ class Tetris
       }
     }
   end
-  
+
   def start_moving_tetrominos_down
     Thread.new do
       @mutex.synchronize do
@@ -197,14 +202,6 @@ class Tetris
       message "Glimmer Tetris\n\nGlimmer DSL for SWT Sample\n\nCopyright (c) 2007-2021 Andy Maleh"
     }.open
   end
-  
-  def deregister_observers
-    @show_high_scores_observer&.deregister
-    @game_over_observer&.deregister
-    @keyboard_listener&.deregister
-    @about_observer&.deregister
-    @quit_observer&.deregister
-  end
 end
 
 Tetris.launch

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

@@ -1,48 +1,48 @@
-# 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.
-
-class Tetris
-  module Model
-    class Block
-      COLOR_CLEAR = :white
-    
-      attr_accessor :color
-      
-      # Initializes with color. Default color (gray) signifies an empty block
-      def initialize(color = COLOR_CLEAR)
-        @color = color
-      end
-      
-      # Clears block color. `quietly` option indicates if it should not notify observers by setting value quietly via variable not attribute writer.
-      def clear
-        self.color = COLOR_CLEAR unless self.color == COLOR_CLEAR
-      end
-      
-      def clear?
-        self.color == COLOR_CLEAR
-      end
-      
-      def occupied?
-        !clear?
-      end
-    end
-  end
-end
+# 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.
+
+class Tetris
+  module Model
+    class Block
+      COLOR_CLEAR = :white
+    
+      attr_accessor :color
+      
+      # Initializes with color. Default color (gray) signifies an empty block
+      def initialize(color = COLOR_CLEAR)
+        @color = color
+      end
+      
+      # Clears block color. `quietly` option indicates if it should not notify observers by setting value quietly via variable not attribute writer.
+      def clear
+        self.color = COLOR_CLEAR unless self.color == COLOR_CLEAR
+      end
+      
+      def clear?
+        self.color == COLOR_CLEAR
+      end
+      
+      def occupied?
+        !clear?
+      end
+    end
+  end
+end