glimmer-dsl-opal 0.19.1 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 505a28c0305b2de67ee6c7329e17695df9739d5e922881d5a47b32080c1afebd
-  data.tar.gz: df6ede1e94dc15f1723dba789eac315b42cc9ef33160a4ae9031bdb9cd46077b
+  metadata.gz: 167c3eec05fdb361d6e3f28d47ee672ee0e835264da34e017c3f72fbd04ac900
+  data.tar.gz: ae462638ff85959876a28c4ccd69a04ccd6c3bd4ac543428b400ecd8fe5666c9
 SHA512:
-  metadata.gz: ffdde267cad7d55b92f887b71eb511c404bccf7aafa6a9196a0886baf07905535c855016387e394a7ed32a3e322ca31e0bf33fe3e9660de4df0e142a4ed20703
-  data.tar.gz: d319b58fa27fab0a6921a8f86748c71589ba898912de24bc72bad5a8ae9e1f4c7fc9fb2721d77269c3f7e235f2a47faf188c17017ded20d804fc144568292199
+  metadata.gz: c6435a394aaa0d03b39aaebacd4ef7b9bbea9b7ae6cd2f82b5573fc533e5d7ea5c795ee57fb7a70305b4c32f3bf1cfdeeed596387d5e8ac025cc741ab3977ece
+  data.tar.gz: c4dbcc37ac1c17c9ed6438f75940c34cda97194018e4b5dfb98d16354503cd6059cff762c6eaacf5d59c8897183083c50179597b572d5a8ead9241e3474a88e5

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Change Log
 
+## 0.22.0
+
+- Support widget `cursor` attribute
+- Hello, Cursor! sample
+
+## 0.21.0
+
+- Support `scale` widget
+- Hello, Scale!
+- Support `slider` widget
+- Hello, Slider!
+
+## 0.20.1
+
+- Support `spinner` automatic insertion of decimal point when `digits` attribute is specified
+
+## 0.20.0
+
+- Support `spinner` widget (leaving out automatic insertion of decimal point when digits are specified)
+- Hello, Spinner! sample
+
 ## 0.19.1
 
 - Fix widget `font` property support for both `:bold` and `:italic` styles at the same time

data/README.md

@@ -143,7 +143,7 @@ Hello, Table! Game Booked
 
 NOTE: Glimmer DSL for Opal is an alpha project. Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
 
-**Alpha Version** 0.19.1 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
+**Alpha Version** 0.22.0 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
 
 Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
