glimmer-dsl-opal 0.4.0 → 0.5.0

data/lib/glimmer/swt/row_layout_proxy.rb

@@ -8,9 +8,10 @@ module Glimmer
       STYLE = <<~CSS
         .row-layout {
           display: flex;
+          align-items: flex-start;
         }
                 
-        .row-layout-pack {
+        .row-layout-pack-false {
           display: initial;
         }
                 
@@ -18,8 +19,8 @@ module Glimmer
           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

@@ -54,7 +54,7 @@ module Glimmer
           .selected, .tabs .tab.selected {
             background: rgb(80, 116, 211);
             color: white;
-          }          
+          }
         CSS
       end
             
@@ -122,11 +122,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 +190,14 @@ module Glimmer
       end
       
       def style_dom_table_css
-        <<~CSS        
+        <<~CSS
           table {
             border-spacing: 0;
           }
             
           table tr th,td {
             cursor: default;
-          }   
+          }
         CSS
       end
       
@@ -218,14 +218,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 +234,18 @@ 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
+            }
           }
         }.to_s
       end

data/lib/glimmer/swt/widget_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
@@ -29,13 +29,13 @@ module Glimmer
       include Glimmer
       include PropertyOwner
       
-      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font
+      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font, :focus
       
       class << self
         # Factory Method that translates a Glimmer DSL keyword into a WidgetProxy object
         def for(keyword, parent, args)
           the_widget_class = widget_class(keyword)
-          the_widget_class.new(parent, args)
+          the_widget_class.respond_to?(:create) ? the_widget_class.create(parent, args) : the_widget_class.new(parent, args)
         end
         
         def widget_class(keyword)
@@ -69,7 +69,7 @@ module Glimmer
         
         def underscored_widget_name(widget_proxy)
           widget_proxy.class.name.split(/::|\./).last.sub(/Proxy$/, '').underscore
-        end        
+        end
       end
       
       DEFAULT_INITIALIZERS = {
@@ -95,27 +95,27 @@ module Glimmer
 #         "group" => lambda do |group_proxy|
 #           group_proxy.layout = GridLayoutProxy.new(group_proxy, []) if group.layout.nil?
 #         end,
-      }      
+      }
       
       def initialize(parent, args)
-        @parent = parent        
+        @parent = parent
         @args = args
         @children = Set.new # TODO consider moving to composite
         @enabled = true
         DEFAULT_INITIALIZERS[self.class.underscored_widget_name(self)]&.call(self)
-        @parent.add_child(self) # TODO rename to post_initialize_child to be closer to glimmer-dsl-swt terminology        
+        @parent.add_child(self) # TODO rename to post_initialize_child to be closer to glimmer-dsl-swt terminology
       end
       
       def css_classes
         dom_element.attr('class').to_s.split
-      end      
+      end
       
       def dispose
         Document.find(path).remove
       end
       
       def path
-        "#{parent_path} > #{element}##{id}.#{name}"
+        "#{parent_path} #{element}##{id}.#{name}"
       end
 
       # Root element representing widget. Must be overridden by subclasses if different from div
@@ -151,6 +151,16 @@ module Glimmer
         dom_element.css('font-size', "#{@font.height}px") unless @font.nil?
       end
       
+      def focus=(value)
+        @focus = value
+        dom_element.focus # TODO consider if a delay or async_exec is needed here
+      end
+      
+      def set_focus
+        self.focus = true
+      end
+      alias setFocus set_focus
+      
       def parent_path
         @parent.path
       end
@@ -172,14 +182,14 @@ module Glimmer
         end
         children.each do |child|
           child.render
-        end        
+        end
       end
       alias redraw render
       
       def build_dom
         @dom = nil
         @dom = dom
-        @dom = @parent.layout.dom(@dom) if @parent.respond_to?(:layout) && @parent.layout        
+        @dom = @parent.layout.dom(@dom) if @parent.respond_to?(:layout) && @parent.layout
       end
       
       def content(&block)
@@ -234,6 +244,7 @@ module Glimmer
       end
       
       def dom_element
+        # TODO consider making this pick an element in relation to its parent, allowing unhooked dom elements to be built if needed (unhooked to the visible page dom)
         Document.find(path)
       end
       
@@ -260,10 +271,10 @@ module Glimmer
       end
       
       def listener_dom_element
-        Document.find(listener_path)      
+        Document.find(listener_path)
       end
       
-      def can_handle_observation_request?(observation_request)        
+      def can_handle_observation_request?(observation_request)
         # TODO sort this out for Opal
         observation_request = observation_request.to_s
         if observation_request.start_with?('on_swt_')
@@ -274,15 +285,15 @@ module Glimmer
 #           can_add_listener?(event) || can_handle_drag_observation_request?(observation_request) || can_handle_drop_observation_request?(observation_request)
           true # TODO filter by valid listeners only in the future
         end
-      end      
+      end
       
-      def handle_observation_request(keyword, &event_listener)        
+      def handle_observation_request(keyword, &event_listener)
         return unless observation_request_to_event_mapping.keys.include?(keyword)
         @observation_requests ||= {}
         @observation_requests[keyword] ||= Set.new
         event = nil
         delegate = nil
-        [observation_request_to_event_mapping[keyword]].flatten.each do |mapping|          
+        [observation_request_to_event_mapping[keyword]].flatten.each do |mapping|
           @observation_requests[keyword] << event_listener
           event = mapping[:event]
           event_handler = mapping[:event_handler]
