glimmer-dsl-swt 4.17.6.0 → 4.17.8.3

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

@@ -8,20 +8,20 @@ module Glimmer
         include Glimmer::UI::CustomWidget
         
         SYNTAX_COLOR_MAP = {
-           Builtin:     [215,58,73], 
-           Class:       [3,47,98], 
-           Constant:    [0,92,197], 
+           Builtin:     [215,58,73],
+           Class:       [3,47,98],
+           Constant:    [0,92,197],
            Double:      [0,92,197],
            Escape:      [:red],
-           Function:    [:blue], 
-           Instance:    [227,98,9], 
-           Integer:     [:blue], 
+           Function:    [:blue],
+           Instance:    [227,98,9],
+           Integer:     [:blue],
            Interpol:    [:blue],
-           Keyword:     [:blue], 
+           Keyword:     [:blue],
            Name:        [111,66,193], #purple
-           Operator:    [:red], 
+           Operator:    [:red],
            Pseudo:      [:dark_red],
-           Punctuation: [:blue], 
+           Punctuation: [:blue],
            Single:      [106,115,125], # Also, Comments
            Symbol:      [:dark_green],
            Text:        [75, 75, 75],
@@ -38,29 +38,25 @@ module Glimmer
           swt_widget&.text
         end
         
-        def syntax_highlighting          
+        def syntax_highlighting(text)
           return [] if text.to_s.strip.empty?
-          code = text
-          return @syntax_highlighting if @last_code == code
-          @last_code = code
-          @lexer ||= Rouge::Lexer.find_fancy('ruby', code)
-          lex = @lexer.lex(code).to_a
-          code_size = 0
-          lex_hashes = lex.map do |pair|
-            {token_type: pair.first, token_text: pair.last}
-          end.each do |hash|
-            hash[:token_index] = code_size
-            code_size += hash[:token_text].size
+          @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
-          code_lines = code.split("\n")
-          line_index = 0
-          @syntax_highlighting = code_lines_map = code_lines.reduce({}) do |hash, line|
-            line_hashes = []
-            line_hashes << lex_hashes.shift while lex_hashes.any? && lex_hashes.first[:token_index].between?(line_index, line_index + line.size)
-            hash.merge(line_index => line_hashes).tap do
-              line_index += line.size + 1
-            end            
-          end          
+          @syntax_highlighting[text]
+        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('ruby')
         end
         
         before_body {
@@ -75,18 +71,32 @@ module Glimmer
             top_margin 5
             right_margin 5
             bottom_margin 5
+            
+            on_modify_text { |event|
+              # clear unnecessary syntax highlighting cache on text updates, and do it async to avoid affecting performance
+              new_text = event.data
+              async_exec {
+                unless @syntax_highlighting.nil?
+                  lines = new_text.to_s.split("\n")
+                  line_diff = @syntax_highlighting.keys - lines
+                  line_diff.each do |line|
+                    @syntax_highlighting.delete(line)
+                  end
+                end
+              }
+            }
                   
             on_line_get_style { |line_style_event|
               styles = []
-              syntax_highlighting[line_style_event.lineOffset].to_a.each do |token_hash|
+              syntax_highlighting(line_style_event.lineText).to_a.each do |token_hash|
                 start_index = token_hash[:token_index]
                 size = token_hash[:token_text].size
                 token_color = SYNTAX_COLOR_MAP[token_hash[:token_type].name] || [:black]
                 token_color = color(*token_color).swt_color
-                styles << StyleRange.new(start_index, size, token_color, nil)
+                styles << StyleRange.new(line_style_event.lineOffset + start_index, size, token_color, nil)
               end
               line_style_event.styles = styles.to_java(StyleRange) unless styles.empty?
-            }            
+            }
           }
         }
       end

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

@@ -1,14 +1,33 @@
+# Copyright (c) 2007-2020 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# 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/custom_widget'
 
 module Glimmer
   module SWT
     module Custom
-      # CodeText is a customization of StyledText with support for Ruby Syntax Highlighting
+      # A custom widget rendering a group of radios generated via data-binding
       class RadioGroup
         include Glimmer::UI::CustomWidget
         
-        # TODO support setting font, background, foreground, cursor
-        
         body {
           composite # just an empty composite to hold radios upon data-binding `selection`
         }
@@ -20,18 +39,20 @@ module Glimmer
         end
         
         def items
-          @items
+          @items || []
         end
         
         def selection=(text)