@@ -165,6 +165,7 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
       - [Hello, Combo!](#hello-combo)
       - [Hello, Composite!](#hello-composite)
       - [Hello, Computed!](#hello-computed)
+      - [Hello, Cursor!](#hello-cursor)
       - [Hello, Layout!](#hello-layout)
       - [Hello, List Single Selection!](#hello-list-single-selection)
       - [Hello, List Multi Selection!](#hello-list-multi-selection)
@@ -261,7 +262,7 @@ gem 'opal', '1.0.4'
 gem 'opal-rails', '1.1.2'
 gem 'opal-async', '~> 1.2.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.19.1'
+gem 'glimmer-dsl-opal', '~> 0.22.0'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 
@@ -663,6 +664,32 @@ You should see "Hello, Computed!"
 
 ![Glimmer DSL for Opal Hello Computed](images/glimmer-dsl-opal-hello-computed.png)
 
+#### Hello, Cursor!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_cursor'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Cursor](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-cursor.gif)
+
+Glimmer app on the web (using `glimmer-dsl-opal` gem):
+
+Start the Rails server:
+```
+rails s
+```
+
+Visit `http://localhost:3000`
+
+You should see "Hello, Cursor!"
+
+![Glimmer DSL for Opal Hello Cursor](images/glimmer-dsl-opal-hello-cursor.gif)
+
 #### Hello, Layout!
 
 Add the following require statement to `app/assets/javascripts/application.rb`
@@ -799,6 +826,81 @@ You should see "Hello, Arrow!"
 
 ![Glimmer DSL for Opal Hello Arrow](images/glimmer-dsl-opal-hello-arrow-item-selected.png)
 
+#### Hello, Scale!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_scale'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Scale](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-scale.png)
+
+Glimmer app on the web (using `glimmer-dsl-opal` gem):
+
+Start the Rails server:
+```
+rails s
+```
+
+Visit `http://localhost:3000`
+
+You should see "Hello, Scale!"
+
+![Glimmer DSL for Opal Hello Scale](images/glimmer-dsl-opal-hello-scale.png)
+
+#### Hello, Slider!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_slider'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Slider](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-slider.png)
+
+Glimmer app on the web (using `glimmer-dsl-opal` gem):
+
+Start the Rails server:
+```
+rails s
+```
+
+Visit `http://localhost:3000`
+
+You should see "Hello, Slider!"
+
+![Glimmer DSL for Opal Hello Slider](images/glimmer-dsl-opal-hello-slider.png)
+
+#### Hello, Spinner!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_spinner'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Spinner](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-spinner.png)
+
+Glimmer app on the web (using `glimmer-dsl-opal` gem):
+
+Start the Rails server:
+```
+rails s
+```
+
+Visit `http://localhost:3000`
+
+You should see "Hello, Spinner!"
+
+![Glimmer DSL for Opal Hello Spinner](images/glimmer-dsl-opal-hello-spinner.png)
+
 #### Hello, Browser!
 
 Add the following require statement to `app/assets/javascripts/application.rb`

data/VERSION

@@ -1 +1 @@
-0.19.1
+0.22.0

data/lib/glimmer-dsl-opal/samples/hello/hello_cursor.rb

@@ -0,0 +1,58 @@
+# 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.
+
+class HelloCursor
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :selected_cursor
+  
+  # This method matches the name of the :selected_cursor property by convention
+  def selected_cursor_options
+    Glimmer::SWT::SWTProxy.cursor_options
+  end
+  
+  after_body do
+    observe(self, :selected_cursor) {
+      body_root.cursor = selected_cursor
+    }
+  end
+  
+  body {
+    shell {
+      grid_layout
+      
+      text 'Hello, Cursor!'
+      cursor :wait
+      
+      label {
+        text 'Please select a cursor style and see it change the mouse cursor (varies per platform):'
+        font style: :bold
+        cursor :no
+      }
+      radio_group {
+        grid_layout 5, true
+        selection <=> [self, :selected_cursor]
+      }
+    }
+  }
+end
+
+HelloCursor.launch

data/lib/glimmer-dsl-opal/samples/hello/hello_scale.rb

@@ -0,0 +1,55 @@
+# 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.
+
+class HelloScale
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :value
+  
+  before_body do
+    @value = 50
+  end
+  
+  body {
+    shell {
+      row_layout(:vertical) {
+        fill true
+        center true
+      }
+      
+      text 'Hello, Scale!'
+      
+      label(:center) {
+        text <= [self, :value]
+      }
+      
+      scale { # optionally takes :vertical or :horizontal (default) SWT style
+        minimum 0
+        maximum 100
+        selection <=> [self, :value]
+      }
+        
+    }
+    
+  }
+end
+
+HelloScale.launch

data/lib/glimmer-dsl-opal/samples/hello/hello_slider.rb

@@ -0,0 +1,56 @@
+# 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.
+
+class HelloSlider
+  include Glimmer::UI::CustomShell
+  
+  attr_accessor :value
+  
+  before_body do
+    @value = 50
+  end
+  
+  body {
+    shell {
+      row_layout(:vertical) {
+        fill true
+        center true
+      }
+      
+      text 'Hello, Slider!'
+      
+      label(:center) {
+        text <= [self, :value]
+      }
+      
+      slider { # optionally takes :vertical or :horizontal (default) SWT style
+        minimum 0
+        maximum 110 # leave room for 10 extra (slider stops at 100)
+        page_increment 10 # page increment occurs when clicking area between slider and beginning or end
+        selection <=> [self, :value]
+      }
+        
+    }
+    
+  }
+end
+
+HelloSlider.launch

data/lib/glimmer-dsl-opal/samples/hello/hello_spinner.rb

@@ -0,0 +1,78 @@
+# 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.
+
+class HelloSpinner
+  class Person
+    attr_accessor :donation
+  end
+  
+  include Glimmer::UI::CustomShell
+  
+  before_body do
+    @person = Person.new
+    @person.donation = 500 # in cents
+  end
+  
+  body {
+    shell {
+      grid_layout
+      
+      text 'Hello, Spinner!'
+      
+      label {
+        text 'Please select the amount you would like to donate to the poor:'
+      }
+      
+      composite {
+        grid_layout 3, false
+        
+        label {
+          layout_data {
+            width_hint 240
+          }
+          text 'Amount:'
+          font style: :bold
+        }
+        
+        label {
+          text '$'
+        }
+        
+        spinner {
+          digits 2 # digits after the decimal point
+          minimum 100 # minimum value (including digits after the decimal point)
+          maximum 15000 # maximum value (including digits after the decimal point)
+          increment 500 # increment on up and down (including digits after the decimal point)
+          page_increment 5000 # page increment on page up and page down (including digits after the decimal point)
+          selection <=> [@person, :donation] # selection must be set last if other properties are configured to ensure value is within bounds
+        }
+        
+        label {
+          layout_data(:fill, :center, true, false)
+          text <=> [@person, :donation, on_read: ->(value) { "Thank you for your donation of $#{"%.2f" % (value.to_f / 100.0)}"}]
+        }
+
+      }
+    }
+  }
+end
+
+HelloSpinner.launch

data/lib/glimmer/swt/c_tab_item_proxy.rb

@@ -52,8 +52,8 @@ module Glimmer
       def font=(value)
         @font = value.is_a?(FontProxy) ? value : FontProxy.new(self, value)
         tab_dom_element.css('font-family', @font.name) unless @font.nil?
-        tab_dom_element.css('font-style', 'italic') if @font&.style == :italic || @font&.style&.to_a&.include?(:italic)
-        tab_dom_element.css('font-weight', 'bold') if @font&.style == :bold || @font&.style&.to_a&.include?(:bold)
+        tab_dom_element.css('font-style', 'italic') if @font&.style == :italic || [@font&.style].flatten.compact.include?(:italic)
+        tab_dom_element.css('font-weight', 'bold') if @font&.style == :bold || [@font&.style].flatten.compact.include?(:bold)
         tab_dom_element.css('font-size', "#{@font.height}px") unless @font.nil?
       end
       

data/lib/glimmer/swt/scale_proxy.rb

@@ -0,0 +1,98 @@
+# 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/widget_proxy'
+
+module Glimmer
+  module SWT
+    class ScaleProxy < WidgetProxy
+      attr_reader :selection, :minimum, :maximum, :increment
+    
+      def initialize(parent, args, block)
+        super(parent, args, block)
+        dom_element.slider
+      end
+
+      def selection=(value)
+        old_value = @selection.to_f
+        @selection = value.to_f
+        dom_element.slider('option', 'value', @selection)
+      end
+      alias set_selection selection=
+      
+      def minimum=(value)
+        @minimum = value.to_f
+        dom_element.slider('option', 'min', @minimum)
+      end
+      
+      def maximum=(value)
+        @maximum = value.to_f
+        dom_element.slider('option', 'max', @maximum)
+      end
+      
+      def increment=(value)
+        @increment = value.to_f
+        dom_element.slider('option', 'step', @increment)
+      end
+      
+      def element
+        'div'
+      end
+      
+      def observation_request_to_event_mapping
+        {
+          'on_widget_selected' => [
+            {
+              event: 'change',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  self.selection = dom_element.slider('option', 'value')
+                  event_listener.call(event)
+                }
+              }
+            },
+            {
+              event: 'slidestop',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  self.selection = dom_element.slider('option', 'value')
+                  event_listener.call(event)
+                }
+              }
+            },
+          ],
+        }
+      end
+      
+      def dom
+        scale_selection = @selection
+        scale_id = id
+        scale_style = css
+        scale_class = name
+        options = {type: 'text', id: scale_id, style: scale_style, class: scale_class, value: scale_selection}
+        options = options.merge('disabled': 'disabled') unless @enabled
+        @dom ||= html {
+          div(options)
+        }.to_s
+      end
+    end
+  end
+end

data/lib/glimmer/swt/shell_proxy.rb

@@ -37,6 +37,9 @@ module Glimmer
           height: 100%;
           margin: 0;
         }
+        * {
+          cursor: inherit;
+        }
         .shell {
           height: 100%;
           margin: 0;

data/lib/glimmer/swt/slider_proxy.rb

@@ -0,0 +1,100 @@
+# 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/widget_proxy'
+
+module Glimmer
+  module SWT
+    class SliderProxy < WidgetProxy
+      attr_reader :selection, :minimum, :maximum, :page_increment
+    
+      def initialize(parent, args, block)
+        super(parent, args, block)
+        dom_element.slider
+        self.page_increment = 10 # default page increment
+      end
+
+      def selection=(value)
+        old_value = @selection.to_f
+        @selection = value.to_f
+        dom_element.slider('option', 'value', @selection)
+      end
+      alias set_selection selection=
+      
+      def minimum=(value)
+        @minimum = value.to_f
+        dom_element.slider('option', 'min', @minimum)
+      end
+      
+      def maximum=(value)
+        # being compatible with slider quirk in Glimmer DSL for SWT (does not reach max yet max - 10)
+        @maximum = value.to_f - 10
+        dom_element.slider('option', 'max', @maximum)
+      end
+      
+      def page_increment=(value)
+        @page_increment = value.to_f
+        dom_element.slider('option', 'step', @page_increment)
+      end
+      
+      def element
+        'div'
+      end
+      
+      def observation_request_to_event_mapping
+        {
+          'on_widget_selected' => [
+            {
+              event: 'change',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  self.selection = dom_element.slider('option', 'value')
+                  event_listener.call(event)
+                }
+              }
+            },
+            {
+              event: 'slidestop',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  self.selection = dom_element.slider('option', 'value')
+                  event_listener.call(event)
+                }
+              }
+            },
+          ],
+        }
+      end
+      
+      def dom
+        slider_selection = @selection
+        slider_id = id
+        slider_style = css
+        slider_class = name
+        options = {type: 'text', id: slider_id, style: slider_style, class: slider_class, value: slider_selection}
+        options = options.merge('disabled': 'disabled') unless @enabled
+        @dom ||= html {
+          div(options)
+        }.to_s
+      end
+    end
+  end
+end

