glimmer-dsl-opal 0.16.2 → 0.19.1

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -1,10 +1,31 @@
+# Copyright (c) 2020-2021 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/swt/composite_proxy'
 
 module Glimmer
   module SWT
     class TabItemProxy < CompositeProxy
       include Glimmer
-      attr_reader :text, :content_visible
+      attr_reader :text, :content_visible, :tool_tip_text, :image
       
       def initialize(parent, args, block)
         super(parent, args, block)
@@ -30,7 +51,33 @@ module Glimmer
     
       def text=(value)
         @text = value
-        tab_dom_element.html(@text)
+        tab_dom_element.find('span').html(@text)
+      end
+      
+      def image=(value)
+        @image = value
+        if @image.is_a?(String)
+          tab_dom_element.find('img').attr('src', @image)
+          tab_dom_element.find('img').css('padding-right', '5px')
+        end
+      end
+      
+      def tool_tip_text=(value)
+        @tool_tip_text = value
+        tab_dom_element.attr('title', @tool_tip_text) if !@tool_tip_text.to_s.empty?
+      end
+      
+      def dispose
+        tab_index = parent.children.to_a.index(self)
+        tab_dom_element.remove
+        super
+        if @content_visible
+          @content_visible = false
+          parent.hide_all_tab_content
+          tab_to_show = parent.children.to_a[tab_index]
+          tab_to_show ||= parent.children.to_a[tab_index - 1]
+          tab_to_show&.show
+        end
       end
     
       def selector