@@ -357,9 +368,9 @@ module Glimmer
 #               value
 #             end
 #           end,
-#           :items => lambda do |value|
-#             value.to_java :string
-#           end,
+          :items => lambda do |value|
+            value.to_java :string
+          end,
           :text => lambda do |value|
 #             if swt_widget.is_a?(Browser)
 #               value.to_s
@@ -370,8 +381,8 @@ module Glimmer
 #           :visible => lambda do |value|
 #             !!value
 #           end,
-        }      
-      end      
+        }
+      end
       
       def widget_property_listener_installers
         @swt_widget_property_listener_installers ||= {
@@ -450,13 +461,13 @@ module Glimmer
 #               }
 #             end,
 #           },
-#           Button => { #radio?
-#             :selection => lambda do |observer|
-#               on_widget_selected { |selection_event|
-#                 observer.call(getSelection)
-#               }
-#             end
-#           },
+          RadioProxy => { #radio?
+            :selection => lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(selection)
+              }
+            end
+          },
 #           Java::OrgEclipseSwtWidgets::MenuItem => {
 #             :selection => lambda do |observer|
 #               on_widget_selected { |selection_event|
@@ -481,15 +492,20 @@ end
 require 'glimmer/swt/browser_proxy'
 require 'glimmer/swt/button_proxy'
 require 'glimmer/swt/combo_proxy'
+require 'glimmer/swt/checkbox_proxy'
 require 'glimmer/swt/composite_proxy'
+require 'glimmer/swt/group_proxy'
 require 'glimmer/swt/label_proxy'
 require 'glimmer/swt/list_proxy'
+require 'glimmer/swt/radio_proxy'
 require 'glimmer/swt/tab_folder_proxy'
 require 'glimmer/swt/tab_item_proxy'
 require 'glimmer/swt/table_column_proxy'
 require 'glimmer/swt/table_item_proxy'
 require 'glimmer/swt/table_proxy'
 require 'glimmer/swt/text_proxy'
+require 'glimmer/swt/radio_proxy'
+require 'glimmer/swt/scrolled_composite_proxy'
 require 'glimmer/swt/styled_text_proxy'
 
 require 'glimmer/dsl/opal/widget_expression'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2020-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -221,13 +221,18 @@ files:
 - lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe/board.rb
 - lib/glimmer-dsl-opal/samples/elaborate/tic_tac_toe/cell.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_browser.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_checkbox.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_checkbox_group.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_combo.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_computed.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_computed/contact.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_custom_shell.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_custom_widget.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_group.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_list_multi_selection.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_list_single_selection.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_radio.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_radio_group.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_tab.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_world.rb
 - lib/glimmer-dsl-opal/vendor/jquery.js
@@ -239,6 +244,7 @@ files:
 - lib/glimmer/data_binding/table_items_binding.rb
 - lib/glimmer/dsl/opal/async_exec_expression.rb
 - lib/glimmer/dsl/opal/bind_expression.rb
+- lib/glimmer/dsl/opal/checkbox_group_selection_data_binding_expression.rb
 - lib/glimmer/dsl/opal/color_expression.rb
 - lib/glimmer/dsl/opal/column_properties_expression.rb
 - lib/glimmer/dsl/opal/combo_selection_data_binding_expression.rb
@@ -254,6 +260,7 @@ files:
 - lib/glimmer/dsl/opal/message_box_expression.rb
 - lib/glimmer/dsl/opal/observe_expression.rb
 - lib/glimmer/dsl/opal/property_expression.rb
+- lib/glimmer/dsl/opal/radio_group_selection_data_binding_expression.rb
 - lib/glimmer/dsl/opal/rgb_expression.rb
 - lib/glimmer/dsl/opal/rgba_expression.rb
 - lib/glimmer/dsl/opal/shell_expression.rb
@@ -267,14 +274,18 @@ files:
 - lib/glimmer/swt.rb
 - lib/glimmer/swt/browser_proxy.rb
 - lib/glimmer/swt/button_proxy.rb
+- lib/glimmer/swt/checkbox_proxy.rb
 - lib/glimmer/swt/color_proxy.rb
 - lib/glimmer/swt/combo_proxy.rb
 - lib/glimmer/swt/composite_proxy.rb
+- lib/glimmer/swt/custom/checkbox_group.rb
+- lib/glimmer/swt/custom/radio_group.rb
 - lib/glimmer/swt/display_proxy.rb
 - lib/glimmer/swt/event_listener_proxy.rb
 - lib/glimmer/swt/fill_layout_proxy.rb
 - lib/glimmer/swt/font_proxy.rb
 - lib/glimmer/swt/grid_layout_proxy.rb
+- lib/glimmer/swt/group_proxy.rb
 - lib/glimmer/swt/label_proxy.rb
 - lib/glimmer/swt/layout_data_proxy.rb
 - lib/glimmer/swt/layout_proxy.rb
@@ -283,7 +294,9 @@ files:
 - lib/glimmer/swt/message_box_proxy.rb
 - lib/glimmer/swt/point.rb
 - lib/glimmer/swt/property_owner.rb
+- lib/glimmer/swt/radio_proxy.rb
 - lib/glimmer/swt/row_layout_proxy.rb
+- lib/glimmer/swt/scrolled_composite_proxy.rb
 - lib/glimmer/swt/shell_proxy.rb
 - lib/glimmer/swt/style_constantizable.rb
 - lib/glimmer/swt/styled_text_proxy.rb