data/lib/glimmer/swt/spinner_proxy.rb

@@ -0,0 +1,211 @@
+# 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/widget_proxy'
+
+module Glimmer
+  module SWT
+    class SpinnerProxy < WidgetProxy
+      attr_reader :minimum, :maximum, :increment, :page_increment, :digits
+    
+      def initialize(parent, args, block)
+        super(parent, args, block)
+        @increment = 1
+        @digits = 0
+        dom_element.spinner
+      end
+
+      def selection=(value, format_digits: true)
+        old_value = @selection.to_f
+        if @selection.nil?
+          @selection = value.to_f / divider
+        else
+          @selection = value.to_f
+        end
+        if value.to_i != old_value.to_i
+          if format_digits && @digits.to_i > 0
+            new_value = "%0.#{@digits.to_i}f" % @selection
+            dom_element.value = new_value
+          else
+            dom_element.value = @selection if @selection != 0
+          end
+        end
+      end
+      alias set_selection selection=
+      
+      def selection
+        @selection && @selection * divider
+      end
+      
+      def text=(value)
+        self.selection = value.to_f
+      end
+      
+      def text
+        self.selection.to_s
+      end
+      
+      def minimum=(value)
+        @minimum = value.to_f / divider
+        dom_element.spinner('option', 'min', @minimum)
+      end
+      
+      def maximum=(value)
+        @maximum = value.to_f / divider
+        dom_element.spinner('option', 'max', @maximum)
+      end
+      
+      def increment=(value)
+        @increment = value.to_f / divider
+        dom_element.spinner('option', 'step', @increment)
+      end
+      
+      def page_increment=(value)
+        @page_increment = value.to_f / (@increment * divider)
+        dom_element.spinner('option', 'page', @page_increment)
+      end
+      
+      def divider
+        ('1' + '0'*@digits.to_i).to_f
+      end
+      
+      def digits=(value)
+        @digits = value
+        dom_element.spinner('option', 'numberFormat', "n") if @digits.to_i > 0
+      end
+      
+      def element
+        'input'
+      end
+      
+      def observation_request_to_event_mapping
+        {
+          'on_widget_selected' => [
+            {
+              event: 'change',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  self.selection = event.target.value
+                  event_listener.call(event)
+                }
+              }
+            },
+            {
+              event: 'keyup',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  @keyup = true # ensures spinstop event does not set selection if caused by key up entry
+                }
+              }
+            },
+            {
+              event: 'spin',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  @keyup = false
+                }
+              }
+            },
+            {
+              event: 'spinstop',
+              event_handler: -> (event_listener) {
+                -> (event) {
+                  self.set_selection(event.target.value, format_digits: !@keyup)
+                  @keyup = false
+                  event_listener.call(event)
+                }
+              }
+            },
+          ],
+          'on_modify_text' => {
+            event: 'keyup',
+            event_handler: -> (event_listener) {
+              -> (event) {
+                # TODO consider unifying this event handler with on_key_pressed by relying on its result instead of hooking another keyup event
+                if @last_key_pressed_event.nil? || @last_key_pressed_event.doit
+                  self.text = event.target.value
+                  event_listener.call(event)
+                else
+                  # TODO Fix doit false, it's not stopping input
+                  event.prevent
+                  event.prevent_default
+                  event.stop_propagation
+                  event.stop_immediate_propagation
+                end
+              }
+            }
+          },
+          'on_key_pressed' => {
+            event: 'keydown',
+            event_handler: -> (event_listener) {
+              -> (event) {
+                @last_key_pressed_event = event
+                self.text = event.target.value
+                # 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(:keyCode) {event.which}
+                event.define_singleton_method(:key_code, &event.method(:keyCode))
+                event.define_singleton_method(:character) {event.which.chr}
+                event.define_singleton_method(:stateMask) do
+                  state_mask = 0
+                  state_mask |= SWTProxy[:alt] if event.alt_key
+                  state_mask |= SWTProxy[:ctrl] if event.ctrl_key
+                  state_mask |= SWTProxy[:shift] if event.shift_key
+                  state_mask |= SWTProxy[:command] if event.meta_key
+                  state_mask
+                end
+                event.define_singleton_method(:state_mask, &event.method(:stateMask))
+                doit = true
+                event.define_singleton_method(:doit=) do |value|
+                  doit = value
+                end
+                event.define_singleton_method(:doit) { doit }
+                event_listener.call(event)
+                
+                  # TODO Fix doit false, it's not stopping input
+                unless doit
+                  event.prevent
+                  event.prevent_default
+                  event.stop_propagation
+                  event.stop_immediate_propagation
+                end
+                
+                doit
+              }
+            }
+          },
+        }
+      end
+      
+      def dom
+        text_text = @text
+        text_id = id
+        text_style = css
+        text_class = name
+        options = {type: 'text', id: text_id, style: text_style, class: text_class, value: text_text, style: 'min-width: 27px;'}
+        options = options.merge('disabled': 'disabled') unless @enabled
+        @dom ||= html {
+          input(options)
+        }.to_s
+      end
+    end
+  end
+end

