glimmer-dsl-opal 0.1.0 → 0.2.0

data/lib/glimmer/swt/browser_proxy.rb

@@ -7,7 +7,7 @@ module Glimmer
       
       def url=(value)
         @url = value
-        redraw
+        dom_element.attr('src', @url)
       end
     
       def element

data/lib/glimmer/swt/button_proxy.rb

@@ -7,7 +7,7 @@ module Glimmer
       
       def text=(value)
         @text = value
-        redraw
+        dom_element.html(@text)
       end
       
       def element
@@ -30,7 +30,7 @@ module Glimmer
         input_disabled = @enabled ? {} : {'disabled': 'disabled'}
         input_args = input_args.merge(type: 'password') if has_style?(:password)
         @dom ||= html {
-          button(input_args.merge(id: input_id, class: name, style: input_style, style: 'min-width: 27px;').merge(input_disabled)) {
+          button(input_args.merge(id: input_id, class: name, style: input_style, style: 'min-width: 27px; min-height: 27px;').merge(input_disabled)) {
             input_text.to_s == '' ? ' ' : input_text
           }
         }.to_s

data/lib/glimmer/swt/color_proxy.rb

@@ -0,0 +1,119 @@
+# Copyright (c) 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.
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.graphics.Color
+    #
+    # Invoking `#swt_color` returns the SWT Color object wrapped by this proxy
+    #
+    # Follows the Proxy Design Pattern
+    class ColorProxy
+      SWT_COLOR_TRANSLATION = {
+        "widget_foreground"                   => [0, 0, 0], 
+        "blue"                                => [0, 0, 255], 
+        "widget_dark_shadow"                  => [0, 0, 0], 
+        "title_foreground"                    => [0, 0, 0], 
+        "yellow"                              => [255, 255, 0], 
+        "widget_highlight_shadow"             => [255, 255, 255], 
+        "dark_cyan"                           => [0, 128, 128], 
+        "list_foreground"                     => [0, 0, 0], 
+        "dark_blue"                           => [0, 0, 128], 
+        "dark_yellow"                         => [128, 128, 0], 
+        "cyan"                                => [0, 255, 255], 
+        "info_background"                     => [236, 235, 236], 
+        "link_foreground"                     => [0, 104, 218], 
+        "title_inactive_foreground"           => [0, 0, 0], 
+        "title_background_gradient"           => [179, 215, 255], 
+        "red"                                 => [255, 0, 0], 
+        "title_inactive_background_gradient"  => [220, 220, 220], 
+        "transparent"                         => [255, 255, 255], 
+        "widget_light_shadow"                 => [232, 232, 232], 
+        "dark_magenta"                        => [128, 0, 128], 
+        "white"                               => [255, 255, 255], 
+        "list_selection"                      => [179, 215, 255], 
+        "gray"                                => [192, 192, 192], 
+        "widget_border"                       => [0, 0, 0], 
+        "widget_background"                   => [236, 236, 236], 
+        "info_foreground"                     => [0, 0, 0], 
+        "title_inactive_background"           => [220, 220, 220], 
+        "widget_disabled_foreground"          => [220, 220, 220], 
+        "list_background"                     => [255, 255, 255], 
+        "magenta"                             => [255, 0, 255], 
+        "title_background"                    => [0, 99, 225], 
+        "text_disabled_background"            => [255, 255, 255], 
+        "black"                               => [0, 0, 0], 
+        "dark_gray"                           => [128, 128, 128], 
+        "list_selection_text"                 => [0, 0, 0], 
+        "dark_red"                            => [128, 0, 0], 
+        "widget_normal_shadow"                => [159, 159, 159], 
+        "dark_green"                          => [0, 128, 0], 
+        "green"                               => [0, 255, 0]
+      }
+    
+      attr_reader :args, :red, :green, :blue, :alpha
+    
+      # Initializes a proxy for an SWT Color object
+      #
+      # Takes a standard color single argument, rgba 3 args, or rgba 4 args
+      #
+      # A standard color is a string/symbol representing one of the
+      # SWT.COLOR_*** constants like SWT.COLOR_RED, but in underscored string
+      # format (e.g :color_red).
+      # Glimmer can also accept standard color names without the color_ prefix,
+      # and it will automatically figure out the SWT.COLOR_*** constant
+      # (e.g. :red)
+      #
+      # rgb is 3 arguments representing Red, Green, Blue numeric values
+      #
+      # rgba is 4 arguments representing Red, Green, Blue, and Alpha numeric values
+      #
+      def initialize(*args)
+        @args = args        
+        case @args.size
+        when 1
+          @alpha = nil
+          if @args.first.is_a?(String) || @args.first.is_a?(Symbol)              
+            standard_color = @args.first.to_s.downcase.sub('COLOR_', '')             
+            @red, @green, @blue = SWT_COLOR_TRANSLATION[standard_color]
+          else
+            @red, @green, @blue = [0, 0, 0]
+          end
+        when 3..4
+          @red, @green, @blue, @alpha = @args
+        end        
+      end
+      
+      def to_css
+        if alpha.nil?
+          "rgb(#{red}, #{green}, #{blue})"
+        else
+          "rgba(#{red}, #{green}, #{blue}, #{alpha_css})"
+        end
+      end
+      
+      def alpha_css
+        alpha.to_f / 255
+      end
+
+    end
+  end
+end

data/lib/glimmer/swt/combo_proxy.rb

@@ -23,7 +23,16 @@ module Glimmer
       
       def items=(the_items)
         @items = the_items
-        redraw
+        items_dom = items.to_a.map do |item|
+          option_hash = {value: item}
+          option_hash[:selected] = 'selected' if @text == item
+          html {
+            option(option_hash) {
+              item
+            } 
+          }.to_s
+        end
+        dom_element.html(items_dom)
       end
 
       def observation_request_to_event_mapping      
@@ -41,20 +50,12 @@ module Glimmer
       end
       
       def dom
-        select_text = @text        
         items = @items
         select_id = id
         select_style = css
         select_class = name
         @dom ||= html {
           select(id: select_id, class: select_class, style: select_style) {
-            items.to_a.each do |item|
-              option_hash = {value: item}
-              option_hash[:selected] = 'selected' if select_text == item
-              option(option_hash) {
-                item
-              } 
-            end
           }
         }.to_s
       end

data/lib/glimmer/swt/composite_proxy.rb

@@ -11,21 +11,21 @@ module Glimmer
         @layout = GridLayoutProxy.new(self, [])
       end
       
-      def redraw
-        super()
-        @children.each do |child|
-          add_child(child) # TODO think of impact of this on performance, and of other alternatives
-        end
-      end
-      
       def dom
         div_id = id
         div_style = css
-        div_class = "#{name} grid-layout"
+        div_class = name
         @dom ||= html {
           div(id: div_id, class: div_class, style: div_style)
         }.to_s
       end
+      
+      def layout=(the_layout)
+        @layout = the_layout
+      end
+      
     end
+    
   end
+  
 end

data/lib/glimmer/{opal → swt}/display_proxy.rb

@@ -1,5 +1,5 @@
 module Glimmer
-  module Opal
+  module SWT
     class DisplayProxy
       class << self
         def instance
@@ -18,6 +18,8 @@ module Glimmer
         end
         Async::Task.new(&executer)
       end
+      # sync_exec kept for API compatibility reasons
+      alias sync_exec async_exec
     end
   end
 end

data/lib/glimmer/swt/fill_layout_proxy.rb

@@ -0,0 +1,84 @@
+require 'glimmer/swt/layout_proxy'
+
+module Glimmer
+  module SWT
+    class FillLayoutProxy < LayoutProxy
+      include Glimmer
+      
+      STYLE = <<~CSS
+        .fill-layout {
+          display: flex;
+        }
+        
+        .fill-layout > * {
+          width: 100%;
+          height: 100%;
+        }
+        
+        .fill-layout-horizontal {
+          flex-direction: row;
+        }
+        
+        .fill-layout-vertical {
+          flex-direction: column;
+        }
+      CSS
+    
+      attr_reader :type, :margin_width, :margin_height, :spacing
+    
+      def initialize(parent, args)
+        super(parent, args)
+        @type = @args.first || :horizontal
+        self.margin_width = 15
+        self.margin_height = 15
+        @parent.css_classes << 'fill-layout'
+        @parent.css_classes << (horizontal? ? 'fill-layout-horizontal' : 'fill-layout-vertical')
+        @parent.dom_element.add_class('fill-layout')
+        @parent.dom_element.add_class(horizontal? ? 'fill-layout-horizontal' : 'fill-layout-vertical')
+      end
+      
+      def horizontal?
+        @type == :horizontal
+      end
+
+      def vertical?
+        @type == :vertical
+      end
+
+      def margin_width=(pixels)
+        @margin_width = pixels
+        # Using padding for width since margin-right isn't getting respected with width 100%
+        @parent.dom_element.css('padding-left', @margin_width)
+        @parent.dom_element.css('padding-right', @margin_width)
+      end
+      
+      def margin_height=(pixels)
+        @margin_height = pixels
+        @parent.dom_element.css('margin-top', @margin_height)
+        @parent.dom_element.css('margin-bottom', @margin_height)
+      end
+      
+      def spacing=(spacing)
+        @spacing = spacing.to_i
+        # TODO implement changes to accomodate layout_data in the future
+        @parent.style_element.html css {
+          s("##{@parent.id} > *") {
+            if horizontal?
+              margin_right "#{@spacing}px"
+            elsif vertical?
+              margin_bottom "#{@spacing}px"
+            end
+          }          
+          s("##{@parent.id} > :last-child") {
+            if horizontal?
+              margin_right 0
+            elsif vertical?
+              margin_bottom 0
+            end
+          }
+        }.to_s
+      end
+      
+    end
+  end
+end

data/lib/glimmer/swt/font_proxy.rb

@@ -0,0 +1,79 @@
+# Copyright (c) 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/error'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.graphics.Font
+    #
+    # This class can be optionally used with WidgetProxy to manipulate
+    # an SWT widget font (reusing its FontData but building a new Font)
+    #
+    # Otherwise, if no WidgetProxy is passed to constructor, it builds new FontData
+    #
+    # Invoking `#swt_font` returns the SWT Font object wrapped by this proxy
+    #
+    # Follows the Proxy Design Pattern
+    class FontProxy
+      ERROR_INVALID_FONT_STYLE = " is an invalid font style! Valid values are :normal, :bold, and :italic"
+      FONT_STYLES = [:normal, :bold, :italic]
+
+      attr_reader :widget_proxy, :font_properties
+
+      # Builds a new font proxy from passed in widget_proxy and font_properties hash,
+      #
+      # It begins with existing SWT widget font and amends it with font properties.
+      #
+      # Font properties consist of: :name, :height, and :style (one needed minimum)
+      #
+      # Style (:style value) can only be one of FontProxy::FONT_STYLES values:
+      # that is :normal, :bold, or :italic
+      def initialize(widget_proxy = nil, font_properties)
+        @widget_proxy = widget_proxy
+        @font_properties = font_properties.symbolize_keys
+        detect_invalid_font_property(font_properties)
+      end
+
+      def name
+        font_properties[:name]
+      end
+
+      def height
+        font_properties[:height]
+      end
+
+      def style
+        font_properties[:style]
+      end
+
+      private
+
+      def detect_invalid_font_property(font_properties)
+        [font_properties[:style]].flatten.select do |style|
+          style.is_a?(Symbol) || style.is_a?(String)
+        end.each do |style|
+          raise Error, style.to_s + ERROR_INVALID_FONT_STYLE if !FONT_STYLES.include?(style.to_sym)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/grid_layout_proxy.rb

@@ -3,18 +3,19 @@ require 'glimmer/swt/layout_proxy'
 module Glimmer
   module SWT
     class GridLayoutProxy < LayoutProxy
-      attr_reader :num_columns, :make_columns_equal_width, :horizontal_spacing, :vertical_spacing
+      attr_reader :num_columns, :make_columns_equal_width, :horizontal_spacing, :vertical_spacing, :margin_width, :margin_height
     
       def initialize(parent, args)
         super(parent, args)
-        @horizontal_spacing = 10
-        @vertical_spacing = 10
-        @num_columns = @args.first || 1        
+        self.horizontal_spacing = 10
+        self.vertical_spacing = 10
+        self.num_columns = @args.first || 1        
         reapply
       end
 
       def num_columns=(columns)
         @num_columns = columns
+        # TODO do the following instead of reapply
 #         @parent.add_css_class("num-columns-#{@num_columns}")
         reapply
       end
@@ -36,6 +37,35 @@ module Glimmer
 #         @parent.add_css_class("vertical-spacing-#{@vertical_spacing}")
         reapply
       end
+      
+      def margin_width=(pixels)
+        @margin_width = pixels
+        # Using padding for width since margin-right isn't getting respected with width 100%
+        @parent.dom_element.css('padding-left', @margin_width)
+        @parent.dom_element.css('padding-right', @margin_width)
+      end
+      
+      def margin_height=(pixels)
+        @margin_height = pixels
+        @parent.dom_element.css('margin-top', @margin_height)
+        @parent.dom_element.css('margin-bottom', @margin_height)
+      end
+            
+      def reapply
+        layout_css = <<~CSS
+          display: grid;
+          grid-template-columns: #{'auto ' * @num_columns.to_i};
+          grid-template-rows: min-content;
+          grid-row-gap: #{@vertical_spacing}px;
+          grid-column-gap: #{@horizontal_spacing}px;
+          justify-content: start;
+          align-items: start;
+          align-content: start;
+        CSS
+        layout_css.split(";").map(&:strip).map {|l| l.split(':').map(&:strip)}.each do |key, value|          
+          @parent.dom_element.css(key, value) unless key.nil?
+        end      
+      end      
     end
   end
 end