glimmer-dsl-swt 4.21.0.1 → 4.21.2.1

data/lib/glimmer/rake_task/scaffold.rb

@@ -116,10 +116,12 @@ module Glimmer
         GEMFILE_APP_MIDFIX = <<~MULTI_LINE_STRING
         
           gem 'glimmer-dsl-swt', '~> #{VERSION}'
+          gem 'psych', '3.3.2' # Fixed temporarily because installing latest on JDK16 was causing issues
         MULTI_LINE_STRING
         GEMFILE_GEM_MIDFIX = <<~MULTI_LINE_STRING
         
           gem 'glimmer-dsl-swt', '~> #{VERSION.split('.')[0...2].join('.')}'
+          gem 'psych', '3.3.2' # Fixed temporarily because installing latest on JDK16 was causing issues
         MULTI_LINE_STRING
         GEMFILE_SUFFIX = <<~MULTI_LINE_STRING
         
@@ -182,11 +184,6 @@ module Glimmer
           cp File.expand_path('../../../../icons/scaffold_app.png', __FILE__), icon_file
           puts "Created #{current_dir_name}/#{icon_file}"
           
-          write "Resource.java", resource_java_file(app_name)
-          cd '..'
-          system "javac #{file_name(app_name)}/Resource.java"
-          cd gem_name
-        
           mkdir_p "app/#{file_name(app_name)}"
           write "app/#{file_name(app_name)}/launch.rb", app_launch_file(app_name)
           mkdir_p 'bin'
@@ -298,11 +295,6 @@ module Glimmer
           cp File.expand_path('../../../../icons/scaffold_app.png', __FILE__), icon_file
           puts "Created #{current_dir_name}/#{icon_file}"
           
-          write "Resource.java", resource_java_file(custom_shell_name)
-          cd '..'
-          system "javac #{file_name(custom_shell_name)}/Resource.java"
-          cd gem_name
-          
           if OS.windows?
             system "glimmer package" # TODO handle windows properly with batch file
             system "\"packages/bundles/#{human_name(custom_shell_name)}/#{human_name(custom_shell_name)}.exe\""
@@ -496,16 +488,6 @@ module Glimmer
           MULTI_LINE_STRING
         end
         
-        def resource_java_file(app_name)
-          <<~MULTI_LINE_STRING
-            package #{file_name(app_name)};
-            
-            /** The soul purpose of this class is to retrieve icons for uri:classloader paths used from JAR */
-            class Resource {
-            }
-          MULTI_LINE_STRING
-        end
-    
         def app_bin_command_file(app_name_or_gem_name, custom_shell_name=nil, namespace=nil)
           if custom_shell_name.nil?
             runner = "File.expand_path('../../app/#{file_name(app_name_or_gem_name)}/launch.rb', __FILE__)"
@@ -545,7 +527,7 @@ module Glimmer
           lines.insert(require_rake_line_index, "require 'glimmer/launcher'")
           gem_files_line_index = lines.index(lines.detect {|l| l.include?('# dependencies defined in Gemfile') })
           if custom_shell_name
-            lines.insert(gem_files_line_index, "  gem.files = Dir['Resource.class', 'VERSION', 'LICENSE.txt', 'app/**/*', 'bin/**/*', 'config/**/*', 'db/**/*', 'docs/**/*', 'fonts/**/*', 'icons/**/*', 'images/**/*', 'lib/**/*', 'script/**/*', 'sounds/**/*', 'vendor/**/*', 'videos/**/*']")
+            lines.insert(gem_files_line_index, "  gem.files = Dir['VERSION', 'LICENSE.txt', 'app/**/*', 'bin/**/*', 'config/**/*', 'db/**/*', 'docs/**/*', 'fonts/**/*', 'icons/**/*', 'images/**/*', 'lib/**/*', 'script/**/*', 'sounds/**/*', 'vendor/**/*', 'videos/**/*']")
             # the second executable is needed for warbler as it matches the gem name, which is the default expected file (alternatively in the future, we could do away with it and configure warbler to use the other file)
             lines.insert(gem_files_line_index+1, "  gem.require_paths = ['vendor', 'lib', 'app']")
             lines.insert(gem_files_line_index+2, "  gem.executables = ['#{file_name(custom_shell_name)}']") if custom_shell_name