data/lib/glimmer/swt/swt_proxy.rb

@@ -1,5 +1,5 @@
 # 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
@@ -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
@@ -27,8 +27,8 @@ module Glimmer
     # Proxy for org.eclipse.swt.SWT
     #
     # Follows the Proxy Design Pattern
-    class SWTProxy            
-      include StyleConstantizable      
+    class SWTProxy
+      include StyleConstantizable
 
       class << self
         def constant_source_class
@@ -42,12 +42,16 @@ module Glimmer
         def extra_styles
           EXTRA_STYLES
         end
+        
+        def cursor_options
+          [:wait, :sizenwse, :appstarting, :no, :sizenesw, :sizeall, :help, :sizee, :sizewe, :sizen, :sizes, :sizew, :cross, :sizese, :ibeam, :arrow, :sizesw, :uparrow, :hand, :sizenw, :sizene, :sizens]
+        end
       end
       
       EXTRA_STYLES = {
         NO_RESIZE: self[:shell_trim, :resize!, :max!],
         NO_SORT: -7,
-      }            
+      }
     end
   end
 end

data/lib/glimmer/swt/text_proxy.rb

@@ -81,7 +81,6 @@ module Glimmer
         text_id = id
         text_style = css
         text_class = name
-        # TODO support password field
         options = {type: 'text', id: text_id, style: text_style, class: text_class, value: text_text, style: 'min-width: 27px;'}
         options = options.merge('disabled': 'disabled') unless @enabled
         options = options.merge(type: 'password') if has_style?(:password)

