glimmer-dsl-swt 4.18.3.5 → 4.18.4.0

data/VERSION

@@ -1 +1 @@
-4.18.3.5
+4.18.4.0

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.18.3.5 ruby lib
+# stub: glimmer-dsl-swt 4.18.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.3.5"
+  s.version = "4.18.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2021-02-01"
+  s.date = "2021-02-02"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI cross-platform desktop development library written in JRuby, an OS-threaded faster JVM version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models (test-first) afterwards. Not only does Glimmer provide a large set of GUI widgets, but it also supports drawing Canvas Graphics like Shapes and Animations. To get started quickly, Glimmer offers scaffolding options for Apps, Gems, and Custom Widgets. Glimmer also includes native-executable packaging support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in Ruby as truly native DMG/PKG/APP files on the Mac + App Store, MSI/EXE files on Windows, and Gem Packaged Shell Scripts on Linux.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -136,6 +136,7 @@ Gem::Specification.new do |s|
     "samples/elaborate/contact_manager/contact_repository.rb",
     "samples/elaborate/login.rb",
     "samples/elaborate/meta_sample.rb",
+    "samples/elaborate/meta_sample/meta_sample_logo.png",
     "samples/elaborate/tetris.rb",
     "samples/elaborate/tetris/model/block.rb",
     "samples/elaborate/tetris/model/game.rb",
@@ -183,6 +184,7 @@ Gem::Specification.new do |s|
     "samples/hello/hello_styled_text.rb",
     "samples/hello/hello_tab.rb",
     "samples/hello/hello_table.rb",
+    "samples/hello/hello_table/baseball_park.png",
     "samples/hello/hello_world.rb",
     "vendor/swt/linux/swt.jar",
     "vendor/swt/mac/swt.jar",

data/lib/glimmer/data_binding/widget_binding.rb

@@ -37,7 +37,7 @@ module Glimmer
         @property = property
         @translator = translator || proc {|value| value} #TODO check on this it doesn't seem used
 
-        if @widget.respond_to?(:dispose)
+        if @widget.respond_to?(:on_widget_disposed)
           @widget.on_widget_disposed do |dispose_event|
             unregister_all_observables
           end

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

@@ -30,56 +30,23 @@ module Glimmer
         # TODO support switcher of language that automatically updates the lexer
         # TODO support method for redrawing the syntax highlighting
         option :theme, default: 'glimmer'
-#         option :lines, default: false
+        option :lines, default: false
       
-#         attr_accessor :code_text_widget_text, :code_text_widget_top_pixel
-#         attr_reader :styled_text_proxy
+        alias lines? lines
+        attr_accessor :styled_text_proxy_text, :styled_text_proxy_top_pixel
+        attr_reader :styled_text_proxy, :lines_width
         
-        
-      
-#         def text=(value)
-#           if lines
-#             @styled_text_proxy&.swt_widget&.text = value
-#           else
-#             super
-#           end
-#         end
-        
-#         def text(*args)
-#           if lines
-#             @styled_text_proxy&.swt_widget&.text
-#           else
-#             super
-#           end
-#         end
-        
-#         def lines_width
-#           if lines == true
-#             4
-#           elsif lines.is_a?(Hash)
-#             lines[:width]
-#           end
-#         end
-        
-        def syntax_highlighting(text)
-          return [] if text.to_s.strip.empty?
-          @syntax_highlighting ||= {}
-          unless @syntax_highlighting.keys.include?(text)
-            lex = lexer.lex(text).to_a
-            text_size = 0
-            @syntax_highlighting[text] = lex.map do |pair|
-              {token_type: pair.first, token_text: pair.last}
-            end.each do |hash|
-              hash[:token_index] = text_size
-              text_size += hash[:token_text].size
-            end
-          end
-          @syntax_highlighting[text]
+        def text=(value)
+          @styled_text_proxy&.swt_widget&.text = value
         end
         
