glimmer-dsl-swt 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3db01899522fb71b0c6248500a33dea99db22fb65290a05ad08ace90b8b0abf8
-  data.tar.gz: 4cc5bc3f816a1b452e29e36d178ce9c77addfee660abd89bdf047f6d21660508
+  metadata.gz: 0c023dda45b9c92e69ef9a44ef07fde1f45f5161284cf1b46b70d15a661b3ccc
+  data.tar.gz: 77be63700930812f4da66669003df863d77a1644495e2d37b776e97a5e5f145b
 SHA512:
-  metadata.gz: ecbb06bef3ba8d11c71107b1f68ce8be3a1beb8147cf845f346a7561d193252a7774cd9460b3b05b1f664e502c8ca6cdf1a7cd444561834783e1097d29b5890a
-  data.tar.gz: 74c311becb1cc511005cc6c92804f81001757cb0a04f927f7b07811f1a3f5fcd6dd5d3a48e9504777d452781899b953432ee512abc72ba90858bd7aadbd7c3ea
+  metadata.gz: ce300717322a9a905a67c589bf1a9398adcd09abf33421283c5d3265ed68b8ce4dbdf25ac33a37812de355c00ba027d7fe33ce284a9c2eb2932817087130a281
+  data.tar.gz: 353b5a6f43cf7d070ae9a2f775ea2430a4eda54bf346210a8ca5e1ee899a35c44f639fbca3e2cd5338aa73c3f1c9b97209c84ea669c436f36f4ce31a0bf9b1b8

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 0.5.6 (Desktop GUI)
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 0.6.0 (Desktop GUI)
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer-dsl-swt/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer-dsl-swt?branch=master)

data/RUBY_VERSION

@@ -1 +1 @@
-jruby-9.2.12.0
+jruby-9.2.13.0

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.6.0

data/lib/glimmer/dsl/swt/cursor_expression.rb

@@ -0,0 +1,26 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/swt/cursor_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      # cursor expression
+      # Note: Cannot be a static expression because it clashes with cursor property expression
+      class CursorExpression < Expression
+        include TopLevelExpression
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword.to_s == 'cursor' and
+          (parent.nil? or !parent.respond_to?('cursor')) and
+            args.size == 1 and
+            (args.first.is_a?(Integer) or textual?(args.first))
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::CursorProxy.new(*args)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/swt/dsl.rb

@@ -24,6 +24,8 @@ module Glimmer
           tree_items_data_binding
           table_items_data_binding
           data_binding
+          cursor
+          font
           property
           block_property
           widget

data/lib/glimmer/dsl/swt/font_expression.rb

@@ -0,0 +1,24 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/swt/font_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      # font expression
+      # Note: Cannot be a static expression because it clashes with font property expression
+      class FontExpression < Expression
+        include TopLevelExpression
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword.to_s == 'font' and     
+          (parent.nil? || !parent.respond_to?('font')) && args.size == 1 && args.first.is_a?(Hash)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::FontProxy.new(*args)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/cursor_proxy.rb

@@ -0,0 +1,45 @@
+require 'glimmer/error'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.graphics.Cursor
+    #
+    # Invoking `#swt_cursor` returns the SWT Cursor object wrapped by this proxy
+    #
+    # Follows the Proxy Design Pattern
+    class CursorProxy
+      CURSOR_STYLES = org.eclipse.swt.SWT.constants.select {|c| c.to_s.downcase.start_with?('cursor_')}.map {|c| c.to_s.downcase.sub('cursor_', '').to_sym}
+      ERROR_INVALID_CURSOR_STYLE = " is an invalid cursor style! Valid values are #{CURSOR_STYLES.map(&:to_s).join(", ")}"
+
+      include_package 'org.eclipse.swt.graphics'
+
+      attr_reader :swt_cursor, :cursor_style
+
+      # Builds a new CursorProxy from passed in cursor SWT style (e.g. :appstarting, :hand, or :help)
+      #
+      # Cursor SWT styles are those that begin with "CURSOR_" prefix
+      #
+      # They are expected to be passed in in short form without the prefix (but would work with the prefix too)
+      def initialize(cursor_style)
+        @cursor_style = cursor_style
+        @cursor_style = SWTProxy.reverse_lookup(@cursor_style).detect { |symbol| symbol.to_s.downcase.start_with?('cursor_') } if cursor_style.is_a?(Integer)
+        @cursor_style = @cursor_style.to_s.downcase
+        @cursor_style = @cursor_style.sub(/^cursor\_/, '') if @cursor_style.start_with?('cursor_')
+        detect_invalid_cursor_style
+        @swt_cursor = DisplayProxy.instance.swt_display.get_system_cursor(SWTProxy[swt_style])
+      end
+      
+      def swt_style
+        @swt_style ||= @cursor_style.upcase.start_with?('CURSOR_') ? @cursor_style : "CURSOR_#{@cursor_style}"
+      end
+
+      private
+
+      def detect_invalid_cursor_style
+        raise Error, cursor_style.to_s + ERROR_INVALID_CURSOR_STYLE unless CURSOR_STYLES.include?(cursor_style.to_s.downcase.to_sym)
+      end
+    end
+  end
+end

