glimmer-dsl-swt 4.18.3.4 → 4.18.4.3

data/lib/glimmer/swt/date_time_proxy.rb

@@ -43,9 +43,7 @@ module Glimmer
       end
       
       def date=(date_value)
-        self.year = date_value.year
-        self.month = date_value.month
-        self.day = date_value.day
+        swt_widget.setDate(date_value.year, date_value.month - 1, date_value.day)
       end
       
       def time

data/lib/glimmer/swt/display_proxy.rb

@@ -71,6 +71,9 @@ module Glimmer
         Display.app_name ||= 'Glimmer'
         @swt_display = Display.new(*args)
         @swt_display.set_data('proxy', self)
+        on_swt_Dispose {
+          clear_shapes
+        }
       end
       
       def content(&block)
@@ -88,6 +91,14 @@ module Glimmer
       def timer_exec(&block)
         @swt_display.timer_exec(&block)
       end
+      
+      def on_widget_disposed(&block)
+        on_swt_Dispose(&block)
+      end
+      
+      def disposed?
+        @swt_display.isDisposed
+      end
 
       def method_missing(method, *args, &block)
         if can_handle_observation_request?(method)

data/lib/glimmer/swt/font_proxy.rb

@@ -43,6 +43,7 @@ module Glimmer
 
       attr_reader :widget_proxy, :swt_font, :font_properties
 
+
       # Builds a new font proxy from passed in widget_proxy and font_properties hash,
       #
       # It begins with existing SWT widget font and amends it with font properties.

data/lib/glimmer/swt/image_proxy.rb

@@ -83,6 +83,13 @@ module Glimmer
           @swt_image = Image.new(*@args)
           @original_image_data = @image_data = @swt_image.image_data
         end
+        @swt_image.singleton_class.alias_method(:dispose_without_glimmer, :dispose)
+        proxy = self
+        # TODO consider adding a get_data/set_data method to conform with other SWT widgets
+        @swt_image.singleton_class.define_method(:dispose) do
+          proxy.clear_shapes
+          dispose_without_glimmer
+        end
         post_add_content if content.nil?
       end
       
@@ -120,6 +127,10 @@ module Glimmer
         @gc = org.eclipse.swt.graphics.GC.new(swt_image)
       end
       
+      def disposed?
+        @swt_image.isDisposed
+      end
+      
       def has_attribute?(attribute_name, *args)
         @swt_image.respond_to?(attribute_setter(attribute_name), args) || respond_to?(ruby_attribute_setter(attribute_name), args)
       end

data/lib/glimmer/swt/layout_proxy.rb

@@ -72,7 +72,9 @@ module Glimmer
         @swt_layout.marginRight = 0 if @swt_layout.respond_to?(:marginRight)
         @swt_layout.marginBottom = 0 if @swt_layout.respond_to?(:marginBottom)
         @swt_layout.marginLeft = 0 if @swt_layout.respond_to?(:marginLeft)
+        old_layout = @widget_proxy.swt_widget.getLayout
         @widget_proxy.swt_widget.setLayout(@swt_layout)
+        @widget_proxy.swt_widget.layout if old_layout
       end
 
       def has_attribute?(attribute_name, *args)
@@ -83,7 +85,8 @@ module Glimmer
         apply_property_type_converters(attribute_name, args)
         if args.first != @swt_layout.send(attribute_getter(attribute_name))
           @swt_layout.send(attribute_setter(attribute_name), *args)
-          @widget_proxy.swt_widget.getShell.pack
+          @widget_proxy.swt_widget.layout
+          @widget_proxy.swt_widget.getShell.layout
         end
       end
 

data/lib/glimmer/swt/shell_proxy.rb

@@ -82,6 +82,9 @@ module Glimmer
             end
           end
         end
+        on_widget_disposed {
+          clear_shapes
+        }
         @display ||= @swt_widget.getDisplay
       end
 
@@ -161,7 +164,7 @@ module Glimmer
           minimum_size = @swt_widget.getMinimumSize
           @swt_widget.setMinimumSize(bounds.width, bounds.height)
           listener = on_control_resized { @swt_widget.setBounds(bounds) }
-          @swt_widget.pack
+          @swt_widget.layout(true, true)
           @swt_widget.removeControlListener(listener.swt_listener)
           @swt_widget.setMinimumSize(minimum_size)
         elsif OS.linux?

data/lib/glimmer/swt/table_proxy.rb

@@ -457,7 +457,7 @@ module Glimmer
         edit_table_item(swt_widget.getSelection.first, column_index, before_write: before_write, after_write: after_write, after_cancel: after_cancel)
       end
             
-      def edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil)
+      def edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil, write_on_cancel: false)
         return if table_item.nil?
         model = table_item.data
         property = column_properties[column_index]
