glimmer-dsl-swt 4.18.4.10 → 4.18.5.3

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

@@ -19,17 +19,19 @@
 # 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_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 +137,8 @@ class ContactManager
           }
         }
       }
-    }.open
-  end
+    }
+  }
 end
 
-ContactManager.new.launch
+ContactManager.launch

data/samples/elaborate/login.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 'glimmer-dsl-swt'
+
 class LoginPresenter
 
   attr_accessor :user_name
@@ -45,17 +47,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 +68,22 @@ class LoginPresenter
 end
 
 class Login
-  include Glimmer
+  include Glimmer::UI::CustomShell
+
+  before_body {
+    @presenter = LoginPresenter.new
+  }
 
-  def launch
-    presenter = LoginPresenter.new
-    @shell = shell {
+  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 +91,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

@@ -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-dsl-swt'
 require 'complex'
 require 'concurrent-ruby'
 
@@ -55,7 +56,7 @@ class Mandelbrot
     end
     
     def processor_count
-      @processor_count ||= Concurrent.processor_count
+      @processor_count ||= Concurrent.physical_processor_count
     end
   end
   
@@ -170,9 +171,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 +180,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 +189,7 @@ class MandelbrotFractal
 
         minimum 0
         maximum Mandelbrot::PROGRESS_MAX
-        selection bind(Mandelbrot, :progress, sync_exec: true)
+        selection bind(Mandelbrot, :progress)
       }
           
       @scrolled_composite = scrolled_composite {
@@ -222,8 +221,8 @@ class MandelbrotFractal
           on_mouse_up { |mouse_event|
             if !@drag_detected
               origin = @scrolled_composite.origin
-              @location_x = [[origin.x + mouse_event.x - @scrolled_composite.bounds.width / 2.0, 0].max, @scrolled_composite.bounds.width].min
-              @location_y = [[origin.y + mouse_event.y - @scrolled_composite.bounds.height / 2.0, 0].max, @scrolled_composite.bounds.height].min
+              @location_x = mouse_event.x
+              @location_y = mouse_event.y
               if mouse_event.button == 1
                 zoom_in
               elsif mouse_event.button > 2
@@ -265,7 +264,7 @@ class MandelbrotFractal
         menu {
           text '&Cores'
           
-          Concurrent.processor_count.times {|n|
+          Concurrent.physical_processor_count.times {|n|
             processor_number = n + 1
             menu_item(:radio) {
               text "&#{processor_number}"
@@ -279,10 +278,10 @@ class MandelbrotFractal
                 accelerator COMMAND, :alt, (processor_number - 20).to_s
               end
               
-              selection true if processor_number == Concurrent.processor_count
+              selection true if processor_number == Concurrent.physical_processor_count
               
               on_widget_selected {
-                Mandelbrot.processor_count = n
+                Mandelbrot.processor_count = processor_number
               }
             }
           }
@@ -316,21 +315,16 @@ class MandelbrotFractal
       width = the_mandelbrot.width
       height = the_mandelbrot.height
       pixels = the_mandelbrot.points
-      new_mandelbrot_image = image(width, height, top_level: true) # invoke as a top-level parentless keyword to avoid nesting under any widget
-      new_mandelbrot_image_gc = new_mandelbrot_image.gc
-      current_foreground = nil
       Mandelbrot.work_in_progress = "Consuming Points To Build Image for Zoom #{mandelbrot_zoom}x"
-      Mandelbrot.progress = Mandelbrot::PROGRESS_MAX
+      Mandelbrot.progress = Mandelbrot::PROGRESS_MAX + 1
       point_index = 0
       point_count = width*height
-      height.times { |y|
-        width.times { |x|
-          new_foreground = color_palette[pixels[y][x]]
-          new_mandelbrot_image_gc.foreground = current_foreground = new_foreground unless new_foreground == current_foreground
-          new_mandelbrot_image_gc.draw_point x, y
-          point_index += 1
-          Mandelbrot.progress -= 1 if (Mandelbrot::PROGRESS_MAX - (point_index.to_f / point_count.to_f)*Mandelbrot::PROGRESS_MAX) < Mandelbrot.progress
-        }
+      # invoke as a top-level parentless keyword to avoid nesting under any widget
+      new_mandelbrot_image = image(width, height, top_level: true) { |x, y|
+        point_index += 1
+        Mandelbrot.progress -= 1 if (Mandelbrot::PROGRESS_MAX - (point_index.to_f / point_count.to_f)*Mandelbrot::PROGRESS_MAX) < Mandelbrot.progress
+        pixel_color_index = pixels[y][x]
+        color_palette[pixel_color_index]
       }
       Mandelbrot.progress = 0
       flyweight_mandelbrot_images[mandelbrot_zoom] = new_mandelbrot_image
@@ -387,8 +381,9 @@ class MandelbrotFractal
     @canvas.set_size @mandelbrot_image.bounds.width, @mandelbrot_image.bounds.height
     @scrolled_composite.swt_widget.set_min_size(Point.new(@mandelbrot_image.bounds.width, @mandelbrot_image.bounds.height))
     if @location_x && @location_y
+      # center on mouse click location
       factor = (zoom / last_zoom)
-      @scrolled_composite.set_origin(factor*@location_x, factor*@location_y)
+      @scrolled_composite.set_origin(factor*@location_x - @scrolled_composite.client_area.width/2.0, factor*@location_y - @scrolled_composite.client_area.height/2.0)
       @location_x = @location_y = nil
     end
     update_mandelbrot_shell_title!
@@ -404,7 +399,7 @@ class MandelbrotFractal
         Left-click to zoom in.
         Right-click to zoom out.
         Scroll or drag to pan.
-        Lower cores to get more responsive interaction.
+        Adjust cores to get a more responsive interaction.
         
         Enjoy!
       MULTI_LINE_STRING

data/samples/elaborate/meta_sample.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-dsl-swt'
 require 'fileutils'
 
 class Sample
@@ -219,7 +220,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

@@ -19,7 +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.
 
-# Tetris App View Custom Shell (represents `tetris` keyword)
+require 'glimmer-dsl-swt'
 
 require_relative 'tetris/model/game'
 
@@ -28,6 +28,7 @@ require_relative 'tetris/view/score_lane'
 require_relative 'tetris/view/high_score_dialog'
 require_relative 'tetris/view/tetris_menu_bar'
 
+# Tetris App View Custom Shell (represents `tetris` keyword)
 class Tetris
   include Glimmer::UI::CustomShell
   
@@ -182,6 +183,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

@@ -19,14 +19,26 @@
 # 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_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 +58,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 +73,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