glimmer-dsl-swt 4.18.4.0 → 4.18.4.5

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

@@ -22,8 +22,6 @@ module Glimmer
         REGEX_COLOR_HEX6 = /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/
         
         # TODO support auto language detection
-        # TODO support end of line via CMD+E and beginning of line via CMD+A
-        # TODO support select all via CMD+A
               
         option :language, default: 'ruby'
         # TODO consider supporting data-binding of language
@@ -31,24 +29,49 @@ module Glimmer
         # TODO support method for redrawing the syntax highlighting
         option :theme, default: 'glimmer'
         option :lines, default: false
+
+        # This option indicates if default keyboard handlers/menus should be activated
+        option :default_behavior, default: true
       
         alias lines? lines
         attr_accessor :styled_text_proxy_text, :styled_text_proxy_top_pixel
-        attr_reader :styled_text_proxy, :lines_width
+        attr_reader :styled_text_proxy, :lines_width, :line_numbers_styled_text_proxy
         
-        def text=(value)
-          @styled_text_proxy&.swt_widget&.text = value
+        def method_missing(method_name, *args, &block)
+          dsl_mode = @dsl_mode || args.last.is_a?(Hash) && args.last[:dsl]
+          if dsl_mode
+            args.pop if args.last.is_a?(Hash) && args.last[:dsl]
+            super(method_name, *args, &block)
+          elsif @styled_text_proxy&.respond_to?(method_name, *args, &block)
+            @line_numbers_styled_text_proxy&.send(method_name, *args, &block) if method_name.to_s == 'font='
+            @styled_text_proxy&.send(method_name, *args, &block)
+          else
+            super
+          end
         end
         
-        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)
+        def respond_to?(method_name, *args, &block)
+          dsl_mode = @dsl_mode || args.last.is_a?(Hash) && args.last[:dsl]
+          if dsl_mode
+            args = args[0...-1] if args.last.is_a?(Hash) && args.last[:dsl]
+            super(method_name, *args, &block)
           else
-            @styled_text_proxy&.swt_widget&.text
+            super || @styled_text_proxy&.respond_to?(method_name, *args, &block)
           end
         end
         
