glimmer-dsl-opal 0.3.0 → 0.6.1

data/lib/glimmer/swt/label_proxy.rb

@@ -1,30 +1,50 @@
 require 'glimmer/swt/widget_proxy'
+# require 'glimmer/swt/image_proxy'
 
 module Glimmer
   module SWT
     class LabelProxy < WidgetProxy
-      attr_reader :text
+      attr_reader :text, :background_image, :image, :alignment
+      
+      def initialize(parent, args, block)
+        super(parent, args, block)
+        self.alignment = [:left, :center, :right].detect {|align| args.detect { |arg| SWTProxy[align] == arg } }
+      end
 
       def text=(value)
         @text = value
         dom_element.html(value)
       end
       
+      def background_image=(*image_options)
+        # TODO consider if there is a difference between background_image and image in label and to have one reuse the other
+        # TODO finish implementation
+#         @background_image = Glimmer::SWT::ImageProxy.create(*image_options)
+#         dom_element.css('background-image', @background_image.image_data.dom_element.src)
+      end
+      
+      def image=(*image_options)
+        # TODO finish implementation
+#         @image = Glimmer::SWT::ImageProxy.create(*image_options)
+#         dom_element.css('background-image', @image.image_data.dom_element.src)
+      end
+      
       def element
         'label'
       end
-      
-      def alignment
-        [:left, :center, :right].detect {|value| args.detect { |arg| SWTProxy[value] == arg } }
+
+      def alignment=(value)
+        # TODO consider storing swt value in the future instead
+        @alignment = value
+        dom_element.css('text-align', @alignment.to_s)
       end
       
-      def dom        
+      def dom
         label_text = @text
         label_id = id
-        label_style = "text-align: #{alignment};"
         label_class = name
         @dom ||= html {
-          label(id: label_id, style: label_style, class: label_class) {
+          label(id: label_id, class: label_class) {
             label_text
           }
         }.to_s

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -4,78 +4,96 @@ module Glimmer
   module SWT
     class LayoutDataProxy
       include Glimmer::SWT::PropertyOwner
-      attr_reader :parent, 
-                  :args, 
-                  :horizontal_alignment, 
-                  :vertical_alignment, 
-                  :horizontal_span, 
-                  :vertical_span, 
-                  :horizontal_indent, 
-                  :vertical_indent, 
+      attr_reader :parent,
+                  :args,
+                  :horizontal_alignment,
+                  :vertical_alignment,
+                  :horizontal_span,
+                  :vertical_span,
+                  :horizontal_indent,
+                  :vertical_indent,
                   :grab_excess_horizontal_space,
                   :grab_excess_vertical_space,
+                  :width_hint,
                   :height_hint
     
       def initialize(parent, args)
         @parent = parent
         @args = args
-        # TODO spread args correctly
+        self.horizontal_alignment = @args[0] if @args[0]
+        self.vertical_alignment = @args[1] if @args[1]
+        self.grab_excess_horizontal_space = @args[2] if @args[2]
+        self.grab_excess_vertical_space = @args[3] if @args[3]
+        # TODO spread args correctly as per SWT LayoutData API
         # TODO avoid using reapply
-        reapply
+#         reapply
+      end
+
+      def width_hint=(width_hint)
+        @width_hint = width_hint
+        @parent.dom_element.css('width', "#{@width_hint}px")
+#         reapply
       end
 
       def height_hint=(height_hint)
         @height_hint = height_hint
-        # TODO
-        reapply
+        @parent.dom_element.css('height', "#{@height_hint}px")
+#         reapply
       end
 
       def horizontal_alignment=(horizontal_alignment)
         @horizontal_alignment = horizontal_alignment
+        return if @horizontal_alignment.nil?
+        if @horizontal_alignment == 'fill'
+          @parent.dom_element.css('width', '100%') if width_hint.nil?
+        else
+          @parent.dom_element.css('text-align', @horizontal_alignment)
+        end
         # TODO
-        reapply
+#         reapply
       end
       
       def vertical_alignment=(vertical_alignment)
         @vertical_alignment = vertical_alignment
         # TODO
-        reapply
+#         reapply
       end
       
       def horizontal_span=(value)
         @horizontal_span = value
         @parent.dom_element.css('grid-column-start', "span #{@horizontal_span}")
-        reapply
+#         reapply
       end
       
       def vertical_span=(value)
         @vertical_span = value
-        @parent.dom_element.css('grid-row-start', "span #{@horizontal_span}")
-        reapply
+        @parent.dom_element.css('grid-row-start', "span #{@vertical_span}")
+#         reapply
       end
       
       def horizontal_indent=(value)
         @horizontal_indent = value
         @parent.dom_element.css('padding-left', @horizontal_indent)
-        reapply
+#         reapply
       end
       
       def vertical_indent=(value)
         @vertical_indent = value
         @parent.dom_element.css('padding-top', @vertical_indent)
-        reapply
+#         reapply
       end
       
       def grab_excess_horizontal_space=(grab_excess_horizontal_space)
         @grab_excess_horizontal_space = grab_excess_horizontal_space
-        # TODO
-        reapply
+        @parent.dom_element.css('width', "100%") if @grab_excess_horizontal_space && width_hint.nil?
+#         reapply
       end
 
       def grab_excess_vertical_space=(grab_excess_vertical_space)
         @grab_excess_vertical_space = grab_excess_vertical_space
+        @parent.dom_element.css('height', "100%") if @grab_excess_vertical_space && height_hint.nil?
         # TODO
-        reapply
+#         reapply
       end
 
       def reapply

data/lib/glimmer/swt/layout_proxy.rb

@@ -25,21 +25,21 @@ module Glimmer
         def layout_exists?(keyword)
           !!layout_class(keyword)
         end
-      end      
+      end
       
       attr_reader :parent, :args
         
-      def initialize(parent, args)      
+      def initialize(parent, args)
         @parent = parent
         @parent = parent.body_root if @parent.is_a?(Glimmer::UI::CustomWidget)
         @parent.css_classes.each do |css_class|
           @parent.remove_css_class(css_class) if css_class.include?('layout')
         end
-        @args = args        
+        @args = args
         @parent.add_css_class(css_class)
         @parent.layout = self
         self.margin_width = 15 if respond_to?(:margin_width=)
-        self.margin_height = 15 if respond_to?(:margin_height=)        
+        self.margin_height = 15 if respond_to?(:margin_height=)
       end
 
       def css_class

data/lib/glimmer/swt/list_proxy.rb

@@ -6,8 +6,8 @@ module Glimmer
       ITEM_EMPTY = '_____'
       attr_reader :items, :selection
       
-      def initialize(parent, args)        
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         @selection = []
       end
       
@@ -62,7 +62,7 @@ module Glimmer
                 if event.target.prop('nodeName') == 'LI'
                   selected_item = event.target.text
                   select(index_of(selected_item), event.meta_key)
-                  event_listener.call(event)              
+                  event_listener.call(event)
                 end
               }
             }