-          radios.each do |radio|
-            radio.selection = radio.text == text
+          radios.count.times do |index|
+            radio = radios[index]
+            item = items[index]
+            radio.selection = item == text
           end
         end
         
         def selection
-          # TODO use labels to retrieve text since they are better customizable with fonts while maintaining alignment with radio buttons
-          radios.detect(&:selection)&.text.to_s
+          selection_value = labels[selection_index]&.text unless selection_index == -1
+          selection_value.to_s
         end
         
         def selection_index=(index)
@@ -47,6 +68,10 @@ module Glimmer
           @radios ||= []
         end
         
+        def labels
+          @labels ||= []
+        end
+        
         def can_handle_observation_request?(observation_request)
           radios.first&.can_handle_observation_request?(observation_request) || super(observation_request)
         end
@@ -58,15 +83,31 @@ module Glimmer
         end
         
         def delegate_observation_request_to_radios(observation_request, &block)
-          if observation_request != 'on_widget_disposed' && radios.first&.can_handle_observation_request?(observation_request)
-            radios.each do |radio|            
-              radio_block = lambda do |event|
-                if event.widget.selection || selection_index == -1
+          if observation_request != 'on_widget_disposed'
+            radios.count.times do |index|
+              radio = radios[index]
+              label = labels[index]
+              if observation_request == 'on_widget_selected'
+                radio_block = lambda do |event|
+                  if event.widget.selection || selection_index == -1
+                    event.widget = self.swt_widget
+                    block.call(event)
+                  end
+                end
+                label_block = lambda do |event|
+                  self.selection_index = index
+                  block.call(event)
+                end
+                radio.handle_observation_request(observation_request, &radio_block) if radio.can_handle_observation_request?(observation_request)
+                label.handle_observation_request('on_mouse_up', &label_block)
+              else
+                listener_block = lambda do |event|
                   event.widget = self.swt_widget
                   block.call(event)
                 end
+                radio.handle_observation_request(observation_request, &listener_block) if radio.can_handle_observation_request?(observation_request)
+                label.handle_observation_request(observation_request, &listener_block) if label.can_handle_observation_request?(observation_request)
               end
-              radio.handle_observation_request(observation_request, &block)
             end
           end
         end
@@ -75,23 +116,57 @@ module Glimmer
           @observation_requests ||= Set.new
         end
         
+        def has_attribute?(attribute_name, *args)
+          (@composites.to_a + @radios.to_a + @labels.to_a).map do |widget_proxy|
+            return true if widget_proxy.has_attribute?(attribute_name, *args)
+          end
+          super
+        end
+         
+        def set_attribute(attribute_name, *args)
+          excluded_attributes = ['selection']
+          unless excluded_attributes.include?(attribute_name.to_s)
+            (@composites.to_a + @radios.to_a + @labels.to_a).each do |widget_proxy|
+              widget_proxy.set_attribute(attribute_name, *args) if widget_proxy.has_attribute?(attribute_name, *args)
+            end
+          end
+          super
+        end
+        
         private
         
         def build_radios
-          # TODO consider doing a diff instead of disposing and rebuilding everything in the future
-          # TODO add labels since they are better customizable with fonts while maintaining alignment with radio buttons
           current_selection = selection
-          radios.each(&:dispose) # TODO take care of the fact that dispose removes the observers attached
+          @composites.to_a.each(&:dispose)
           @radios = []
