glimmer-dsl-swt 4.18.4.11 → 4.18.5.0

data/lib/glimmer/ui.rb

@@ -0,0 +1,5 @@
+module Glimmer
+  module UI
+  end
+  GUI = UI # alias
+end

data/lib/glimmer/ui/custom_shell.rb

@@ -19,6 +19,7 @@
 # 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/ui'
 require 'glimmer/error'
 
 module Glimmer
@@ -29,16 +30,20 @@ module Glimmer
       
       class << self
         def launch(*args, &content)
-          @launched_custom_shell = send(keyword, *args, &content) if @launched_custom_shell.nil? || @launched_custom_shell.disposed?
-          @launched_custom_shell.swt_widget.set_data('launched', true)
-          @launched_custom_shell.open
+          auto_exec do
+            @launched_custom_shell = send(keyword, *args, &content)
+            @launched_custom_shell.swt_widget.set_data('launched', true)
+            @launched_custom_shell.open
+          end
         end
       end
       
       def initialize(parent, *swt_constants, options, &content)
         super
-        @swt_widget.set_data('custom_shell', self)
-        @swt_widget.set_data('custom_window', self)
+        auto_exec do
+          @swt_widget.set_data('custom_shell', self)
+          @swt_widget.set_data('custom_window', self)
+        end
         raise Error, 'Invalid custom shell (window) body root! Must be a shell (window) or another custom shell (window).' unless body_root.swt_widget.is_a?(org.eclipse.swt.widgets.Shell)
       end
       
@@ -78,5 +83,6 @@ module Glimmer
       end
     end
     CustomWindow = CustomShell
+    Application = CustomShell
   end
 end

data/lib/glimmer/ui/custom_widget.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer'
+require 'glimmer/ui'
 require 'glimmer/error'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/display_proxy'
@@ -181,7 +182,9 @@ module Glimmer
         @body_root = instance_exec(&body_block)
         raise Glimmer::Error, 'Invalid custom widget for having an empty body! Please fill body block!' if @body_root.nil?
         @swt_widget = @body_root.swt_widget
-        @swt_widget.set_data('custom_widget', self)
+        auto_exec do
+          @swt_widget.set_data('custom_widget', self)
+        end
         execute_hook('after_body')
         @dispose_listener_registration = @body_root.on_widget_disposed do
           observer_registrations.each(&:deregister)
@@ -271,10 +274,6 @@ module Glimmer
         (swt_style & SWT::SWTProxy[style]) == SWT::SWTProxy[style]
       end
       
-      def pack(*args)
-        body_root.pack(*args)
-      end
-
       # TODO see if it is worth it to eliminate duplication of async_exec/sync_exec
       # delegation to DisplayProxy, via a module
 

data/samples/elaborate/contact_manager.rb

@@ -22,14 +22,14 @@
 require_relative "contact_manager/contact_manager_presenter"
 
 class ContactManager
-  include Glimmer
+  include Glimmer::UI::CustomShell
 
-  def initialize
+  before_body {
     @contact_manager_presenter = ContactManagerPresenter.new
     @contact_manager_presenter.list
-  end
+  }
 
-  def launch
+  body {
     shell {
       text "Contact Manager"
       composite {
@@ -135,8 +135,8 @@ class ContactManager
           }
         }
       }
-    }.open
-  end
+    }
+  }
 end
 
-ContactManager.new.launch
+ContactManager.launch

data/samples/elaborate/login.rb

@@ -45,17 +45,19 @@ class LoginPresenter
   def logged_in
     self.status == "Logged In"
   end
+  alias logged_in? logged_in
 
   def logged_out
     !self.logged_in
   end
+  alias logged_out? logged_out
 
-  def login
+  def login!
     return unless valid?
     self.status = "Logged In"
   end
 
-  def logout
+  def logout!
     self.user_name = ""
     self.password = ""
     self.status = "Logged Out"
@@ -64,19 +66,22 @@ class LoginPresenter
 end
 
 class Login
-  include Glimmer
+  include Glimmer::UI::CustomShell
 