data/lib/glimmer/swt/make_shift_shell_proxy.rb

@@ -0,0 +1,38 @@
+# 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
+    class MakeShiftShellProxy < Glimmer::SWT::ShellProxy
+      def initialize(*args, &block)
+        # No Op
+      end
+      
+      def post_initialize_child(child)
+        # No Op
+      end
+      
+      def open
+        # No Op
+      end
+    end
+  end
+end

data/lib/glimmer/swt/message_box_proxy.rb

@@ -5,10 +5,11 @@ module Glimmer
     class MessageBoxProxy < WidgetProxy
       attr_reader :text, :message
       
-      def initialize(parent, args)
+      def initialize(parent, args, block)
         i = 0
         @parent = parent
         @args = args
+        @block = block
         @children = Set.new
         @enabled = true
         content do
@@ -37,7 +38,7 @@ module Glimmer
       end
       
       def open
-        document.add_child(self)
+        document.post_initialize_child(self)
       end
       
       def hide
@@ -53,11 +54,11 @@ module Glimmer
       end
       
       def selector
-        super + ' .close' 
+        super + ' .close'
       end
     
       def listener_path
-        path + ' .close' 
+        path + ' .close'
       end
     
       def observation_request_to_event_mapping
@@ -66,7 +67,7 @@ module Glimmer
             event: 'click'
           },
         }
-      end      
+      end
  
       def style_dom_modal_css
         <<~CSS
@@ -119,11 +120,11 @@ module Glimmer
         modal_text = text
         modal_message = message
         modal_class = ['modal', name].join(' ')
