glimmer-dsl-swt 4.18.7.6 → 4.20.0.0

data/lib/glimmer/swt/c_tab_item_proxy.rb

@@ -0,0 +1,53 @@
+# 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/swt/widget_proxy'
+require 'glimmer/swt/tab_item_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.custom.CTabItem
+    #
+    # Functions differently from other widget proxies.
+    #
+    # Glimmer instantiates an SWT Composite alongside the SWT TabItem
+    # and returns it for `#swt_widget` to allow adding widgets into it.
+    #
+    # In order to get the SWT TabItem object, one must call `#swt_tab_item`.
+    #
+    # Behind the scenes, this creates a tab item widget proxy separately from a composite that
+    # is set as the control of the tab item and `#swt_widget`.
+    #
+    # In order to retrieve the tab item widget proxy, one must call `#widget_proxy`
+    #
+    # Follows the Proxy Design Pattern
+    class CTabItemProxy < TabItemProxy
+      ATTRIBUTES = TabItemProxy::ATTRIBUTES + %w[foreground selection_foreground show_close font]
+      
+      def attributes
+        ATTRIBUTES
+      end
+      
+    end
+    
+  end
+  
+end

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

@@ -78,6 +78,8 @@ module Glimmer
                 
         def can_handle_observation_request?(observation_request)
           @styled_text_proxy&.can_handle_observation_request?(observation_request) || super
+        rescue
+          super
         end
 
         def handle_observation_request(observation_request, &block)
@@ -86,6 +88,8 @@ module Glimmer
           else
             super
           end
+        rescue
+          super
         end
         
         def root_block=(block)
@@ -120,21 +124,15 @@ module Glimmer
               
               @line_numbers_styled_text_proxy = styled_text(swt(swt(swt_style), :h_scroll!, :v_scroll!)) {
                 layout_data(:right, :fill, false, 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"
+                    line_numbers_text_from(text_value)
                   },
                   after_read: lambda {
-                    @line_numbers_styled_text_proxy&.top_pixel = styled_text_proxy_top_pixel
+                    @line_numbers_styled_text_proxy&.top_pixel = styled_text_proxy_top_pixel unless styled_text_proxy_top_pixel.nil?
                   }
                 )
                 top_pixel bind(self, :styled_text_proxy_top_pixel, read_only: true)
@@ -147,6 +145,7 @@ module Glimmer
                 left_margin 5
                 editable false
                 caret nil
+                
                 on_focus_gained {
                   @styled_text_proxy&.setFocus
                 }
@@ -169,6 +168,7 @@ module Glimmer
           @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) if lines
             top_pixel bind(self, :styled_text_proxy_top_pixel) if lines
             font name: @font_name, height: OS.mac? ? 15 : 12
@@ -287,6 +287,14 @@ module Glimmer
           new_offset = beginning_of_current_line_offset + current_line.size
           @styled_text_proxy.setSelection(new_offset, new_offset)
         end