data/lib/glimmer/swt/font_proxy.rb

@@ -6,11 +6,10 @@ module Glimmer
   module SWT
     # Proxy for org.eclipse.swt.graphics.Font
     #
-    # This class is meant to be used with WidgetProxy to manipulate
-    # an SWT widget font.
+    # This class can be optionally used with WidgetProxy to manipulate
+    # an SWT widget font (reusing its FontData but building a new Font)
     #
-    # It is not meant to create new SWT fonts form scratch without
-    # a widget proxy.
+    # Otherwise, if no WidgetProxy is passed to constructor, it builds new FontData
     #
     # Invoking `#swt_font` returns the SWT Font object wrapped by this proxy
     #
@@ -21,7 +20,7 @@ module Glimmer
 
       include_package 'org.eclipse.swt.graphics'
 
-      attr_reader :widget_proxy, :swt_font
+      attr_reader :widget_proxy, :swt_font, :font_properties
 
       # Builds a new font proxy from passed in widget_proxy and font_properties hash,
       #
@@ -31,8 +30,9 @@ module Glimmer
       #
       # Style (:style value) can only be one of FontProxy::FONT_STYLES values:
       # that is :normal, :bold, or :italic
-      def initialize(widget_proxy, font_properties)
+      def initialize(widget_proxy = nil, font_properties)
         @widget_proxy = widget_proxy
+        @font_properties = font_properties
         detect_invalid_font_property(font_properties)
         font_properties[:style] = SWTProxy[*font_properties[:style]]
         font_data_args = [:name, :height, :style].map do |font_property_name|
@@ -57,7 +57,7 @@ module Glimmer
       private
 
       def font_datum
-        @font_datum ||= @widget_proxy.swt_widget.getFont.getFontData[0]
+        @font_datum ||= @widget_proxy ? @widget_proxy.swt_widget.getFont.getFontData[0] : FontData.new
       end
 
       def detect_invalid_font_property(font_properties)

data/lib/glimmer/swt/style_constantizable.rb

@@ -106,7 +106,17 @@ module Glimmer
         def deconstruct(integer)
           constant_source_class.constants.reduce([]) do |found, c|
             constant_value = constant_source_class.const_get(c) rescue -1
-            is_found = constant_value.is_a?(Integer) && (constant_value & integer) == constant_value
+            is_found = constant_value.is_a?(Integer) && (integer & constant_value) == integer
+            is_found ? found += [c] : found
+          end
+        end
+
+        # Reverse engineer a style integer into a symbol
+        # Useful for debugging
+        def reverse_lookup(integer)
+          constant_source_class.constants.reduce([]) do |found, c|
+            constant_value = constant_source_class.const_get(c) rescue -1
+            is_found = constant_value.is_a?(Integer) && integer == constant_value
             is_found ? found += [c] : found
           end
         end

data/lib/glimmer/swt/widget_proxy.rb

@@ -607,6 +607,15 @@ module Glimmer
               value
             end
           end,
+          :cursor => lambda do |value|
+            cursor_proxy = nil
+            if value.is_a?(CursorProxy)
+              cursor_proxy = value
+            elsif value.is_a?(Symbol) || value.is_a?(String) || value.is_a?(Integer)
+              cursor_proxy = CursorProxy.new(value)
+            end
+            cursor_proxy ? cursor_proxy.swt_cursor : value
+          end,
           :foreground => color_converter,
           :font => lambda do |value|
             if value.is_a?(Hash)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -309,6 +309,7 @@ files:
 - lib/glimmer/dsl/swt/color_expression.rb
 - lib/glimmer/dsl/swt/column_properties_expression.rb
 - lib/glimmer/dsl/swt/combo_selection_data_binding_expression.rb
+- lib/glimmer/dsl/swt/cursor_expression.rb
 - lib/glimmer/dsl/swt/custom_widget_expression.rb
 - lib/glimmer/dsl/swt/data_binding_expression.rb
 - lib/glimmer/dsl/swt/dialog_expression.rb
@@ -316,6 +317,7 @@ files:
 - lib/glimmer/dsl/swt/dnd_expression.rb
 - lib/glimmer/dsl/swt/dsl.rb
 - lib/glimmer/dsl/swt/exec_expression.rb
+- lib/glimmer/dsl/swt/font_expression.rb
 - lib/glimmer/dsl/swt/layout_data_expression.rb
 - lib/glimmer/dsl/swt/layout_expression.rb
 - lib/glimmer/dsl/swt/list_selection_data_binding_expression.rb
@@ -341,6 +343,7 @@ files:
 - lib/glimmer/rake_task/list.rb
 - lib/glimmer/scaffold.rb
 - lib/glimmer/swt/color_proxy.rb
+- lib/glimmer/swt/cursor_proxy.rb
 - lib/glimmer/swt/display_proxy.rb
 - lib/glimmer/swt/dnd_proxy.rb
 - lib/glimmer/swt/font_proxy.rb