data/lib/glimmer/swt/widget_proxy.rb

@@ -31,7 +31,32 @@ module Glimmer
       include Glimmer
       include PropertyOwner
       
-      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font, :focus, :disposed?, :rendered
+      SWT_CURSOR_TO_CSS_CURSOR_MAP = {
+        wait: 'wait',
+        sizenwse: 'nwse-resize',
+        appstarting: 'progress',
+        no: 'no-drop',
+        sizenesw: 'nesw-resize',
+        sizeall: 'all-scroll',
+        help: 'help',
+        sizee: 'e-resize',
+        sizewe: 'ew-resize',
+        sizen: 'n-resize',
+        sizes: 's-resize',
+        sizew: 'w-resize',
+        cross: 'crosshair',
+        sizese: 'se-resize',
+        ibeam: 'text',
+        arrow: 'default',
+        sizesw: 'sw-resize',
+        uparrow: 'alias',
+        hand: 'grab',
+        sizenw: 'nw-resize',
+        sizene: 'ne-resize',
+        sizens: 'ns-resize',
+      }
+      
+      attr_reader :parent, :args, :path, :children, :enabled, :foreground, :background, :font, :focus, :disposed?, :rendered, :cursor
       attr_accessor :menu, :menu_requested, :menu_x, :menu_y
       alias isDisposed disposed?
       alias is_disposed disposed?