@@ -476,29 +476,33 @@ module Glimmer
         widget_value_property = TableProxy::editors.symbolize_keys[editor_widget][:widget_value_property]
         
         @cancel_edit = lambda do |event=nil|
-          @cancel_in_progress = true
-          @table_editor_widget_proxy&.swt_widget&.dispose
-          @table_editor_widget_proxy = nil
-          if after_cancel&.arity == 0
-            after_cancel&.call
+          if write_on_cancel
+            @finish_edit.call(event)
           else
-            after_cancel&.call(table_item)
+            @cancel_in_progress = true
+            @table_editor_widget_proxy&.swt_widget&.dispose
+            @table_editor_widget_proxy = nil
+            if after_cancel&.arity == 0
+              after_cancel&.call
+            else
+              after_cancel&.call(table_item)
+            end
+            @edit_in_progress = false
+            @cancel_in_progress = false
+            @cancel_edit = nil
+            @edit_mode = false
           end
-          @edit_in_progress = false
-          @cancel_in_progress = false
-          @cancel_edit = nil
-          @edit_mode = false
         end
         
         @finish_edit = lambda do |event=nil|
           new_value = @table_editor_widget_proxy&.send(widget_value_property)
           if table_item.isDisposed
-            @cancel_edit.call
+            @cancel_edit.call unless write_on_cancel
           elsif !new_value.nil? && !action_taken && !@edit_in_progress && !@cancel_in_progress
             action_taken = true
             @edit_in_progress = true
             if new_value == model.send(model_editing_property)
-              @cancel_edit.call
+              @cancel_edit.call unless write_on_cancel
             else
               if before_write&.arity == 0
                 before_write&.call

data/lib/glimmer/swt/widget_proxy.rb

@@ -165,6 +165,12 @@ module Glimmer
           DEFAULT_INITIALIZERS[underscored_widget_name.to_s.to_sym]&.call(@swt_widget)
           @parent_proxy.post_initialize_child(self)
         end
+        @keyword = underscored_widget_name.to_s
+        if respond_to?(:on_widget_disposed)
+          on_widget_disposed {
+            clear_shapes
+          }
+        end
       end
       
       # Subclasses may override to perform post initialization work on an added child
@@ -559,9 +565,11 @@ module Glimmer
 
       # Used for data-binding only. Consider renaming or improving to avoid the confusion it causes
       def add_observer(observer, property_name)
-        property_listener_installers = @swt_widget.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact
-        widget_listener_installers = property_listener_installers.map{|installer| installer[property_name.to_s.to_sym]}.compact if !property_listener_installers.empty?
-        widget_listener_installers.to_a.first&.call(observer)
+        if !observer.respond_to?(:binding_options) || !observer.binding_options[:read_only]
+          property_listener_installers = @swt_widget.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact
+          widget_listener_installers = property_listener_installers.map{|installer| installer[property_name.to_s.to_sym]}.compact if !property_listener_installers.empty?
+          widget_listener_installers.to_a.first&.call(observer)
+        end
       end
 
       def remove_observer(observer, property_name)

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('../../icons/scaffold_app.png', __dir__)
+      image File.expand_path('meta_sample/meta_sample_logo.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 {
@@ -169,7 +178,7 @@ class Tetris
       }
     }
   end
-  
+
   def start_moving_tetrominos_down
     Thread.new do
       @mutex.synchronize do
@@ -201,7 +210,8 @@ class Tetris
   def deregister_observers
     @show_high_scores_observer&.deregister
     @game_over_observer&.deregister
-    @keyboard_listener&.deregister
+    @keyboard_down_listener&.deregister
+    @keyboard_up_listener&.deregister
     @about_observer&.deregister
     @quit_observer&.deregister
   end

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

@@ -20,7 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'fileutils'
-require 'etc'
+require 'json'
 require 'glimmer/data_binding/observer'
 require 'glimmer/config'
 
@@ -50,7 +50,7 @@ class Tetris
         @high_scores = []
         @show_high_scores = false
         @beeping = true
-        @up_arrow_action = :instant_down
+        @up_arrow_action = :rotate_left
         load_high_scores!
       end
       
@@ -111,7 +111,7 @@ class Tetris
       end
       
       def tetris_dir
-        @tetris_dir ||= File.join(Etc.getpwuid.dir, '.glimmer-tetris')
+        @tetris_dir ||= File.join(File.expand_path('~'), '.glimmer-tetris')
       end
       
       def tetris_high_score_file

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

@@ -21,6 +21,19 @@
 
 class Tetris
   module Model
-    PastGame = Struct.new(:name, :score, :lines, :level)
+    class PastGame
+      attr_accessor :name, :score, :lines, :level
+      
+      def initialize(name, score, lines, level)
+        @name = name
+        @score = score.to_i
+        @lines = lines.to_i
+        @level = level.to_i
+      end
+      
+      def to_a
+        [@name, @score, @lines, @level]
+      end
+    end
   end
 end

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