+        
+        def line_numbers_text_from(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
+          @lines_width = lines_text_size if lines_text_size > @lines_width
+          line_count.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n") + "\n"
+        end
       end
     end
   end

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

@@ -572,7 +572,7 @@ module Glimmer
         end
         
         def dispose(dispose_images: true, dispose_patterns: true, redraw: true)
-          shapes.each { |shape| shape.is_a?(Shape::Path) && shape.dispose }
+          shapes.each { |shape| shape.is_a?(Shape::Path) && shape.dispose } # TODO look into why I'm only disposing paths
           if dispose_patterns
             @background_pattern&.dispose
             @background_pattern = nil
@@ -587,6 +587,20 @@ module Glimmer
           drawable.redraw if redraw && !drawable.is_a?(ImageProxy)
         end
         
+        # clear all shapes
+        # indicate whether to dispose images, dispose patterns, and redraw after clearing shapes.
+        # redraw can be `:all` or `true` to mean redraw after all shapes are disposed, `:each` to mean redraw after each shape is disposed, or `false` to avoid redraw altogether
+        def clear_shapes(dispose_images: true, dispose_patterns: true, redraw: :all)
+          if redraw == true || redraw == :all
+            shapes.dup.each {|shape| shape.dispose(dispose_images: dispose_images, dispose_patterns: dispose_patterns, redraw: false) }
+            drawable.redraw if redraw && !drawable.is_a?(ImageProxy)
+          elsif redraw == :each
+            shapes.dup.each {|shape| shape.dispose(dispose_images: dispose_images, dispose_patterns: dispose_patterns, redraw: true) }
+          else
+            shapes.dup.each {|shape| shape.dispose(dispose_images: dispose_images, dispose_patterns: dispose_patterns, redraw: false) }
+          end
+        end
+        
         # Indicate if this is a container shape (meaning a shape bag that is just there to contain nested shapes, but doesn't render anything of its own)
         def container?
           @name == 'shape'

data/lib/glimmer/swt/sash_form_proxy.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/color_proxy'
 
 module Glimmer
   module SWT
@@ -27,6 +28,11 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class SashFormProxy < WidgetProxy
+      def initialize(*args, &block)
+        super
+        self.background = ColorProxy.new(230, 230, 230).swt_color
+      end
+    
       def post_add_content
         self.weights = @weights unless @weights.nil?
       end

data/lib/glimmer/swt/shell_proxy.rb

@@ -74,7 +74,9 @@ module Glimmer
             # TODO make this an option not the default
             shell_swt_display = Glimmer::SWT::DisplayProxy.instance.swt_display
             on_swt_show do
-              @swt_widget.set_size(@display.bounds.width, @display.bounds.height) if fill_screen
+              if @filled_screen.nil? && fill_screen # only the first time
+                @swt_widget.set_size(@display.bounds.width, @display.bounds.height)
+              end
               Thread.new do
                 sleep(0.25)
                 shell_swt_display.async_exec do

data/lib/glimmer/swt/tab_folder_proxy.rb

@@ -48,5 +48,6 @@ module Glimmer
         end
       end
     end
+    CTabFolderProxy = TabFolderProxy
   end
 end

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -39,44 +39,40 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class TabItemProxy < WidgetProxy
-      ATTRIBUTES = %w[text image]
+      ATTRIBUTES = %w[text image tool_tip_text]
       include_package 'org.eclipse.swt.widgets'
 
       attr_reader :widget_proxy, :swt_tab_item
 
       def initialize(parent, style, &contents)
         super("composite", parent, style, &contents)
-        @widget_proxy = SWT::WidgetProxy.new('tab_item', parent, style)
+        keyword = self.class.name.split('::').last.underscore.sub('_proxy', '')
+        @widget_proxy = SWT::WidgetProxy.new(keyword, parent, style)
         @swt_tab_item = @widget_proxy.swt_widget
         @swt_tab_item.control = swt_widget
-#         parent.pack # TODO auto fix the tab folder to avoid having to do this manually (including maintaining bounds and minimum size of shell)
+      end
+      
+      def attributes
+        ATTRIBUTES
       end
 
       def has_attribute?(attribute_name, *args)
-        if ATTRIBUTES.include?(attribute_name.to_s)
-          true
-        else
-          super(attribute_name, *args)
-        end
+        attributes.include?(attribute_name.to_s) || super(attribute_name, *args)
       end
 
       def set_attribute(attribute_name, *args)
-        attribute_name
-        if attribute_name.to_s == "text"
-          text_value = args[0]
-          @swt_tab_item.setText text_value
-        elsif attribute_name.to_s == "image"
-          widget_proxy.set_attribute('image', *args)
+        attribute_name = attribute_name.to_s
+        if attributes.include?(attribute_name)
+          widget_proxy.set_attribute(attribute_name, *args)
         else
           super(attribute_name, *args)
         end
       end
 
       def get_attribute(attribute_name)
-        if attribute_name.to_s == "text"
-          @swt_tab_item.getText
-        elsif attribute_name.to_s == "image"
-          widget_proxy.get_attribute('image')
+        attribute_name = attribute_name.to_s
+        if attributes.include?(attribute_name)
+          widget_proxy.get_attribute(attribute_name)
         else
           super(attribute_name)
         end
@@ -89,6 +85,9 @@ module Glimmer
           swt_tab_item.dispose
         end
       end
+      
     end
+        
   end
+  
 end

data/lib/glimmer/swt/widget_proxy.rb

@@ -51,6 +51,7 @@ module Glimmer
         'arrow'               => [:arrow],
         'button'              => [:push],
         'canvas'              => ([:double_buffered] unless OS.mac?),
+        'ccombo'              => [:border],
         'checkbox'            => [:check],
         'check'               => [:check],
         'drag_source'         => [:drop_copy],
@@ -339,6 +340,13 @@ module Glimmer
               }
             end,
           },