-  def launch
-    presenter = LoginPresenter.new
-    @shell = shell {
+  before_body {
+    @presenter = LoginPresenter.new
+  }
+
+  body {
+    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)
+          text bind(@presenter, :user_name)
+          enabled bind(@presenter, :logged_out)
           on_key_pressed { |event|
             @password_text.set_focus if event.keyCode == swt(:cr)
           }
@@ -84,40 +89,39 @@ class Login
 
         label { text "Password:" }
         @password_text = text(:password, :border) {
-          text bind(presenter, :password)
-          enabled bind(presenter, :logged_out)
+          text bind(@presenter, :password)
+          enabled bind(@presenter, :logged_out)
           on_key_pressed { |event|
-            presenter.login if event.keyCode == swt(:cr)
+            @presenter.login! if event.keyCode == swt(:cr)
           }
         }
 
         label { text "Status:" }
-        label { text bind(presenter, :status) }
+        label { text bind(@presenter, :status) }
 
         button {
           text "Login"
-          enabled bind(presenter, :logged_out)
-          on_widget_selected { presenter.login }
+          enabled bind(@presenter, :logged_out)
+          on_widget_selected { @presenter.login! }
           on_key_pressed { |event|
-            presenter.login if event.keyCode == swt(:cr)
+            @presenter.login! if event.keyCode == swt(:cr)
           }
         }
 
         button {
           text "Logout"
-          enabled bind(presenter, :logged_in)
-          on_widget_selected { presenter.logout }
+          enabled bind(@presenter, :logged_in)
+          on_widget_selected { @presenter.logout! }
           on_key_pressed { |event|
             if event.keyCode == swt(:cr)
-              presenter.logout
+              @presenter.logout!
               @user_name_text.set_focus
             end
           }
         }
       }
     }
-    @shell.open
-  end
+  }
 end
 
-Login.new.launch
+Login.launch

data/samples/elaborate/mandelbrot_fractal.rb

@@ -170,9 +170,7 @@ class MandelbrotFractal
         the_mandelbrot = Mandelbrot.for(max_iterations: color_palette.size - 1, zoom: future_zoom, background: true)
         pixels = the_mandelbrot.calculate_points
         build_mandelbrot_image(mandelbrot_zoom: future_zoom)
-        sync_exec {
-          @canvas.cursor = :cross
-        }
+        @canvas.cursor = :cross unless @canvas.disposed?
         future_zoom += 0.5
       }
     }
@@ -181,7 +179,7 @@ class MandelbrotFractal
   body {
     shell(:no_resize) {
       grid_layout
-      text bind(self, :mandelbrot_shell_title, sync_exec: true)
+      text bind(self, :mandelbrot_shell_title)
       minimum_size mandelbrot.width + 29, mandelbrot.height + 77
       image @mandelbrot_image
       
@@ -190,7 +188,7 @@ class MandelbrotFractal
 
         minimum 0
         maximum Mandelbrot::PROGRESS_MAX
-        selection bind(Mandelbrot, :progress, sync_exec: true)
+        selection bind(Mandelbrot, :progress)
       }
           
       @scrolled_composite = scrolled_composite {

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

@@ -21,13 +21,17 @@
 
 include Glimmer
 
+image_object = image(File.expand_path('../../icons/scaffold_app.png', __dir__), width: 50)
+
 shell {
-  text 'Hello, Canvas Image Icon!'
+  text 'Hello, Canvas!'
   minimum_size 320, 400
 
-  canvas {
+  @canvas = canvas {
     background :yellow
     rectangle(0, 0, 220, 400) {
+      transform {
+      }
       background :red
     }
     rectangle(50, 20, 300, 150, 30, 50) {
@@ -60,5 +64,42 @@ shell {
       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)
+  
+    on_mouse_down { |mouse_event|
+      @drag_detected = false
+      @canvas.cursor = :hand
+      @shape_to_move = @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
+        @shape_to_move&.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_mouse_up { |mouse_event|
+      @canvas.cursor = :arrow
+      @drag_detected = false
+      @shape_to_move = nil
+    }
   }
 }.open