glimmer-dsl-opal 0.4.0 → 0.7.0

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

@@ -1,5 +1,5 @@
 # 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
@@ -7,10 +7,10 @@
 # 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
@@ -26,7 +26,7 @@ module Glimmer
         # No Op
       end
       
-      def add_child(child)
+      def post_initialize_child(child)
         # No Op
       end
       

data/lib/glimmer/swt/message_box_proxy.rb

@@ -1,14 +1,16 @@
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/display_proxy'
 
 module Glimmer
   module SWT
     class MessageBoxProxy < WidgetProxy
       attr_reader :text, :message
       
-      def initialize(parent, args)
+      def initialize(parent, args, block)
         i = 0
-        @parent = parent
+        @parent = parent || DisplayProxy.instance.shells.first
         @args = args
+        @block = block
         @children = Set.new
         @enabled = true
         content do
@@ -37,7 +39,7 @@ module Glimmer
       end
       
       def open
-        document.add_child(self)
+        document.post_initialize_child(self)
       end
       
       def hide
@@ -53,11 +55,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 +68,7 @@ module Glimmer
             event: 'click'
           },
         }
-      end      
+      end
  
       def style_dom_modal_css
         <<~CSS
@@ -119,11 +121,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/property_owner.rb

@@ -7,7 +7,7 @@ module Glimmer
       end
     
       def set_attribute(attribute_name, *args)
-        send(attribute_setter(attribute_name), *args) unless send(attribute_getter(attribute_name)) == args.first
+        send(attribute_setter(attribute_name), *args) unless args.size == 1 && send(attribute_getter(attribute_name)) == args.first
       end
       
       def attribute_setter(attribute_name)
@@ -16,7 +16,7 @@ module Glimmer
       
       def attribute_getter(attribute_name)
         attribute_name.to_s.underscore
-      end      
+      end
     end
   end
 end

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
       
@@ -79,6 +80,28 @@ module Glimmer
         @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)
         @spacing = spacing.to_i
         # TODO implement changes to accomodate layout_data in the future
@@ -89,7 +112,7 @@ module Glimmer
             elsif vertical?
               margin_bottom "#{@spacing}px"
             end
-          }          
+          }
           s("##{@parent.id} > :last-child") {
             if horizontal?
               margin_right 0

data/lib/glimmer/swt/scrolled_composite_proxy.rb

@@ -0,0 +1,20 @@
+require 'glimmer/swt/grid_layout_proxy'
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class ScrolledCompositeProxy < CompositeProxy
+      STYLE = <<~CSS
+        .scrolled-composite {
+        }
+      CSS
+      
+      # TODO set overflow-y and overflow-x based on :v_scroll and :h_scroll styles.... though consider also that it might not be needed in web browsers where scrollbars are always present
+      #  height: 100px;
+      #  overflow-y: auto;       
+      
+    end
+    
+  end
+  
+end

data/lib/glimmer/swt/shell_proxy.rb

@@ -21,6 +21,7 @@ module Glimmer
         @layout.margin_width = 0
         @layout.margin_height = 0
         self.minimum_size = Point.new(WIDTH_MIN, HEIGHT_MIN)
+        DisplayProxy.instance.shells << self
       end
       
       def element
@@ -54,7 +55,7 @@ module Glimmer
           .selected, .tabs .tab.selected {
             background: rgb(80, 116, 211);
             color: white;
-          }          
+          }
         CSS
       end
             
@@ -122,11 +123,11 @@ module Glimmer
           /* Create an selected/current tablink class */
           .tabs .tab.selected {
             background-color: #ccc;
-          }              
+          }
           /* Change background color of buttons on hover */
           .tabs .tab:hover {
             background-color: #ddd;
-          }              
+          }
           /* Style the tab content */
           .tab-item {
             padding: 6px 12px;
@@ -190,14 +191,14 @@ module Glimmer
       end
       
       def style_dom_table_css
-        <<~CSS        
+        <<~CSS
           table {
             border-spacing: 0;
           }
             
           table tr th,td {
             cursor: default;
-          }   
+          }
         CSS
       end
       
@@ -207,6 +208,7 @@ module Glimmer
         body_class = ([name] + css_classes.to_a).join(' ')
         @dom ||= html {
           div(id: body_id, class: body_class) {
+            # TODO support the idea of dynamic CSS building on close of shell that adds only as much CSS as needed for widgets that were mentioned
             style(class: 'common-style') {
               style_dom_css
             }
@@ -218,14 +220,14 @@ module Glimmer
             }
             style(class: 'tab-style') {
               style_dom_tab_css
-            }            
+            }
 #             style(class: 'tab-item-style') {
 #               style_dom_tab_item_css
-#             }        
+#             }
 #             style(class: 'modal-style') {
 #               style_dom_modal_css
-#             }        
-            style(class: 'table-style') {            
+#             }
+            style(class: 'table-style') {
               style_dom_table_css
             }
             style(class: 'fill-layout-style') {
@@ -234,6 +236,24 @@ module Glimmer
             style(class: 'row-layout-style') {
               Glimmer::SWT::RowLayoutProxy::STYLE
             }
+            style(class: 'grid-layout-style') {
+              Glimmer::SWT::GridLayoutProxy::STYLE
+            }
+            style(class: 'checkbox-style') {
+              Glimmer::SWT::CheckboxProxy::STYLE
+            }
+            style(class: 'radio-style') {
+              Glimmer::SWT::RadioProxy::STYLE
+            }
+            style(class: 'scrolled-composite-style') {
+              Glimmer::SWT::ScrolledCompositeProxy::STYLE
+            }
+            style(class: 'table-item-style') {
+              Glimmer::SWT::TableItemProxy::STYLE
+            }
+            style(class: 'table-column-style') {
+              Glimmer::SWT::TableColumnProxy::STYLE
+            }
           }
         }.to_s
       end

data/lib/glimmer/swt/tab_folder_proxy.rb

@@ -2,17 +2,17 @@ require 'glimmer/swt/widget_proxy'
 
 module Glimmer
   module SWT
-    class TabFolderProxy < WidgetProxy      
+    class TabFolderProxy < WidgetProxy
       attr_reader :tabs
       
-      def initialize(parent, args)
-        super(parent, args)
+      def initialize(parent, args, block)
+        super(parent, args, block)
         @tabs = []
       end
       
-      def add_child(child)
+      def post_initialize_child(child)
         unless @children.include?(child)
-          @children << child 
+          @children << child
           tabs_dom_element.append(child.tab_dom)
           child.render
         end