+          Java::OrgEclipseSwtCustom::CCombo => {
+            :text => lambda do |observer|
+              on_modify_text { |modify_event|
+                observer.call(@swt_widget.getText)
+              }
+            end,
+          },
           Java::OrgEclipseSwtWidgets::Table => {
             :selection => lambda do |observer|
               on_widget_selected { |selection_event|
@@ -985,6 +993,7 @@ module Glimmer
             !!value
           end,
           foreground: color_converter,
+          selection_foreground: color_converter,
           link_foreground: color_converter,
           font: lambda do |value|
             if value.is_a?(Hash) || value.is_a?(FontData)

data/samples/elaborate/contact_manager.rb

@@ -51,7 +51,7 @@ class ContactManager
           }
           text {
             layout_data :fill, :center, true, false
-            text bind(@contact_manager_presenter, :first_name)
+            text <=> [@contact_manager_presenter, :first_name]
             on_key_pressed {|key_event|
               @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
             }
@@ -64,7 +64,7 @@ class ContactManager
           }
           text {
             layout_data :fill, :center, true, false
-            text bind(@contact_manager_presenter, :last_name)
+            text <=> [@contact_manager_presenter, :last_name]
             on_key_pressed {|key_event|
               @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
             }
@@ -77,7 +77,7 @@ class ContactManager
           }
           text {
             layout_data :fill, :center, true, false
-            text bind(@contact_manager_presenter, :email)
+            text <=> [@contact_manager_presenter, :email]
             on_key_pressed {|key_event|
               @contact_manager_presenter.find if key_event.keyCode == swt(:cr)
             }
@@ -118,6 +118,7 @@ class ContactManager
             grab_excess_vertical_space true
             height_hint 200
           }
+          
           table_column {
             text "First Name"
             width 80
@@ -130,8 +131,9 @@ class ContactManager
             text "Email"
             width 200
           }
-          items bind(@contact_manager_presenter, :results),
-          column_properties(:first_name, :last_name, :email)
+          
+          items bind(@contact_manager_presenter, :results), column_properties(:first_name, :last_name, :email)
+          
           on_mouse_up { |event|
             table_proxy.edit_table_item(event.table_item, event.column_index)
           }

data/samples/elaborate/login.rb

@@ -82,8 +82,8 @@ class Login
 
         label { text "Username:" } # goes in column 1
         @user_name_text = text {   # goes in column 2
-          text bind(@presenter, :user_name)
-          enabled bind(@presenter, :logged_out)
+          text <=> [@presenter, :user_name]
+          enabled <= [@presenter, :logged_out]
           on_key_pressed { |event|
             @password_text.set_focus if event.keyCode == swt(:cr)
           }
@@ -91,19 +91,19 @@ class Login
 
         label { text "Password:" }
         @password_text = text(:password, :border) {
-          text bind(@presenter, :password)
-          enabled bind(@presenter, :logged_out)
+          text <=> [@presenter, :password]
+          enabled <= [@presenter, :logged_out]
           on_key_pressed { |event|
             @presenter.login! if event.keyCode == swt(:cr)
           }
         }
 
         label { text "Status:" }
-        label { text bind(@presenter, :status) }
+        label { text <= [@presenter, :status] }
 
         button {
           text "Login"
-          enabled bind(@presenter, :logged_out)
+          enabled <= [@presenter, :logged_out]
           on_widget_selected { @presenter.login! }
           on_key_pressed { |event|
             @presenter.login! if event.keyCode == swt(:cr)
@@ -112,7 +112,7 @@ class Login
 
         button {
           text "Logout"
-          enabled bind(@presenter, :logged_in)
+          enabled <= [@presenter, :logged_in]
           on_widget_selected { @presenter.logout! }
           on_key_pressed { |event|
             if event.keyCode == swt(:cr)

data/samples/elaborate/mandelbrot_fractal.rb

@@ -56,7 +56,7 @@ class Mandelbrot
     end
     
     def processor_count
-      @processor_count ||= Concurrent.physical_processor_count
+      @processor_count ||= Concurrent.processor_count
     end
   end
   
@@ -103,7 +103,7 @@ class Mandelbrot
       puts "Points calculated already. Returning previously calculated points..."
       return @points
     end
-    thread_pool = Concurrent::FixedThreadPool.new(Mandelbrot.processor_count, fallback_policy: :discard)
+    @thread_pool = Concurrent::FixedThreadPool.new(Mandelbrot.processor_count, fallback_policy: :discard)
     @points = Concurrent::Array.new(height)
     Mandelbrot.work_in_progress = "Calculating Mandelbrot Points for Zoom #{zoom}x"
     Mandelbrot.progress = 0
@@ -112,15 +112,15 @@ class Mandelbrot
     height.times do |y|
       @points[y] ||= Concurrent::Array.new(width)
       width.times do |x|
-        thread_pool.post do
+        @thread_pool.post do
           @points[y][x] = calculate(x_array[x], y_array[y]).last
           point_index += 1
           Mandelbrot.progress += 1 if (point_index.to_f / point_count.to_f)*PROGRESS_MAX >= Mandelbrot.progress
         end
       end
     end
-    thread_pool.shutdown
-    thread_pool.wait_for_termination
+    @thread_pool.shutdown
+    @thread_pool.wait_for_termination
     Mandelbrot.progress = PROGRESS_MAX
     @points_calculated = true
     @points
@@ -164,7 +164,7 @@ class MandelbrotFractal
     }
     # pre-calculate zoomed mandelbrot images even before the user zooms in
     puts 'Starting background calculation thread...'
-    Thread.new {
+    @thread = Thread.new {
       future_zoom = 1.5
       loop {
         puts "Creating mandelbrot for background calculation at zoom: #{future_zoom}"
@@ -180,16 +180,21 @@ class MandelbrotFractal
   body {
     shell(:no_resize) {
       grid_layout
-      text bind(self, :mandelbrot_shell_title)
+      text <= [self, :mandelbrot_shell_title]
       minimum_size mandelbrot.width + 29, mandelbrot.height + 77
       image @mandelbrot_image
+            
+      on_shell_closed {
+        @thread.kill # should not be dangerous in this case
+        puts "Mandelbrot background calculation stopped!"
+      }
       
       progress_bar {
         layout_data :fill, :center, true, false
 
         minimum 0
         maximum Mandelbrot::PROGRESS_MAX
-        selection bind(Mandelbrot, :progress)
+        selection <= [Mandelbrot, :progress]
       }
           
       @scrolled_composite = scrolled_composite {