+          @labels = []
+          @composites = []
           items.each do |item|
             body_root.content {
-              radios << radio {
-                text item
+              @composites << composite {
+                grid_layout(2, false) {
+                  margin_width 0
+                  margin_height 0
+                  horizontal_spacing 0
+                  vertical_spacing 0
+                }
+                radios << radio { |radio_proxy|
+                  on_widget_selected {
+                    self.selection = items[radios.index(radio_proxy)]
+                  }
+                }
+                labels << label { |label_proxy|
+                  layout_data :fill, :center, true, false
+                  text item
+                  on_mouse_up {
+                    self.selection = label_proxy.text
+                  }
+                }
               }
             }
           end
           observation_requests.to_a.each do |observation_request, block|
-            delegate_observation_request_to_radios(observation_request, &block)            
+            delegate_observation_request_to_radios(observation_request, &block)
           end
           self.selection = current_selection
         end

data/lib/glimmer/swt/directory_dialog_proxy.rb

@@ -0,0 +1,65 @@
+# Copyright (c) 2007-2020 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# 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/swt/swt_proxy'
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/display_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.DirectoryDialog
+    #
+    # Automatically uses the current shell if one is open.
+    # Otherwise, it instantiates a new shell parent
+    #
+    # Optionally takes a shell as an argument
+    #
+    # Follows the Proxy Design Pattern
+    class DirectoryDialogProxy < WidgetProxy
+      # TODO write rspec tests
+      include_package 'org.eclipse.swt.widgets'
+
+      def initialize(*args, swt_widget: nil)
+        if swt_widget
+          @swt_widget = swt_widget
+        else
+          style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
+          if style_args.any?
+            style_arg_start_index = args.index(style_args.first)
+            style_arg_last_index = args.index(style_args.last)
+            args[style_arg_start_index..style_arg_last_index] = SWTProxy[style_args]
+          end
+          if !args.first.is_a?(Shell)
+            current_shell = DisplayProxy.instance.swt_display.shells.first
+            args.unshift(current_shell.nil? ? ShellProxy.new : current_shell)
+          end
+          if args.first.is_a?(ShellProxy)
+            args[0] = args[0].swt_widget
+          end
+          parent = args[0]
+          @parent_proxy = parent.is_a?(Shell) ? ShellProxy.new(swt_widget: parent) : parent
+          @swt_widget = DirectoryDialog.new(*args)
+        end
+      end
+
+    end
+  end
+end

data/lib/glimmer/swt/expand_item_proxy.rb

@@ -61,7 +61,6 @@ module Glimmer
       
       def post_add_content
         @swt_expand_item.setHeight(swt_widget.computeSize(SWTProxy[:default], SWTProxy[:default]).y) unless @swt_expand_item.getHeight > 0
-        WidgetProxy.new('composite', self, []) # adding filler since it seems like the last child gets a bad style, so this gets it instead
       end
       
       def has_attribute?(attribute_name, *args)

data/lib/glimmer/swt/file_dialog_proxy.rb

@@ -0,0 +1,66 @@
+# Copyright (c) 2007-2020 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# 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/swt/swt_proxy'
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/display_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.FileDialog
+    #
+    # Automatically uses the current shell if one is open.
+    # Otherwise, it instantiates a new shell parent
+    #
+    # Optionally takes a shell as an argument
+    #
+    # Follows the Proxy Design Pattern
+    class FileDialogProxy < WidgetProxy
+      # TODO write rspec tests
+      # TODO consider refactoring and sharing code with DirectoryDialogProxy (and do the same with their expressions)
+      include_package 'org.eclipse.swt.widgets'
+
+      def initialize(*args, swt_widget: nil)
+        if swt_widget
+          @swt_widget = swt_widget
+        else
+          style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
+          if style_args.any?
+            style_arg_start_index = args.index(style_args.first)
+            style_arg_last_index = args.index(style_args.last)
+            args[style_arg_start_index..style_arg_last_index] = SWTProxy[style_args]
+          end
+          if !args.first.is_a?(Shell)
+            current_shell = DisplayProxy.instance.swt_display.shells.first
+            args.unshift(current_shell.nil? ? ShellProxy.new : current_shell)
+          end
+          if args.first.is_a?(ShellProxy)
+            args[0] = args[0].swt_widget
+          end
+          parent = args[0]
+          @parent_proxy = parent.is_a?(Shell) ? ShellProxy.new(swt_widget: parent) : parent
+          @swt_widget = FileDialog.new(*args)
+        end
+      end
+
+    end
+  end
+end

data/lib/glimmer/swt/menu_proxy.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2020 Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

data/lib/glimmer/swt/shell_proxy.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2020 Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -65,7 +65,7 @@ module Glimmer
           @swt_widget.setMinimumSize(WIDTH_MIN, HEIGHT_MIN)
           # TODO make this an option not the default
           on_swt_show do
-            Thread.new do      
+            Thread.new do
               sleep(0.25)
               async_exec do
                 @swt_widget.setActive unless @swt_widget.isDisposed
@@ -130,7 +130,7 @@ module Glimmer
           @swt_widget.pack
           @swt_widget.removeControlListener(listener.swt_listener)
           @swt_widget.setMinimumSize(minimum_size)
-        elsif OS.linux?          
+        elsif OS.linux?
           @swt_widget.layout(true, true)
           @swt_widget.setBounds(bounds)
         end