@@ -64,8 +111,9 @@ module Glimmer
       # This contains the clickable tab area with tab names
       def tab_dom
         @tab_dom ||= html {
-          button(id: tab_id, class: "tab") {
-            @text
+          a(href: '#', id: tab_id, class: "tab") {
+            img {}
+            span { @text }
           }
         }.to_s
       end

data/lib/glimmer/swt/widget_proxy.rb

@@ -31,8 +31,8 @@ module Glimmer
       include Glimmer
       include PropertyOwner
       
-      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font, :focus, :disposed?, :rendered, :menu_requested
-      attr_accessor :menu
+      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font, :focus, :disposed?, :rendered
+      attr_accessor :menu, :menu_requested, :menu_x, :menu_y
       alias isDisposed disposed?
       alias is_disposed disposed?
       alias rendered? rendered
@@ -112,6 +112,7 @@ module Glimmer
         @parent = parent
         @args = args
         @block = block
+        # TODO consider changing children to an array (why is it a Set if order matters?)
         @children = Set.new # TODO consider moving to composite
         @enabled = true
         @data = {}
@@ -133,17 +134,16 @@ module Glimmer
       # Executes at the closing of a parent widget curly braces after all children/properties have been added/set
       def post_add_content
         if !menu.nil? && !is_a?(MenuProxy) && !is_a?(MenuItemProxy)
-          on_mouse_down { |mouse_event|
+          # TODO consider in the future retaining listener registrations to deregister on unsetting of the menu
+          on_mouse_move do |mouse_event|
+            self.menu_x = mouse_event.x
+            self.menu_y = mouse_event.y
+          end
+          on_mouse_down do |mouse_event|
             if mouse_event.button == 3 # right-click
-              @menu_requested = true
-              dom_element.css('position', 'relative')
-              menu&.render
-              menu.dom_element.css('position', 'absolute')
-              menu.dom_element.css('left', mouse_event.x - parent.get_layout&.margin_width.to_i) # TODO - parent.get_layout&.margin_left.to_i)
-              menu.dom_element.css('top', mouse_event.y - parent.get_layout&.margin_height.to_i - 5) # TODO - parent.get_layout&.margin_top.to_i)
-              @menu_requested = false
+              menu.visible = true
             end
-          }
+          end
         end
       end
       
@@ -237,8 +237,8 @@ module Glimmer
       def font=(value)
         @font = value.is_a?(FontProxy) ? value : FontProxy.new(self, value)
         dom_element.css('font-family', @font.name) unless @font.nil?
-        dom_element.css('font-style', 'italic') if @font&.style == :italic
-        dom_element.css('font-weight', 'bold') if @font&.style == :bold
+        dom_element.css('font-style', 'italic') if @font&.style == :italic || @font&.style&.to_a&.include?(:italic)
+        dom_element.css('font-weight', 'bold') if @font&.style == :bold || @font&.style&.to_a&.include?(:bold)
         dom_element.css('font-size', "#{@font.height}px") unless @font.nil?
       end
       
@@ -321,10 +321,12 @@ module Glimmer
       end
       
       def default_observation_request_to_event_mapping
+        myself = self
         mouse_event_handler = -> (event_listener) {
           -> (event) {
             # TODO generalize this solution to all widgets that support key presses
             # TODO support event.location once DOM3 is supported by opal-jquery
+            event.define_singleton_method(:widget) {myself}
             event.define_singleton_method(:button, &event.method(:which))
             event.define_singleton_method(:count) {1} # TODO support double-click count of 2 in the future by using ondblclick
             event.define_singleton_method(:x, &event.method(:page_x))
@@ -345,6 +347,31 @@ module Glimmer
 #               event.prevent
 #               event.stop
 #               event.stop_immediate
+#             end
+          }
+        }
+        mouse_move_event_handler = -> (event_listener) {
+          -> (event) {
+            # TODO generalize this solution to all widgets that support key presses
+            # TODO support event.location once DOM3 is supported by opal-jquery
+            event.define_singleton_method(:widget) {myself}
+            event.define_singleton_method(:button, &event.method(:which))
+            event.define_singleton_method(:count) {1} # TODO support double-click count of 2 in the future by using ondblclick
+            event.define_singleton_method(:x, &event.method(:page_x))
+            event.define_singleton_method(:y, &event.method(:page_y))
+            doit = true
+            event.define_singleton_method(:doit=) do |value|
+              doit = value
+            end
+            event.define_singleton_method(:doit) { doit }
+            
+            event_listener.call(event)
+            
+            # TODO Imlement doit properly for all different kinds of events
+#             unless doit
+#               event.prevent
+#               event.stop
+#               event.stop_immediate
 #             end
           }
         }
@@ -352,6 +379,7 @@ module Glimmer
           -> (event) {
             # TODO generalize this solution to all widgets that support key presses
             # TODO support event.location once DOM3 is supported by opal-jquery
+            event.define_singleton_method(:widget) {myself}
             event.define_singleton_method(:button, &event.method(:which))
             event.define_singleton_method(:count) {1} # TODO support double-click count of 2 in the future by using ondblclick
             event.define_singleton_method(:x, &event.method(:page_x))
@@ -366,7 +394,6 @@ module Glimmer
               event.prevent
               event_listener.call(event)
             end
-            
             # TODO Imlement doit properly for all different kinds of events
 #             unless doit
 #               event.prevent
@@ -382,6 +409,12 @@ module Glimmer
           'on_focus_lost' => {
             event: 'blur',
           },
+          'on_mouse_move' => [
+            {
+              event: 'mousemove',
+              event_handler: mouse_move_event_handler,
+            },
+          ],
           'on_mouse_up' => [
             {
               event: 'mouseup',
@@ -428,6 +461,7 @@ module Glimmer
               -> (event) {
                 # TODO generalize this solution to all widgets that support key presses
                 # TODO support event.location once DOM3 is supported by opal-jquery
+                event.define_singleton_method(:widget) {myself}
                 event.define_singleton_method(:keyCode) {event.which}
                 event.define_singleton_method(:key_code, &event.method(:keyCode))
                 event.define_singleton_method(:character) {event.which.chr}
@@ -464,6 +498,7 @@ module Glimmer
               -> (event) {
                 # TODO generalize this solution to all widgets that support key presses
                 # TODO support event.location once DOM3 is supported by opal-jquery
+                event.define_singleton_method(:widget) {myself}
                 event.define_singleton_method(:keyCode) {event.which}
                 event.define_singleton_method(:key_code, &event.method(:keyCode))
                 event.define_singleton_method(:character) {event.which.chr}
@@ -500,6 +535,7 @@ module Glimmer
               -> (event) {
                 # TODO generalize this solution to all widgets that support key presses
                 # TODO support event.location once DOM3 is supported by opal-jquery
+                event.define_singleton_method(:widget) {myself}
                 event.define_singleton_method(:keyCode) {event.which}
                 event.define_singleton_method(:key_code, &event.method(:keyCode))
                 event.define_singleton_method(:character) {event.which.chr}
@@ -536,6 +572,7 @@ module Glimmer
               -> (event) {
                 # TODO generalize this solution to all widgets that support key presses
                 # TODO support event.location once DOM3 is supported by opal-jquery
+                event.define_singleton_method(:widget) {myself}
                 event.define_singleton_method(:keyCode) {event.which}
                 event.define_singleton_method(:key_code, &event.method(:keyCode))
                 event.define_singleton_method(:character) {event.which.chr}
@@ -924,7 +961,9 @@ end
 require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/browser_proxy'
 require 'glimmer/swt/button_proxy'
+require 'glimmer/swt/arrow_proxy'
 require 'glimmer/swt/combo_proxy'
+require 'glimmer/swt/c_combo_proxy'
 require 'glimmer/swt/checkbox_proxy'
 require 'glimmer/swt/composite_proxy'
 require 'glimmer/swt/dialog_proxy'
@@ -937,6 +976,8 @@ require 'glimmer/swt/menu_proxy'
 require 'glimmer/swt/radio_proxy'
 require 'glimmer/swt/tab_folder_proxy'
 require 'glimmer/swt/tab_item_proxy'
+require 'glimmer/swt/c_tab_folder_proxy'
+require 'glimmer/swt/c_tab_item_proxy'
 require 'glimmer/swt/table_column_proxy'
 require 'glimmer/swt/table_item_proxy'
 require 'glimmer/swt/table_proxy'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.19.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2021-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -284,8 +284,11 @@ 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/elaborate/weather.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_arrow.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_browser.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_button.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_c_combo.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_c_tab.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
@@ -308,6 +311,15 @@ files:
 - lib/glimmer-dsl-opal/samples/hello/hello_table.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_table/baseball_park.png
 - lib/glimmer-dsl-opal/samples/hello/hello_world.rb
+- lib/glimmer-dsl-opal/samples/hello/images/denmark.png
+- lib/glimmer-dsl-opal/samples/hello/images/finland.png
+- lib/glimmer-dsl-opal/samples/hello/images/france.png
+- lib/glimmer-dsl-opal/samples/hello/images/germany.png
+- lib/glimmer-dsl-opal/samples/hello/images/italy.png
+- lib/glimmer-dsl-opal/samples/hello/images/mexico.png
+- lib/glimmer-dsl-opal/samples/hello/images/netherlands.png
+- lib/glimmer-dsl-opal/samples/hello/images/norway.png
+- lib/glimmer-dsl-opal/samples/hello/images/usa.png
 - lib/glimmer-dsl-opal/vendor/jquery-ui-timepicker/GPL-LICENSE.txt
 - lib/glimmer-dsl-opal/vendor/jquery-ui-timepicker/MIT-LICENSE.txt
 - lib/glimmer-dsl-opal/vendor/jquery-ui-timepicker/jquery.ui.timepicker.css
@@ -370,8 +382,12 @@ files:
 - lib/glimmer/dsl/opal/widget_listener_expression.rb
 - lib/glimmer/engine.rb
 - lib/glimmer/swt.rb
+- lib/glimmer/swt/arrow_proxy.rb
 - lib/glimmer/swt/browser_proxy.rb
 - lib/glimmer/swt/button_proxy.rb
+- lib/glimmer/swt/c_combo_proxy.rb
+- lib/glimmer/swt/c_tab_folder_proxy.rb
+- lib/glimmer/swt/c_tab_item_proxy.rb
 - lib/glimmer/swt/checkbox_proxy.rb
 - lib/glimmer/swt/color_proxy.rb
 - lib/glimmer/swt/combo_proxy.rb