-        @dom ||= html {        
+        @dom ||= html {
           div(id: modal_id, style: modal_style, class: modal_class) {
             style(class: 'modal-style') {
               style_dom_modal_css #.split("\n").map(&:strip).join(' ')
-            }        
+            }
             div(class: 'modal-content') {
               header(class: 'text') {
                 modal_text

data/lib/glimmer/swt/radio_proxy.rb

@@ -0,0 +1,82 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class RadioProxy < WidgetProxy
+      # TODO add a create method that ensures passing :radio style in if not there
+      STYLE=<<~CSS
+        .radio {
+          display: inline;
+        }
+        .radio-label {
+          display: inline;
+        }
+        .radio-container {
+        }
+      CSS
+      
+      def text
+        label_dom_element.html
+      end
+      
+      def text=(value)
+        label_dom_element.html(value)
+      end
+      
+      def selection
+        dom_element.prop('checked')
+      end
+      
+      def selection=(value)
+        dom_element.prop('checked', value)
+      end
+      
+      def element
+        'input'
+      end
+      
+      def label_id
+        "#{id}-label"
+      end
+      
+      def label_name
+        "#{name}-label"
+      end
+      
+      def label_path
+        "#{parent_path} ##{label_id}"
+      end
+      
+      def label_dom_element
+        Document.find(label_path)
+      end
+      
+      def container_id
+        "#{id}-container"
+      end
+
+      def container_name
+        "#{name}-container"
+      end
+
+      def observation_request_to_event_mapping
+        {
+          'on_widget_selected' => {
+            event: 'change'
+          },
+        }
+      end
+      
+      def dom
+        @dom ||= html {
+          span(id: container_id, class: container_name) {
+            input(type: 'radio', id: id, class: name, name: parent&.id)
+            label(id: label_id, class: label_name, for: id) {
+              text
+            }
+          }
+        }.to_s
+      end
+    end
+  end
+end

data/lib/glimmer/swt/row_layout_proxy.rb

@@ -8,18 +8,19 @@ module Glimmer
       STYLE = <<~CSS
         .row-layout {
           display: flex;
+          align-items: flex-start;
         }
                 
-        .row-layout-pack {
-          display: initial;
+        .row-layout-pack-false {
+          align-items: stretch;
         }
                 
         .row-layout-horizontal {
           flex-direction: row;
         }
         
-        .row-layout-horizontal.row-layout-pack {
-          flex-direction: none;
+        .row-layout-horizontal.row-layout-pack-false {
+          flex-direction: unset;
         }
         
         .row-layout-vertical {
@@ -27,11 +28,11 @@ module Glimmer
         }
         
         .row-layout-vertical.row-layout-pack {
-          flex-direction: none;          
+          flex-direction: none;
         }
       CSS
     
-      attr_reader :type, :margin_width, :margin_height, :spacing, :pack
+      attr_reader :type, :margin_width, :margin_height, :margin_top, :margin_right, :margin_bottom, :margin_left, :spacing, :pack
     
       def initialize(parent, args)
         super(parent, args)
@@ -51,7 +52,7 @@ module Glimmer
         @type == :vertical
       end
       
-      def dom(widget_dom)        
+      def dom(widget_dom)
         dom_result = widget_dom
         dom_result += '<br />' if vertical? && @pack
         dom_result
@@ -60,9 +61,9 @@ module Glimmer
       def pack=(value)
         @pack = value
         if @pack
-          @parent.dom_element.add_class('row-layout-pack')
+          @parent.dom_element.remove_class('row-layout-pack-false')
         else
-          @parent.dom_element.remove_class('row-layout-pack')
+          @parent.dom_element.add_class('row-layout-pack-false')
         end
       end
       
@@ -75,8 +76,30 @@ module Glimmer
       
       def margin_height=(pixels)
         @margin_height = pixels
-        @parent.dom_element.css('margin-top', @margin_height)
-        @parent.dom_element.css('margin-bottom', @margin_height)
+        @parent.dom_element.css('padding-top', @margin_height)
+        @parent.dom_element.css('padding-bottom', @margin_height)
+      end
+      
+      def margin_top=(pixels)
+        @margin_top = pixels
+        # Using padding for width since margin-right isn't getting respected with width 100%
+        @parent.dom_element.css('padding-top', @margin_top)
+      end
+      
+      def margin_right=(pixels)
+        @margin_right = pixels
+        @parent.dom_element.css('padding-right', @margin_right)
+      end
+      
+      def margin_bottom=(pixels)
+        @margin_bottom = pixels
+        # Using padding for width since margin-right isn't getting respected with width 100%
+        @parent.dom_element.css('padding-bottom', @margin_bottom)
+      end
+      
+      def margin_left=(pixels)
+        @margin_left = pixels
+        @parent.dom_element.css('padding-left', @margin_left)
       end
       
       def spacing=(spacing)
@@ -89,7 +112,7 @@ module Glimmer
             elsif vertical?
               margin_bottom "#{@spacing}px"
             end
-          }          
+          }
           s("##{@parent.id} > :last-child") {
             if horizontal?
               margin_right 0