+        def has_instance_method?(method_name)
+          respond_to?(method_name)
+        end
+        
+        def root_block=(block)
+          body_root.content(&block)
+        end
+        
+        def line_numbers_block=(block)
+          @line_numbers_styled_text_proxy.content(&block)
+        end
+        
         before_body {
           require 'rouge'
           require 'ext/rouge/themes/glimmer'
@@ -59,27 +82,37 @@ module Glimmer
           elsif lines.is_a?(Hash)
             @lines_width = lines[:width]
           end
+          @dsl_mode = true
+        }
+        
+        after_body {
+          @dsl_mode = nil
         }
         
         body {
-          # TODO enable this once fully implemented
           if lines
             composite {
               grid_layout(2, false)
               
-              @line_numbers_text = styled_text(:multi, :border) {
+              @line_numbers_styled_text_proxy = styled_text(swt(swt(swt_style), :h_scroll!, :v_scroll!)) {
                 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_before_read = nil
+                text bind(self,
+                  :styled_text_proxy_text,
+                  read_only: true,
+                  on_read: lambda { |text_value|
+                    line_count = "#{text_value} ".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
+                      @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"
+                  },
+                  after_read: lambda {
+                    @line_numbers_styled_text_proxy&.top_pixel = styled_text_proxy_top_pixel
+                  }
+                )
                 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)
@@ -110,25 +143,26 @@ module Glimmer
         
         def code_text_widget
           @styled_text_proxy = styled_text(swt_style) {
+#             custom_widget_property_owner # TODO implement to route properties here without declaring method_missing
             layout_data :fill, :fill, true, true if lines
-            text(bind(self, :styled_text_proxy_text), dsl: true) if lines
+            text bind(self, :styled_text_proxy_text) if lines
             top_pixel bind(self, :styled_text_proxy_top_pixel) if lines
-            font name: @font_name, height: 15
+            font name: @font_name, height: OS.mac? ? 15 : 12
             foreground rgb(75, 75, 75)
             left_margin 5
             top_margin 5
             right_margin 5
             bottom_margin 5
             
-            if lines
+            if default_behavior
               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']
+                when [(swt(:ctrl) if OS.mac?), 'a']
                   jump_to_beginning_of_line
-                when [(swt(:ctrl) unless OS.windows?), 'e']
+                when [(swt(:ctrl) if OS.mac?), 'e']
                   jump_to_end_of_line
                 end
               }

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

@@ -1,49 +1,49 @@
-# Copyright (c) 2007-2021 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.
-
-module Glimmer
-  module SWT
-    module Custom
-      # Represents SWT drawable controls (widgets like canvas) and display
-      module Drawable
-        def shapes
-          @shapes ||= []
-        end
-        
-        def clear_shapes
-          shapes.dup.each(&:dispose)
-        end
-        
-        def resetup_shape_painting
-          # TODO consider performance optimization relating to order of shape rendering (affecting only further shapes not previous ones)
-          reset_gc if respond_to?(:reset_gc)
-          shapes.each do |shape|
-            shape.paint_listener_proxy&.unregister
-            shape.setup_painting
-          end
-        end
-      end
-      
-    end
-    
-  end
-  
-end
+# Copyright (c) 2007-2021 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.
+
+module Glimmer
+  module SWT
+    module Custom
+      # Represents SWT drawable controls (widgets like canvas) and display
+      module Drawable
+        def shapes
+          @shapes ||= []
+        end
+        
+        def clear_shapes
+          shapes.dup.each(&:dispose)
+        end
+        
+        def resetup_shape_painting
+          # TODO consider performance optimization relating to order of shape rendering (affecting only further shapes not previous ones)
+          reset_gc if respond_to?(:reset_gc)
+          shapes.each do |shape|
+            shape.paint_listener_proxy&.unregister
+            shape.setup_painting
+          end
+        end
+      end
+      
+    end
+    
+  end
+  
+end

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

@@ -1,176 +1,176 @@
-# Copyright (c) 2007-2021 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
-      # A custom widget rendering a group of radios generated via data-binding
-      class RadioGroup
-        include Glimmer::UI::CustomWidget
-        
-        body {
-          composite # just an empty composite to hold radios upon data-binding `selection`
-        }
-        
-        def items=(text_array)
-          selection_value = selection
-          @items = Array[*text_array]
-          build_radios
-        end
-        
-        def items
-          @items || []
-        end
-        
-        def selection=(text)
-          radios.count.times do |index|
-            radio = radios[index]
-            item = items[index]
-            radio.selection = item == text
-          end
-        end
-        
-        def selection
-          selection_value = labels[selection_index]&.text unless selection_index == -1
-          selection_value.to_s
-        end
-        
-        def selection_index=(index)
-          self.selection=(items[index])
-        end
-        alias select selection_index=
-        
-        def selection_index
-          radios.index(radios.detect(&:selection)) || -1
-        end
-        
-        def radios
-          @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
-        
-        def handle_observation_request(observation_request, &block)
-          observation_requests << [observation_request, block]
-          delegate_observation_request_to_radios(observation_request, &block)
-          super
-        end
-        
-        def delegate_observation_request_to_radios(observation_request, &block)
-          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
-            end
-          end
-        end
-        
-        def observation_requests
-          @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
-          current_selection = selection
-          @composites.to_a.each(&:dispose)
-          @radios = []
-          @labels = []
-          @composites = []
-          items.each do |item|
-            body_root.content {
-              @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)
-          end
-          self.selection = current_selection
-        end
-      end
-    end
-  end
-end
+# Copyright (c) 2007-2021 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
+      # A custom widget rendering a group of radios generated via data-binding
+      class RadioGroup
+        include Glimmer::UI::CustomWidget
+        
+        body {
+          composite # just an empty composite to hold radios upon data-binding `selection`
+        }
+        
+        def items=(text_array)
+          selection_value = selection
+          @items = Array[*text_array]
+          build_radios
+        end
+        
+        def items
+          @items || []
+        end
+        
+        def selection=(text)
+          radios.count.times do |index|
+            radio = radios[index]
+            item = items[index]
+            radio.selection = item == text
+          end
+        end
+        
+        def selection
+          selection_value = labels[selection_index]&.text unless selection_index == -1
+          selection_value.to_s
+        end
+        
+        def selection_index=(index)
+          self.selection=(items[index])
+        end
+        alias select selection_index=
+        
+        def selection_index
+          radios.index(radios.detect(&:selection)) || -1
+        end
+        
+        def radios
+          @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
+        
+        def handle_observation_request(observation_request, &block)
+          observation_requests << [observation_request, block]
+          delegate_observation_request_to_radios(observation_request, &block)
+          super
+        end
+        
+        def delegate_observation_request_to_radios(observation_request, &block)
+          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
+            end
+          end
+        end
+        
+        def observation_requests
+          @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
+          current_selection = selection
+          @composites.to_a.each(&:dispose)
+          @radios = []
+          @labels = []
+          @composites = []
+          items.each do |item|
+            body_root.content {
+              @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)
+          end
+          self.selection = current_selection
+        end
+      end
+    end
+  end
+end