glimmer-dsl-swt 4.18.7.5 → 4.19.0.2

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

@@ -64,14 +64,30 @@ module Glimmer
           respond_to?(method_name)
         end
         
+        def can_add_observer?(attribute_name)
+          @styled_text_proxy&.can_add_observer?(attribute_name) || super
+        end
+  
+        def add_observer(observer, attribute_name)
+          if @styled_text_proxy&.can_add_observer?(attribute_name)
+            @styled_text_proxy.add_observer(observer, attribute_name)
+          else
+            super
+          end
+        end
+                
         def can_handle_observation_request?(observation_request)
-          @styled_text_proxy.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)
-          @styled_text_proxy.handle_observation_request(observation_request, &block)
+          if @styled_text_proxy&.can_handle_observation_request?(observation_request)
+            @styled_text_proxy.handle_observation_request(observation_request, &block)
+          else
+            super
+          end
         rescue
           super
         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/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}"
@@ -183,6 +183,11 @@ class MandelbrotFractal
       text bind(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

data/samples/elaborate/meta_sample.rb

@@ -268,8 +268,10 @@ class MetaSampleApplication
           root {
             grid_layout(2, false) {
               horizontal_spacing 0
-              margin_width 0
-              margin_height 0
+              margin_left 0
+              margin_right 0
+              margin_top 0
+              margin_bottom 0
             }
           }
           line_numbers {

data/samples/elaborate/metronome.rb

@@ -69,7 +69,7 @@ class Metronome
   }
   
   body {
-    shell {
+    shell(:no_resize) {
       row_layout(:vertical) {
         center true
       }

data/samples/elaborate/stock_ticker.rb

@@ -110,13 +110,13 @@ class StockTicker
                 tab[:canvas].set_size(new_x_location, @tabs.first[:canvas].bounds.height)
                 tab[:canvas].cursor = :hand
                 tab[:scrolled_composite].set_min_size(new_x_location, @tabs.first[:canvas].bounds.height)
-                tab[:scrolled_composite].set_origin(tab[:scrolled_composite].origin.x + 1, tab[:scrolled_composite].origin.y) if (tab[:scrolled_composite].origin.x + tab[:scrolled_composite].client_area.width) == canvas_width
+                tab[:scrolled_composite].set_origin(tab[:scrolled_composite].origin.x + 1, tab[:scrolled_composite].origin.y) if (tab[:scrolled_composite].origin.x + tab[:scrolled_composite].client_area.width + (OS.mac? ? 0 : 20)) == canvas_width
               end
             else
               tab[:canvas_header].content {
                 text(stock.name, 15, new_y - 10) {
                   foreground @stock_colors[stock_index]
-                  font height: 14
+                  font height: 13
                 }
               }
             end

data/samples/hello/hello_c_combo.rb

@@ -0,0 +1,68 @@
+# 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-dsl-swt'
+
+class HelloCCombo
+  class Person
+    attr_accessor :country, :country_options
+  
+    def initialize
+      self.country_options = ['', 'Canada', 'US', 'Mexico']
+      reset_country!
+    end
+  
+    def reset_country!
+      self.country = 'Canada'
+    end
+  end
+
+  include Glimmer::UI::CustomShell
+  
+  before_body {
+    @person = Person.new
+  }
+  
+  body {
+    shell {
+      row_layout(:vertical) {
+        fill true
+      }
+      
+      text 'Hello, C Combo!'
+      
+      c_combo(:read_only) {
+        selection bind(@person, :country) # also binds to country_options by convention
+        font height: 45 # unlike `combo`, `c_combo` changes height when setting the font height
+      }
+      
+      button {
+        text 'Reset Selection'
+        
+        on_widget_selected do
+          @person.reset_country!
+        end
+      }
+    }
+  }
+end
+
+HelloCCombo.launch

data/samples/hello/hello_c_tab.rb

@@ -0,0 +1,173 @@
+# 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.
+
+# Country flag images were made by [Freepik](https://www.flaticon.com/authors/freepik) from [www.flaticon.com](http://www.flaticon.com)
+
+require 'glimmer-dsl-swt'
+
+class HelloCTab
+  include Glimmer::UI::CustomShell
+  
+  body {
+    shell {
+      row_layout
+      text 'Hello, C Tab!'
+      minimum_size 200, 200
+      
+      c_tab_folder { # accepts styles: :close, :top, :bottom, :flat, :border, :single, :multi
+        layout_data {
+          width 1024
+          height 200
+        }
+        c_tab_item(:close) {
+          text 'English'
+          tool_tip_text 'English Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/usa.png', __dir__)
+          
+          label {
+            text 'Hello, World!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+        
+        c_tab_item(:close) {
+          text 'French'
+          tool_tip_text 'French Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/france.png', __dir__)
+          
+          label {
+            text 'Bonjour, Univers!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+        
+        c_tab_item(:close) {
+          text 'Spanish'
+          tool_tip_text 'Spanish Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/mexico.png', __dir__)
+          
+          label {
+            text 'Hola, Mundo!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+        
+        c_tab_item(:close) {
+          text 'German'
+          tool_tip_text 'German Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/germany.png', __dir__)
+
+          label {
+            text 'Hallo, Welt!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+
+        c_tab_item(:close) {
+          text 'Italian'
+          tool_tip_text 'Italian Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/italy.png', __dir__)
+
+          label {
+            text 'Ciao, Mondo!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+
+        c_tab_item(:close) {
+          text 'Dutch'
+          tool_tip_text 'Dutch Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/netherlands.png', __dir__)
+
+          label {
+            text 'Hallo, Wereld!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+
+        c_tab_item(:close) {
+          text 'Danish'
+          tool_tip_text 'Danish Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/denmark.png', __dir__)
+
+          label {
+            text 'Hej, Verden!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+
+        c_tab_item(:close) {
+          text 'Finnish'
+          tool_tip_text 'Finnish Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/finland.png', __dir__)
+
+          label {
+            text 'Hei, Maailma!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+
+        c_tab_item(:close) {
+          text 'Norwegian'
+          tool_tip_text 'Norwegian Greeting'
+          foreground :blue
+          selection_foreground :dark_blue
+          font name: 'Times New Roman', height: 30, style: [:bold, :italic]
+          image File.expand_path('hello_c_tab/norway.png', __dir__)
+
+          label {
+            text 'Hei, Verden!'
+            font name: 'Times New Roman', height: 90, style: [:bold, :italic]
+          }
+        }
+
+      }
+
+    }
+
+  }
+end
+
+HelloCTab.launch