@@ -237,11 +262,16 @@ 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 || @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-style', 'italic') if @font&.style == :italic || [@font&.style].flatten.compact.include?(:italic)
+        dom_element.css('font-weight', 'bold') if @font&.style == :bold || [@font&.style].flatten.compact.include?(:bold)
         dom_element.css('font-size', "#{@font.height}px") unless @font.nil?
       end
       
+      def cursor=(value)
+        @cursor = value
+        dom_element.css('cursor', css_cursor)
+      end
+      
       def focus=(value)
         @focus = value
         dom_element.focus # TODO consider if a delay or async_exec is needed here
@@ -851,6 +881,27 @@ module Glimmer
 #               }
 #             end,
 #           },
+          ScaleProxy => {
+            :selection => lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(selection)
+              }
+            end
+          },
+          SliderProxy => {
+            :selection => lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(selection)
+              }
+            end
+          },
+          SpinnerProxy => {
+            :selection => lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(selection)
+              }
+            end
+          },
           TextProxy => {
             :text => lambda do |observer|
               on_modify_text { |modify_event|
@@ -943,17 +994,16 @@ module Glimmer
 #                 observer.call(getSelection)
 #               }
 #             end
-#           },
-#           Java::OrgEclipseSwtWidgets::Spinner => {
-#             :selection => lambda do |observer|
-#               on_widget_selected { |selection_event|
-#                 observer.call(getSelection)
-#               }
-#             end
 #           },
         }
       end
       
+      private
+      
+      def css_cursor
+        SWT_CURSOR_TO_CSS_CURSOR_MAP[@cursor]
+      end
+      
     end
   end
 end
@@ -983,7 +1033,10 @@ require 'glimmer/swt/table_item_proxy'
 require 'glimmer/swt/table_proxy'
 require 'glimmer/swt/text_proxy'
 require 'glimmer/swt/radio_proxy'
+require 'glimmer/swt/scale_proxy'
 require 'glimmer/swt/scrolled_composite_proxy'
+require 'glimmer/swt/slider_proxy'
+require 'glimmer/swt/spinner_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.19.1
+  version: 0.22.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-15 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -294,6 +294,7 @@ files:
 - lib/glimmer-dsl-opal/samples/hello/hello_combo.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_composite.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_computed.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_cursor.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_date_time.rb
@@ -307,6 +308,9 @@ files:
 - lib/glimmer-dsl-opal/samples/hello/hello_pop_up_context_menu.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_scale.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_slider.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_spinner.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_tab.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_table.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_table/baseball_park.png
@@ -418,8 +422,11 @@ files:
 - lib/glimmer/swt/property_owner.rb
 - lib/glimmer/swt/radio_proxy.rb
 - lib/glimmer/swt/row_layout_proxy.rb
+- lib/glimmer/swt/scale_proxy.rb
 - lib/glimmer/swt/scrolled_composite_proxy.rb
 - lib/glimmer/swt/shell_proxy.rb
+- lib/glimmer/swt/slider_proxy.rb
+- lib/glimmer/swt/spinner_proxy.rb
 - lib/glimmer/swt/style_constantizable.rb
 - lib/glimmer/swt/styled_text_proxy.rb
 - lib/glimmer/swt/swt_proxy.rb