@@ -27,7 +27,7 @@ class Tetris
       options :game_playfield, :block_size, :row, :column
   
       body {
-        canvas {
+        canvas(:double_buffered) {
           background bind(game_playfield[row][column], :color)
           polygon(0, 0, block_size, 0, block_size - 4, 4, 4, 4) {
             background bind(game_playfield[row][column], :color) { |color_value|

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

@@ -71,13 +71,6 @@ class Tetris
           composite {
             row_layout :horizontal
                         
-            button {
-              text 'Clear'
-              
-              on_widget_selected {
-                game.clear_high_scores!
-              }
-            }
             @play_close_button = button {
               text bind(game, :game_over) {|game_over| game_over ? 'Play Again?' : 'Close'}
               focus true # initial focus
@@ -99,13 +92,11 @@ class Tetris
               @high_score_table.edit_table_item(
                 @high_score_table.items.first, # row item
                 0, # column
+                write_on_cancel: true,
                 after_write: -> {
                   game.save_high_scores!
                   @play_close_button.set_focus
                 },
-                after_cancel: -> {
-                  @play_close_button.set_focus
-                },
               )
             end
           }

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

@@ -29,7 +29,7 @@ class Tetris
       options :game_playfield, :playfield_width, :playfield_height, :block_size
   
       body {
-        composite {
+        composite(:double_buffered) {
           grid_layout {
             num_columns playfield_width
             make_columns_equal_width true

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

@@ -23,6 +23,8 @@ class Tetris
   module View
     class TetrisMenuBar
       include Glimmer::UI::CustomWidget
+
+      COMMAND_KEY = OS.mac? ? :command : :ctrl
   
       options :game
       
@@ -34,7 +36,7 @@ class Tetris
             menu_item {
               text '&Start'
               enabled bind(game, :game_over)
-              accelerator :command, :s
+              accelerator COMMAND_KEY, :s
               
               on_widget_selected {
                 game.start!
@@ -42,14 +44,14 @@ class Tetris
             }
             menu_item(:check) {
               text '&Pause'
-              accelerator :command, :p
+              accelerator COMMAND_KEY, :p
               enabled bind(game, :game_over, on_read: :!) {|value| value && !game.show_high_scores}
               enabled bind(game, :show_high_scores, on_read: :!) {|value| value && !game.game_over}
               selection bind(game, :paused)
             }
             menu_item {
               text '&Restart'
-              accelerator :command, :r
+              accelerator COMMAND_KEY, :r
               
               on_widget_selected {
                 game.restart!
@@ -58,7 +60,7 @@ class Tetris
             menu_item(:separator)
             menu_item {
               text '&Exit'
-              accelerator :command, :x
+              accelerator COMMAND_KEY, :x
               
               on_widget_selected {
                 parent_proxy.close
@@ -73,12 +75,12 @@ class Tetris
               text '&High Scores'
               menu_item(:check) {
                 text '&Show'
-                accelerator :command, :shift, :h
+                accelerator COMMAND_KEY, :shift, :h
                 selection bind(game, :show_high_scores)
               }
               menu_item {
                 text '&Clear'
-                accelerator :command, :shift, :c
+                accelerator COMMAND_KEY, :shift, :c
                 
                 on_widget_selected {
                   game.clear_high_scores!
@@ -91,24 +93,24 @@ class Tetris
             text '&Options'
             menu_item(:check) {
               text '&Beeping'
-              accelerator :command, :b
+              accelerator COMMAND_KEY, :b
               selection bind(game, :beeping)
             }
             menu {
               text 'Up Arrow'
               menu_item(:radio) {
                 text '&Instant Down'
-                accelerator :command, :shift, :i
+                accelerator COMMAND_KEY, :shift, :i
                 selection bind(game, :instant_down_on_up, computed_by: :up_arrow_action)
               }
               menu_item(:radio) {
                 text 'Rotate &Right'
-                accelerator :command, :shift, :r
+                accelerator COMMAND_KEY, :shift, :r
                 selection bind(game, :rotate_right_on_up, computed_by: :up_arrow_action)
               }
               menu_item(:radio) {
                 text 'Rotate &Left'
-                accelerator :command, :shift, :l
+                accelerator COMMAND_KEY, :shift, :l
                 selection bind(game, :rotate_left_on_up, computed_by: :up_arrow_action)
               }
             }
@@ -119,7 +121,7 @@ class Tetris
             
             menu_item {
               text '&About'
-              accelerator :command, :shift, :a
+              accelerator COMMAND_KEY, :shift, :a
               
               on_widget_selected {
                 parent_custom_shell&.show_about_dialog