@@ -561,7 +543,7 @@ module Glimmer
               Glimmer::RakeTask::Package.jpackage_extra_args =
                 " --name '#{human_name(custom_shell_name)}'" +
                 " --description '#{human_name(custom_shell_name)}'"
-                # You can add more options from https://docs.oracle.com/en/java/javase/14/jpackage/packaging-tool-user-guide.pdf
+                # You can add more options from https://docs.oracle.com/en/java/javase/16/jpackage/packaging-tool-user-guide.pdf
             MULTI_LINE_STRING
           end
           file_content

data/lib/glimmer/rake_task.rb

@@ -111,11 +111,7 @@ namespace :glimmer do
     Rake::Task['glimmer:package:lock_jars'].execute
     Rake::Task['glimmer:package:config'].execute
     Rake::Task['glimmer:package:jar'].execute
-    if OS.linux?
-      Rake::Task['glimmer:package:gem'].execute
-    else
-      Rake::Task['glimmer:package:native'].execute(args)
-    end
+    Rake::Task['glimmer:package:native'].execute(args)
   end
 
   desc 'Scaffold Glimmer application directory structure to build a new app'

data/lib/glimmer/swt/image_proxy.rb

@@ -122,9 +122,11 @@ module Glimmer
       def input_stream
         if @file_path.start_with?('uri:classloader')
           @jar_file_path = @file_path
-          file_path = @jar_file_path.sub(/^uri\:classloader\:/, '').sub('//', '') # the latter sub is needed for Mac
-          project_name = java.lang.System.getProperty('project_name')
-          file_input_stream = java_import("#{project_name}.Resource").last.java_class.resource_as_stream(file_path)
+          file_path = @jar_file_path.sub(/^uri\:classloader\:/, '').sub(/^\/+/, '')
+          require 'jruby'
+          jcl = JRuby.runtime.jruby_class_loader
+          resource = jcl.get_resource_as_stream(file_path)
+          file_input_stream = resource.to_io.to_input_stream
         else
           file_input_stream = java.io.FileInputStream.new(@file_path)
         end

data/lib/glimmer/swt/shell_proxy.rb

@@ -35,7 +35,8 @@ module Glimmer
       WIDTH_MIN = 190
       HEIGHT_MIN = 0
 
-      attr_reader :opened_before
+      attr_reader :opened_before, :last_shell_closing
+      alias last_shell_closing? last_shell_closing
       alias opened_before? opened_before
 
       # Instantiates ShellProxy with same arguments expected by SWT Shell
@@ -85,9 +86,10 @@ module Glimmer
               end
             end
           end
-          on_widget_disposed {
+          on_widget_disposed do
+            @last_shell_closing = true if @display.shells.count == 1 && @display.shells.first == @swt_widget
             clear_shapes
-          }
+          end
           @display ||= @swt_widget.getDisplay
         end
       end

data/lib/glimmer/swt/style_constantizable.rb

@@ -151,6 +151,8 @@ module Glimmer
         def include?(swt_constant, *symbols)
           swt_constant & self[symbols] == self[symbols]
         end
+        
+        # TODO support listing all symbols
       end
     end
   end

data/lib/glimmer/swt/widget_proxy.rb

@@ -198,6 +198,10 @@ module Glimmer
         @finished_add_content = true
       end
       
