glimmer-dsl-swt 4.21.1.0 → 4.21.2.2

data/lib/glimmer/swt/custom/drawable.rb

@@ -110,6 +110,7 @@ module Glimmer
         
         def deregister_shape_painting
           @paint_listener_proxy&.deregister
+          @resize_listener_proxy&.deregister
         end
         
         def setup_shape_painting
@@ -143,6 +144,7 @@ module Glimmer
               shape_painter.call(self) # treat self as paint event since image has its own gc and doesn't do repaints (it's a one time deal for now though could be adjusted in the future.)
             else
               @paint_listener_proxy = on_swt_paint(&shape_painter)
+              @resize_listener_proxy = on_swt_Resize { shapes.each(&:calculated_args_changed!) }
             end
           else
             redraw if respond_to?(:redraw) && @finished_add_content && !is_disposed

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/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

@@ -743,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)
@@ -886,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)
@@ -207,7 +214,7 @@ class MetaSampleApplication
       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! unless OS.windows?
+          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

data/samples/hello/hello_drag_and_drop.rb

@@ -35,18 +35,215 @@ include Glimmer
 
 shell {
   text 'Hello, Drag and Drop!'
-  list {
-    selection <=> [@location, :country]
-    on_drag_set_data { |event|
-      list = event.widget.getControl
-      event.data = list.getSelection.first
+  
+  tab_folder {
+    tab_item {
+      fill_layout
+      text 'List'
+      
+      list {
+        selection <=> [@location, :country]
+        
+        # Option 1: Automatic Drag Data Setting
+        drag_source true
+        
+        # Option 2: Manual Drag Data Setting
+#         on_drag_set_data do |event|
+#           drag_widget = event.widget.control
+#           event.data = drag_widget.selection.first
+#         end
+        
+        # Option 3: Full Customization of Drag Source (details at:  https://www.eclipse.org/articles/Article-SWT-DND/DND-in-SWT.html)
+#         drag_source(:drop_copy) { # options: :drop_copy, :drop_link, :drop_move, :drop_target_move
+#           transfer :text # options: :text, :file, :rtf
+#
+#           on_drag_start do |event|
+#             drag_widget = event.widget.control.data('proxy') # obtain Glimmer widget proxy since it permits nicer syntax for setting cursor via symbol
+#             drag_widget.cursor = :wait
+#           end
+#
+#           on_drag_set_data do |event|
+#             drag_widget = event.widget.control
+#             event.data = drag_widget.selection.first
+#           end
+#
+#           on_drag_finished do |event|
+#             drag_widget = event.widget.control.data('proxy') # obtain Glimmer widget proxy since it permits nicer syntax for setting cursor via symbol
+#             drag_widget.cursor = :arrow
+#           end
+#         }
+      }
+      
+      list {
+        # Option 1: Automatic Drop Data Consumption
+        drop_target true
+#         drop_target :unique # setting drop_target to :unique makes the list not add the same data twice
+        
+        # Option 2: Manual Drop Data Consumption
+#         on_drop do |event|
+#           drop_widget = event.widget.control
+#           drop_widget.add(event.data)
+#           drop_widget.select(drop_widget.items.count - 1)
+#         end
+        
+        # Option 3: Full Customization of Drop Target (details at:  https://www.eclipse.org/articles/Article-SWT-DND/DND-in-SWT.html)
+#         drop_target(:drop_copy) { # options: :drop_copy, :drop_link, :drop_move, :drop_target_move
+#           transfer :text # options: :text, :file, :rtf
+#
+#           on_drag_enter do |event|
+#             ### event.detail = DND::DROP_NONE # To reject a drop, you can set event.detail to DND::DROP_NONE
+#             drop_widget = event.widget.control.data('proxy') # obtain Glimmer widget proxy since it permits nicer syntax for setting background via symbol
+#             drop_widget.background = :red
+#           end
+#
+#           on_drag_leave do |event|
+#             drop_widget = event.widget.control.data('proxy') # obtain Glimmer widget proxy since it permits nicer syntax for setting background via symbol
+#             drop_widget.background = :white
+#           end
+#
+#           on_drop do |event|
+#             drop_widget = event.widget.control.data('proxy') # obtain Glimmer widget proxy since it permits nicer syntax for setting background/cursor via symbol
+#             drop_widget.background = :white
+#             drop_widget.add(event.data)
+#             drop_widget.select(drop_widget.items.count - 1)
+#             drop_widget.cursor = :arrow
+#           end
+#         }
+      }
     }
-  }
-  label(:center) {
-    text 'Drag a country here!'
-    font height: 20
-    on_drop { |event|
-      event.widget.getControl.setText(event.data)
+    
+    tab_item {
+      grid_layout 2, true
+      text 'Label'
+      
+      label {
+        layout_data {
+          horizontal_span 2
+        }
+        text 'Drag text from any label and drop it unto another label'
+      }
+      
+      {
+        Argentina: :green,
+        Brazil: :red,
+        Finland: :yellow,
+        Sweden: :magenta,
+        Denmark: :gray,
+        Iceland: :cyan
+      }.each do |country, color|
+        label {
+          layout_data :fill, :fill, true, true
+          text country
+          font height: 20
+          background color
+          drag_source true
+          drop_target true
+        }
+      end
+    }
+    
+    tab_item {
+      grid_layout 2, true
+      text 'Text'
+      
+      label {
+        text 'Drag'
+      }
+      
+      label {
+        text 'Drop To Insert'
+      }
+      
+      text {
+        layout_data :fill, :center, true, false
+        text 'Text1'
+        drag_source true
+      }
+      
+      text {
+        layout_data :fill, :center, true, false
+        text 'Drop To Insert'
+        drop_target true
+      }
+      
+      label {
+        text 'Drag'
+      }
+      
+      label {
+        text 'Drop To Replace'
+      }
+      
+      text {
+        layout_data :fill, :center, true, false
+        text 'Text2'
+        drag_source true
+      }
+      
+      text {
+        layout_data :fill, :center, true, false
+        text 'Drop To Replace'
+        drop_target :replace
+      }
+    }
+    
+    tab_item {
+      grid_layout 2, true
+      text 'Spinner'
+      
+      label {
+        text 'Drag'
+      }
+      
+      label {
+        text 'Drop To Insert'
+      }
+      
+      spinner {
+        layout_data :fill, :center, true, false
+        selection 30
+        drag_source true
+      }
+      
+      spinner {
+        layout_data :fill, :center, true, false
+        drop_target true
+      }
+    }
+    tab_item {
+      fill_layout
+      text 'File'
+      
+      @drop_zone_label = label(:center, :wrap) {
+        text 'Drop One File Or More Here'
+        background :white
+        
+        rectangle  {
+          foreground :black
+          line_width 4
+          line_style :dash
+        }
+        
+        drop_target(:drop_copy) {
+          transfer :file
+          
+          on_drag_enter do |event|
+            drop_widget = event.widget.control.data('proxy') # obtain Glimmer widget proxy since it permits nicer syntax for setting background via symbol
+            drop_widget.background = :yellow
+          end
+
+          on_drag_leave do |event|
+            drop_widget = event.widget.control.data('proxy') # obtain Glimmer widget proxy since it permits nicer syntax for setting background via symbol
+            drop_widget.background = :white
+          end
+          
+          on_drop do |event|
+            drop_widget = event.widget.control.data('proxy') # obtain Glimmer widget proxy since it permits nicer syntax for setting background/cursor via symbol
+            drop_widget.background = :white
+            @drop_zone_label.text = event.data.to_a.join("\n")
+          end
+        }
+      }
     }
   }
 }.open