-        def lexer
-          # TODO Try to use Rouge::Lexer.find_fancy('guess', code) in the future to guess the language or otherwise detect it from file extension
-          @lexer ||= Rouge::Lexer.find_fancy(language)
+        def text(*args, dsl: false, &block)
+          # If dsl: true is passed, operate using Glimmer DSL (which is the default that happens through super method_missing)
+          if dsl
+            super(*args, &block)
+          else
+            @styled_text_proxy&.swt_widget&.text
+          end
         end
         
         before_body {
@@ -87,60 +54,65 @@ module Glimmer
           require 'ext/rouge/themes/glimmer'
           @swt_style = swt_style == 0 ? [:border, :multi, :v_scroll, :h_scroll] : swt_style
           @font_name = display.get_font_list(nil, true).map(&:name).include?('Consolas') ? 'Consolas' : 'Courier'
+          if lines == true
+            @lines_width = 4
+          elsif lines.is_a?(Hash)
+            @lines_width = lines[:width]
+          end
         }
         
         body {
           # TODO enable this once fully implemented
-#           if lines
-#             composite {
-#               grid_layout(2, false)
-#               layout_data :fill, :fill, true, true
-#               @line_numbers_text = styled_text(:multi, :border) {
-#                 layout_data(:right, :fill, false, true)
-#                 text '   1'
-#                 line_count = code_text_widget_text.to_s.split("\n").count
-#                 line_count = 1 if line_count == 0
-#                 lines_text_size = [line_count.to_s.size, 4].max
-#                 text line_count.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n")
-#                 text bind(self, :code_text_widget_text, read_only: true) { |text_value|
-#                   line_count = text_value.to_s.split("\n").count
-#                   line_count = 1 if line_count == 0
-#                   lines_text_size = [line_count.to_s.size, 4].max
-#                   line_count.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n")
-#                 }
-#                 top_pixel bind(self, :code_text_widget_top_pixel, read_only: true)
-#                 font name: @font_name, height: OS.mac? ? 15 : 12
-#                 background color(:widget_background)
-#                 foreground :dark_blue
-#                 top_margin 5
-#                 right_margin 5
-#                 bottom_margin 5
-#                 left_margin 5
-#                 editable false
-#                 caret nil
-#                 on_focus_gained {
-#                   @styled_text_proxy&.swt_widget.setFocus
-#                 }
-#                 on_key_pressed {
-#                   @styled_text_proxy&.swt_widget.setFocus
-#                 }
-#                 on_mouse_up {
-#                   @styled_text_proxy&.swt_widget.setFocus
-#                 }
-#               }
-#
-#               code_text_widget
-#             }
-#           else
+          if lines
+            composite {
+              grid_layout(2, false)
+              
+              @line_numbers_text = styled_text(:multi, :border) {
+                layout_data(:right, :fill, false, true)
+                text ' '*lines_width.to_i
+                text(bind(self, :styled_text_proxy_text, read_only: true) { |text_value|
+                  line_count = text_value.to_s.split("\n").count
+                  line_count = 1 if line_count == 0
+                  lines_text_size = [line_count.to_s.size, @lines_width].max
+                  if lines_text_size > @lines_width
+                    async_exec { swt_widget.layout }
+                    @lines_width = lines_text_size
+                  end
+                  line_count.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n") + "\n"
+                }, dsl: true)
+                top_pixel bind(self, :styled_text_proxy_top_pixel, read_only: true)
+                font name: @font_name, height: OS.mac? ? 15 : 12
+                background color(:widget_background)
+                foreground :dark_blue
+                top_margin 5
+                right_margin 5
+                bottom_margin 5
+                left_margin 5
+                editable false
+                caret nil
+                on_focus_gained {
+                  @styled_text_proxy&.swt_widget.setFocus
+                }
+                on_key_pressed {
+                  @styled_text_proxy&.swt_widget.setFocus
+                }
+                on_mouse_up {
+                  @styled_text_proxy&.swt_widget.setFocus
+                }
+              }
+
+              code_text_widget
+            }
+          else
             code_text_widget
-#           end
+          end
         }
         
         def code_text_widget
           @styled_text_proxy = styled_text(swt_style) {
-#             layout_data :fill, :fill, true, true if lines
-#             text bind(self, :code_text_widget_text) if lines
-#             top_pixel bind(self, :code_text_widget_top_pixel) if lines
+            layout_data :fill, :fill, true, true if lines
+            text(bind(self, :styled_text_proxy_text), dsl: true) if lines
+            top_pixel bind(self, :styled_text_proxy_top_pixel) if lines
             font name: @font_name, height: 15
             foreground rgb(75, 75, 75)
             left_margin 5
@@ -148,6 +120,20 @@ module Glimmer
             right_margin 5
             bottom_margin 5
             
+            if lines
+              on_key_pressed { |event|
+                character = event.keyCode.chr rescue nil
+                case [event.stateMask, character]
+                when [(OS.mac? ? swt(:command) : swt(:ctrl)), 'a']
+                  @styled_text_proxy.swt_widget.selectAll
+                when [(swt(:ctrl) unless OS.windows?), 'a']
+                  jump_to_beginning_of_line
+                when [(swt(:ctrl) unless OS.windows?), 'e']
+                  jump_to_end_of_line
+                end
+              }
+            end
+            
             on_modify_text { |event|
               # clear unnecessary syntax highlighting cache on text updates, and do it async to avoid affecting performance
               new_text = event.data
@@ -188,6 +174,29 @@ module Glimmer
           }
         end
         
+        def syntax_highlighting(text)
+          return [] if text.to_s.strip.empty?
+          @syntax_highlighting ||= {}
+          unless @syntax_highlighting.keys.include?(text)
+            lex = lexer.lex(text).to_a
+            text_size = 0
+            @syntax_highlighting[text] = lex.map do |pair|
+              {token_type: pair.first, token_text: pair.last}
+            end.each do |hash|
+              hash[:token_index] = text_size
+              text_size += hash[:token_text].size
+            end
+          end
+          @syntax_highlighting[text]
+        end
+        
+        def lexer
+          require 'rouge'
+          # TODO Try to use Rouge::Lexer.find_fancy('guess', code) in the future to guess the language or otherwise detect it from file extension
+          @lexer ||= Rouge::Lexer.find_fancy(language)
+          @lexer ||= Rouge::Lexer.find_fancy('ruby') # default to Ruby if no lexer is found
+        end
+        
         def hex_color_to_swt_color(color_data, default_color)
           color_data = "##{color_data.chars.drop(1).map {|c| c*2}.join}" if color_data.is_a?(String) && color_data.start_with?('#') && color_data&.size == 4
           color_data = color_data.match(REGEX_COLOR_HEX6).to_a.drop(1).map {|c| "0x#{c}".hex}.to_a if color_data.is_a?(String) && color_data.start_with?('#')
@@ -195,6 +204,20 @@ module Glimmer
           color_data = default_color if color_data.nil? || color_data.empty?
           color(*color_data).swt_color
         end
+        
+        def jump_to_beginning_of_line
+          current_line_index = @styled_text_proxy.swt_widget.getLineAtOffset(@styled_text_proxy.swt_widget.getCaretOffset)
+          beginning_of_current_line_offset = @styled_text_proxy.swt_widget.getOffsetAtLine(current_line_index)
+          @styled_text_proxy.swt_widget.setSelection(beginning_of_current_line_offset, beginning_of_current_line_offset)
+        end
+        
+        def jump_to_end_of_line
+          current_line_index = @styled_text_proxy.swt_widget.getLineAtOffset(@styled_text_proxy.swt_widget.getCaretOffset)
+          current_line = @styled_text_proxy.swt_widget.getLine(current_line_index)
+          beginning_of_current_line_offset = @styled_text_proxy.swt_widget.getOffsetAtLine(current_line_index)
+          new_offset = beginning_of_current_line_offset + current_line.size
+          @styled_text_proxy.swt_widget.setSelection(new_offset, new_offset)
+        end
       end
     end
   end

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

@@ -29,10 +29,7 @@ module Glimmer
         end
         
         def clear_shapes
-          shapes.dup.each do |shape|
-            shape.paint_listener_proxy&.unregister
-            shapes.delete(shape)
-          end
+          shapes.dup.each(&:dispose)
         end
         
         def resetup_shape_painting

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

@@ -78,7 +78,17 @@ module Glimmer
             @flyweight_method_names ||= {}
           end
           
+          def pattern(*args)
+            found_pattern = flyweigh_patterns[args]
+            if found_pattern.nil? || found_pattern.is_disposed
+              found_pattern = flyweigh_patterns[args] = org.eclipse.swt.graphics.Pattern.new(*args)
+            end
+            found_pattern
+          end
           
+          def flyweigh_patterns
+            @flyweigh_patterns ||= {}
+          end
         end
         
         attr_reader :parent, :name, :args, :options, :paint_listener_proxy
@@ -110,6 +120,14 @@ module Glimmer
           @options[:round]
         end
         
+        def has_some_background?
+          @properties.keys.map(&:to_s).include?('background') || @properties.keys.map(&:to_s).include?('background_pattern')
+        end
+        
+        def has_some_foreground?
+          @properties.keys.map(&:to_s).include?('foreground') || @properties.keys.map(&:to_s).include?('foreground_pattern')
+        end
+        
         def post_add_content
           amend_method_name_options_based_on_properties
           setup_painting
@@ -148,7 +166,7 @@ module Glimmer
               end
             end
             new_args = [DisplayProxy.instance.swt_display] + args
-            args[0] = org.eclipse.swt.graphics.Pattern.new(*new_args)
+            args[0] = pattern(*new_args, type: method_name.to_s.match(/set(.+)Pattern/)[1])
             args[1..-1] = []
           end
           args
@@ -173,7 +191,7 @@ module Glimmer
             args[0] = ImageProxy.new(args[0])
           end
           if method_name.include?('image') && args.first.is_a?(ImageProxy)
-            args[0] = args[0].swt_image
+            @image = args[0] = args[0].swt_image
           end
         end
                 
@@ -189,10 +207,16 @@ module Glimmer
         end
         
         def amend_method_name_options_based_on_properties
-          if @properties.keys.map(&:to_s).include?('background') && !@properties.keys.map(&:to_s).include?('foreground')
+          if has_some_background? && !has_some_foreground?
             @options[:fill] = true
-          elsif @properties.keys.map(&:to_s).include?('foreground') && !@properties.keys.map(&:to_s).include?('background')
+          elsif !has_some_background? && has_some_foreground?
             @options[:fill] = false
+          elsif @name == 'rectangle' && has_some_background? && has_some_foreground?
+            @options[:fill] = true
+            @options[:gradient] = true
+          end
+          if @name == 'rectangle' && @args.size > 4 && @args.last.is_a?(Numeric)
+            @options[:round] = true
           end
           @method_name = self.class.method_name(@name, @args + [@options])
         end
@@ -213,6 +237,26 @@ module Glimmer
           @properties.symbolize_keys[attribute_name.to_s.to_sym]
         end
         
+        def pattern(*args, type: nil)
+          instance_variable_name = "@#{type}_pattern"
+          the_pattern = instance_variable_get(instance_variable_name)
+          if the_pattern.nil?
+            the_pattern = self.class.pattern(*args)
+          end
+          the_pattern
+        end
+        
+        def dispose
+          paint_listener_proxy&.unregister
+          @background_pattern&.dispose
+          @background_pattern = nil
+          @foreground_pattern&.dispose
+          @foreground_pattern = nil
+          @image&.dispose
+          @image = nil
+          @parent.shapes.delete(self)
+        end
+        
         def setup_painting
           # TODO consider moving this method to parent (making the logic polymorphic)
           return if @parent.is_disposed
@@ -226,8 +270,8 @@ module Glimmer
         end
         
         def paint(paint_event)
-          @properties['background'] = [@parent.background] if fill? && !@properties.keys.map(&:to_s).include?('background')
-          @properties['foreground'] = [@parent.foreground] if @parent.respond_to?(:foreground) && draw? && !@properties.keys.map(&:to_s).include?('foreground')
+          @properties['background'] = [@parent.background] if fill? && !has_some_background?
+          @properties['foreground'] = [@parent.foreground] if @parent.respond_to?(:foreground) && draw? && !has_some_foreground?
           @properties['font'] = [@parent.font] if @parent.respond_to?(:font) && draw? && !@properties.keys.map(&:to_s).include?('font')
           @properties['transform'] = [nil] if @parent.respond_to?(:transform) && !@properties.keys.map(&:to_s).include?('transform')
           @properties.each do |property, args|

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