+      def shell_proxy
+        @swt_widget.shell.get_data('proxy')
+      end
+      
       def extract_args(underscored_widget_name, args)
         @arg_extractor_mapping ||= {
           'menu_item' => lambda do |args|
@@ -739,6 +743,13 @@ module Glimmer
 
       def handle_observation_request(observation_request, &block)
         observation_request = normalize_observation_request(observation_request)
+        if observation_request.start_with?('on_drag_enter')
+          original_block = block
+          block = Proc.new do |event|
+            event.detail = DNDProxy[:drop_copy]
+            original_block.call(event)
+          end
+        end
         if observation_request.start_with?('on_swt_')
           constant_name = observation_request.sub(/^on_swt_/, '')
           add_swt_event_listener(constant_name, &block)
@@ -882,6 +893,75 @@ module Glimmer
       def widget_custom_attribute_mapping
         # TODO scope per widget class type just like other mappings
         @swt_widget_custom_attribute_mapping ||= {
+          'drag_source' => {
+            getter: {name: 'getShell', invoker: lambda { |widget, args|
+              @drag_source
+            }},
+            setter: {name: 'getShell', invoker: lambda { |widget, args|
+              @drag_source = args.first
+              if @drag_source
+                case @swt_widget
+                when List
+                  on_drag_set_data do |event|
+                    drag_widget = event.widget.control
+                    event.data = drag_widget.selection.first
+                  end
+                when Label
+                  on_drag_set_data do |event|
+                    drag_widget = event.widget.control
+                    event.data = drag_widget.text
+                  end
+                when Text
+                  on_drag_set_data do |event|
+                    drag_widget = event.widget.control
+                    event.data = drag_widget.selection_text
+                  end
+                when Spinner
+                  on_drag_set_data do |event|
+                    drag_widget = event.widget.control
+                    event.data = drag_widget.selection.to_s
+                  end
+                end
+              end
+            }},
+          },
+          'drop_target' => {
+            getter: {name: 'getShell', invoker: lambda { |widget, args|
+              @drop_target
+            }},
+            setter: {name: 'getShell', invoker: lambda { |widget, args|
+              @drop_target = args.first
+              if @drop_target
+                case @swt_widget
+                when List
+                  on_drop do |event|
+                    drop_widget = event.widget.control
+                    drop_widget.add(event.data) unless @drop_target == :unique && drop_widget.items.include?(event.data)
+                    drop_widget.select(drop_widget.items.count - 1)
+                  end
+                when Label
+                  on_drop do |event|
+                    drop_widget = event.widget.control
+                    drop_widget.text = event.data
+                  end
+                when Text
+                  on_drop do |event|
+                    drop_widget = event.widget.control
+                    if @drop_target == :replace
+                      drop_widget.text = event.data
+                    else
+                      drop_widget.insert(event.data)
+                    end
+                  end
+                when Spinner
+                  on_drop do |event|
+                    drop_widget = event.widget.control
+                    drop_widget.selection = event.data.to_f
+                  end
+                end
+              end
+            }},
+          },
           'window' => {
             getter: {name: 'getShell'},
             setter: {name: 'getShell', invoker: lambda { |widget, args| @swt_widget.getShell }}, # No Op

data/samples/elaborate/battleship/view/grid.rb

@@ -45,21 +45,21 @@ class Battleship
             }
             
             text player.to_s.capitalize
-            font height: 20, style: :bold
+            font height: OS.windows? ? 18 : 20, style: :bold
           }
           
           label # filler
           Model::Grid::WIDTH.times do |column_index|
             label {
               text (column_index + 1).to_s
-              font height: 16
+              font height: OS.windows? ? 14 : 16
             }
           end
           
           Model::Grid::HEIGHT.times do |row_index|
             label {
               text Model::Grid::ROW_ALPHABETS[row_index]
-              font height: 16
+              font height: OS.windows? ? 14 : 16
             }
             Model::Grid::WIDTH.times do |column_index|
               cell(game: game, player: player, row_index: row_index, column_index: column_index) {

data/samples/elaborate/battleship/view/ship.rb

@@ -38,7 +38,7 @@ class Battleship
       
           label {
             text ship_name.to_s.titlecase
-            font height: 16
+            font height: OS.windows? ? 14 : 16
           }
         
           composite {

data/samples/elaborate/meta_sample.rb

@@ -23,8 +23,6 @@ require 'glimmer-dsl-swt'
 require 'fileutils'
 
 class Sample
-  include Glimmer::DataBinding::ObservableModel
-  
   class << self
     def glimmer_directory
       File.expand_path('../../..', __FILE__)
@@ -42,6 +40,10 @@ class Sample
       end
     end
   end
+  
+  include Glimmer::DataBinding::ObservableModel
+  
+  UNEDITABLE = ['meta_sample.rb'] + (OS.windows? ? ['calculator.rb', 'weather.rb'] : [])  # Windows StyledText does not support unicode characters found in certain samples
 
   attr_accessor :sample_directory, :file, :selected
   
@@ -74,9 +76,13 @@ class Sample
   end
   
   def editable
+    !UNEDITABLE.include?(File.basename(file))
+  end
+  alias editable? editable
+  
+  def launchable
     File.basename(file) != 'meta_sample.rb'
   end
-  alias launchable editable
     
   def file_relative_path
     file.sub(self.class.glimmer_directory, '')
@@ -97,6 +103,7 @@ class Sample
   def launch(modified_code)
     launch_file = user_file
     begin
+      raise 'Unsupported through editor!' unless editable?
       FileUtils.cp_r(file, user_file_parent_directory)
       FileUtils.cp_r(directory, user_file_parent_directory) if File.exist?(directory)
       File.write(user_file, modified_code)
@@ -202,12 +209,12 @@ class MetaSampleApplication
   
   body {
     shell(:fill_screen) {
-      minimum_size 1280, 768
+      minimum_size 640, 384
       text 'Glimmer Meta-Sample (The Sample of Samples)'
       image File.expand_path('../../icons/scaffold_app.png', __dir__)
       
       sash_form {
-        weights 4, 14
+        weights 1, 2
       
         composite {
           grid_layout(1, false) {

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

@@ -45,8 +45,8 @@ class Tetris
             menu_item(:check) {
               text '&Pause'
               accelerator COMMAND_KEY, :p
-              enabled <= [game, :game_over, on_read: ->(value) { value && !game.show_high_scores }]
-              enabled <= [game, :show_high_scores, on_read: ->(value) { value && !game.game_over }]
+              enabled <= [game, :game_over, on_read: ->(value) { !value && !game.show_high_scores }]
+              enabled <= [game, :show_high_scores, on_read: ->(value) { !value && !game.game_over }]
               selection <=> [game, :paused]
             }
             menu_item {

data/samples/elaborate/tetris.rb

@@ -57,7 +57,17 @@ class Tetris
       on_swt_keydown { |key_event|
         case key_event.keyCode
         when swt(:arrow_down), 's'.bytes.first
-          game.down! if OS.mac?
+          if OS.mac?
+            game.down!
+          else
+            # rate limit downs in Windows/Linux as they go too fast when key is held
+            @queued_downs ||= 0
+            @queued_downs += 1
+            async_exec do
+              game.down! if @queued_downs < 3
+              @queued_downs -= 1
+            end
+          end
         when swt(:arrow_up)
           case game.up_arrow_action
           when :instant_down
@@ -80,16 +90,6 @@ class Tetris
         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?
-        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)
       on_about {
         show_about_dialog
@@ -170,9 +170,7 @@ class Tetris
           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?
-          }
+          sync_exec { @game.down! unless @game.paused? }
         end
       end
     end

data/samples/elaborate/tic_tac_toe.rb

@@ -41,18 +41,21 @@ class TicTacToe
     shell {
       text "Tic-Tac-Toe"
       minimum_size 176, 200
+
       composite {
         grid_layout 3, true
+
         (1..3).each { |row|
           (1..3).each { |column|
             button {
               layout_data :fill, :fill, true, true
               text        <= [@tic_tac_toe_board[row, column], :sign]
               enabled     <= [@tic_tac_toe_board[row, column], :empty]
-              font        style: :bold, height: 20
-              on_widget_selected {
+              font        style: :bold, height: (OS.windows? ? 18 : 20)
+
+              on_widget_selected do
                 @tic_tac_toe_board.mark(row, column)
-              }
+              end
             }
           }
         }

data/samples/elaborate/timer.rb

@@ -67,7 +67,6 @@ class Timer
       
       # Replace example content below with custom shell content
       minimum_size (OS.windows? ? 214 : 200), 114
-      image File.join(APP_ROOT, 'package', 'windows', "Timer.ico") if OS.windows?
       text "Glimmer Timer"
 
       timer_menu_bar

data/samples/elaborate/weather.rb

@@ -102,6 +102,7 @@ class Weather
       layout_data(:fill, :center, true, false)
       text <= [self, field_name, on_read: ->(t) { "#{kelvin_to_temp_unit(t, temp_unit).to_f.round}°" }]
       font height: DEFAULT_FONT_HEIGHT
+      background DEFAULT_BACKGROUND
       foreground DEFAULT_FOREGROUND
     }
   end
@@ -112,6 +113,7 @@ class Weather
       layout_data(:fill, :center, true, false)
       text <= [self, 'humidity', on_read: ->(h) { "#{h.to_f.round}%" }]
       font height: DEFAULT_FONT_HEIGHT
+      background DEFAULT_BACKGROUND
       foreground DEFAULT_FOREGROUND
     }
   end
@@ -121,6 +123,7 @@ class Weather
       layout_data :fill, :center, false, false
       text field_name.titlecase
       font height: DEFAULT_FONT_HEIGHT
+      background DEFAULT_BACKGROUND
       foreground DEFAULT_FOREGROUND
     }
   end

data/samples/hello/hello_canvas.rb

@@ -65,7 +65,7 @@ class HelloCanvas
               y :default, 1 # add 1 pixel to default y (shape centered within parent vertically)
               background :yellow
               foreground :dark_magenta
-              font name: 'Courier', height: 30
+              font name: 'Courier', height: (OS.windows? ? 26 : 30)
             }
           }
           rectangle(155, 30) { # width and height are assumed to be the default (calculated from children)

data/samples/hello/hello_canvas_transform.rb

@@ -6,7 +6,7 @@ glimmer_logo = File.expand_path('../../icons/scaffold_app.png', __dir__)
 
 shell {
   text 'Hello, Canvas Transform!'
-  minimum_size 330, 352
+  minimum_size (OS.windows? ? 347 : 330), (OS.windows? ? 372 : 352)
   
   canvas {
     background :white

data/samples/hello/hello_cool_bar.rb

@@ -40,27 +40,28 @@ class HelloCoolBar
         margin_width 0
         margin_height 0
       }
-      
+
       text 'Hello, Cool Bar!'
+      minimum_size 280, 50
       
       cool_bar { # optionally takes a :flat style and/or :vertical style if you need vertical layout
         tool_bar {
           tool_item {
-            image cut_image # alternatively you can pass an image file path
+            image File.expand_path('./images/cut.png', __dir__), height: 16
             
             on_widget_selected do
               self.operation = 'Cut'
             end
           }
           tool_item {
-            image copy_image # alternatively you can pass an image file path
+            image File.expand_path('./images/copy.png', __dir__), height: 16
             
             on_widget_selected do
               self.operation = 'Copy'
             end
           }
           tool_item {
-            image paste_image # alternatively you can pass an image file path
+            image File.expand_path('./images/paste.png', __dir__), height: 16
             
             on_widget_selected do
               self.operation = 'Paste'
@@ -86,62 +87,6 @@ class HelloCoolBar
       }
     }
   }
-  
-  def cut_image
-    # building image on the fly with Canvas Shape DSL
-    image(25, 25) {
-      rectangle(0, 0, 25, 25) {
-        background_pattern 0, 0, 0, 25, :white, :gray
-        line(20, 2, 9, 15) {
-          line_width 2
-        }
-        line(5, 2, 16, 15) {
-          line_width 2
-        }
-        oval(2, 15, 8, 8) {
-          line_width 2
-        }
-        oval(16, 15, 8, 8) {
-          line_width 2
-        }
-      }
-    }
-  end
-  
-  def copy_image
-    # building image on the fly with Canvas Shape DSL
-    image(25, 25) {
-      rectangle(0, 0, 25, 25) {
-        background_pattern 0, 0, 0, 25, :white, :gray
-        rectangle([:default, 2], [:default, -2], 14, 14, 5, 5) {
-          line_width 2
-        }
-        rectangle([:default, -2], [:default, 2], 14, 14, 5, 5) {
-          line_width 2
-        }
-      }
-    }
-  end
-  
-  def paste_image
-    image(25, 25) {
-      rectangle(0, 0, 25, 25) {
-        background_pattern 0, 0, 0, 25, :white, :gray
-        rectangle(:default, [:default, 1], 15, 20, 5, 5) {
-          line_width 2
-        }
-        line(7, 8, 18, 8) {
-          line_width 2
-        }
-        line(7, 13, 18, 13) {
-          line_width 2
-        }
-        line(7, 18, 18, 18) {
-          line_width 2
-        }
-      }
-    }
-  end
 end
 
 HelloCoolBar.launch