glimmer-dsl-opal 0.23.0 → 0.25.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97154ebca855643dd407d82d30a6d7e127814fe5365bec2020a9f5ac14a20fbf
-  data.tar.gz: bc7dc89a573bff5406666a6b59ecf8cfc623493f6f680190ce42655236f79dec
+  metadata.gz: 98f731b5aabef981ca377d64bbd87ca7a86a5f8edd4d0de428c81aeabe8680bf
+  data.tar.gz: 7f7cc811ff007c65a15749a53e4b51b5ae194ffc06714d7e07c101d2c40c5484
 SHA512:
-  metadata.gz: 65032ea2c5274c6d4b168225d321dbeb586084d7af987cd06fdc8f5cd9f640b7d1aabb5bb46de18c18b7e36116b337dacb39cfd48ac7a98afbd18a2c6cd666ef
-  data.tar.gz: 2d663340cc508c4a7c20b4dfd7878ef52c2084868921610d07a2765b9a62e28902b1f2b4c4959f8b18e5ccbe7efe9152d848b588a795a9cfea9f1b9a7c281e6e
+  metadata.gz: c71b8149524cbcd0b44319f24eb22e50476a6891cf479245d2632c3a367b97828b8197132092d0dd1389b5b79e7bf1e3a2abb5b787ad18d62655663252645fce
+  data.tar.gz: 18328ff77046a9fa0fd42abffd15c9251c0a9eed4886071c048fcd2320c1828d7033237cc76abbb2548e52cdb3c4d5ed3f3e235eca66af2a49c8eadca6b0d20c

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change Log
 
+## 0.25.2
+
+- Fix sizing of buttons with font height specified to fit text
+
+## 0.25.1
+
+- Support `progress_bar` `:vertical` SWT style
+- Add `progress_bar` `:vertical` SWT style to Hello, Progress Bar!
+
+## 0.25.0
+
+- Support `progress_bar` widget without `:vertical` SWT style support
+- Hello, Progress Bar! sample without `:vertical` SWT style
+
+## 0.24.0
+
+- `widget#print` method
+- Hello, Print! sample
+
 ## 0.23.0
 
 - Hello, Label! sample

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.23.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))
+**Alpha Version** 0.25.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))
 
 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)
@@ -187,6 +187,8 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
       - [Hello, Arrow!](#hello-arrow)
       - [Hello, Message Box!](#hello-message-box)
       - [Hello, Pop Up Context Menu!](#hello-pop-up-context-menu)
+      - [Hello, Print!](#hello-print)
+      - [Hello, Progress Bar!](#hello-progress-bar)
       - [Hello, Menu Bar!](#hello-menu-bar)
       - [Hello, Dialog!](#hello-dialog)
     - [Elaborate Samples](#elaborate-samples)
@@ -262,9 +264,9 @@ Add the following to `Gemfile`:
 ```
 gem 'opal', '1.0.4'
 gem 'opal-rails', '1.1.2'
-gem 'opal-async', '~> 1.2.0'
+gem 'opal-async', '~> 1.3.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.23.0'
+gem 'glimmer-dsl-opal', '~> 0.25.1'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 
@@ -472,9 +474,9 @@ class HelloCombo
 
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {
@@ -578,13 +580,13 @@ class HelloComputed
 
   include Glimmer::UI::CustomShell
 
-  before_body {
+  before_body do
     @contact = Contact.new(
       first_name: 'Barry',
       last_name: 'McKibbin',
       year_of_birth: 1985
     )
-  }
+  end
 
   body {
     shell {
@@ -600,51 +602,43 @@ class HelloComputed
         
         label {text 'First &Name: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :first_name]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text '&Last Name: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :last_name]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text '&Year of Birth: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :year_of_birth]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text 'Name: '}
         label {
+          fill_horizontally_layout_data
           text <= [@contact, :name, computed_by: [:first_name, :last_name]]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text 'Age: '}
         label {
+          fill_horizontally_layout_data
           text <= [@contact, :age, on_write: :to_i, computed_by: [:year_of_birth]]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
       }
     }
   }
+  
+  def fill_horizontally_layout_data
+    layout_data {
+      horizontal_alignment :fill
+      grab_excess_horizontal_space true
+    }
+  end
 end
 
 HelloComputed.launch
@@ -1841,6 +1835,54 @@ You should see "Hello, Message Box!"
 ![Glimmer DSL for Opal Hello Message Box](images/glimmer-dsl-opal-hello-message-box.png)
 ![Glimmer DSL for Opal Hello Message Box Dialog](images/glimmer-dsl-opal-hello-message-box-dialog.png)
 
+#### Hello, Print!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_print'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Print](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-print.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, Print!"
+
+#### Hello, Progress Bar!
+
+Add the following require statement to `app/assets/javascripts/application.rb`
+
+```ruby
+require 'glimmer-dsl-opal/samples/hello/hello_progress_bar'
+```
+
+Glimmer app on the desktop (using [`glimmer-dsl-swt`](https://github.com/AndyObtiva/glimmer-dsl-swt) gem):
+
+![Glimmer DSL for SWT Hello Progress Bar](https://github.com/AndyObtiva/glimmer-dsl-swt/raw/master/images/glimmer-hello-progress-bar.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, Progress Bar!"
+
+![Glimmer DSL for Opal Hello Progress Bar](https://github.com/AndyObtiva/glimmer-dsl-opal/raw/master/images/glimmer-dsl-opal-hello-progress-bar.gif)
+
 #### Hello, Pop Up Context Menu!
 
 Add the following require statement to `app/assets/javascripts/application.rb`

data/VERSION

@@ -1 +1 @@
-0.23.0
+0.25.2

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

@@ -35,9 +35,9 @@ class HelloCombo
 
   include Glimmer::UI::CustomShell
   
-  before_body {
+  before_body do
     @person = Person.new
-  }
+  end
   
   body {
     shell {

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

@@ -42,13 +42,13 @@ class HelloComputed
 
   include Glimmer::UI::CustomShell
 
-  before_body {
+  before_body do
     @contact = Contact.new(
       first_name: 'Barry',
       last_name: 'McKibbin',
       year_of_birth: 1985
     )
-  }
+  end
 
   body {
     shell {
@@ -64,51 +64,43 @@ class HelloComputed
         
         label {text 'First &Name: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :first_name]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text '&Last Name: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :last_name]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text '&Year of Birth: '}
         text {
+          fill_horizontally_layout_data
           text <=> [@contact, :year_of_birth]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text 'Name: '}
         label {
+          fill_horizontally_layout_data
           text <= [@contact, :name, computed_by: [:first_name, :last_name]]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
         
         label {text 'Age: '}
         label {
+          fill_horizontally_layout_data
           text <= [@contact, :age, on_write: :to_i, computed_by: [:year_of_birth]]
-          layout_data {
-            horizontal_alignment :fill
-            grab_excess_horizontal_space true
-          }
         }
       }
     }
   }
+  
+  def fill_horizontally_layout_data
+    layout_data {
+      horizontal_alignment :fill
+      grab_excess_horizontal_space true
+    }
+  end
 end
 
 HelloComputed.launch

data/lib/glimmer-dsl-opal/samples/hello/hello_print.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 HelloPrint
+  include Glimmer::UI::CustomShell
+  
+  body {
+    shell {
+      text 'Hello, Print!'
+      @composite = composite {
+        row_layout(:vertical) {
+          fill true
+          center true
+        }
+        
+        label(:center) {
+          text "Whatever you see inside the app composite\nwill get printed when clicking the Print button."
+          font height: 16
+        }
+         
+        button {
+          text 'Print'
+          
+          on_widget_selected do
+            # Unlike the SWT version, Opal's print always prints the entire window no matter what widget
+            # the print method is invoked from
+            unless @composite.print
+              message_box {
+                text 'Unable To Print'
+                message 'Sorry! Printing is not supported on this platform!'
+              }.open
+            end
+          end
+        }
+      }
+    }
+  }
+end
+
+HelloPrint.launch

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

@@ -0,0 +1,126 @@
+# 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 HelloProgressBar
+  include Glimmer::UI::CustomShell
+  
+  class ProgressModel
+    attr_accessor :minimum, :maximum, :selection, :delay
+  end
+        
+  before_body do
+    @progress_model = ProgressModel.new
+    @progress_model.minimum = 0
+    @progress_model.maximum = 100
+    @progress_model.selection = 0
+    @progress_model.delay = 0.01
+  end
+
+  body {
+    shell {
+      grid_layout(4, true)
+      
+      text 'Hello, Progress Bar!'
+      
+      progress_bar(:indeterminate) {
+        layout_data(:fill, :center, true, false) {
+          horizontal_span 4
+        }
+      }
+      
+      label {
+        text 'Minimum'
+      }
+      
+      label {
+        text 'Maximum'
+      }
+      
+      label {
+        text 'Selection'
+      }
+      
+      label {
+        text 'Delay in Seconds'
+      }
+      
+      spinner {
+        selection <=> [@progress_model, :minimum]
+      }
+      
+      spinner {
+        selection <=> [@progress_model, :maximum]
+      }
+      
+      spinner {
+        selection <=> [@progress_model, :selection]
+      }
+        
+      spinner {
+        digits 2
+        minimum 1
+        maximum 200
+        selection <=> [@progress_model, :delay, on_read: ->(v) {v.to_f*100.0}, on_write: ->(v) {v.to_f/100.0}]
+      }
+          
+      progress_bar {
+        layout_data(:fill, :center, true, false) {
+          horizontal_span 4
+        }
+        minimum <= [@progress_model, :minimum]
+        maximum <= [@progress_model, :maximum]
+        selection <= [@progress_model, :selection]
+      }
+      
+      # :vertical SWT style is unsupported for now
+      progress_bar(:vertical) {
+        layout_data(:fill, :center, true, false) {
+          horizontal_span 4
+        }
+        minimum <= [@progress_model, :minimum]
+        maximum <= [@progress_model, :maximum]
+        selection <= [@progress_model, :selection]
+      }
+      
+      button {
+        layout_data(:fill, :center, true, false) {
+          horizontal_span 4
+        }
+        text "Start"
+        
+        on_widget_selected do
+          # if a previous thread is running, then kill first
+          # (killing is not dangerous since it is only a thread about updating progress)
+          @current_thread&.kill
+          @current_thread = Thread.new do
+            @progress_model.selection = @progress_model.minimum
+            (@progress_model.minimum..@progress_model.maximum).to_a.each do |n|
+              @progress_model.selection = n
+              sleep(@progress_model.delay)
+            end
+          end
+        end
+      }
+    }
+  }
+end
+
+HelloProgressBar.launch

data/lib/glimmer/swt/button_proxy.rb

@@ -47,6 +47,11 @@ module Glimmer
         dom_element.html(@text)
       end
       
+      def font=(value)
+        super(value)
+        dom_element.css('height', @font.height + 10) if @font&.height
+      end
+      
       def element
         'button'
       end

data/lib/glimmer/swt/fill_layout_proxy.rb

@@ -11,8 +11,8 @@ module Glimmer
         }
         
         .fill-layout > * {
-          width: 100%;
-          height: 100%;
+          width: 100% !important;
+          height: 100% !important;
         }
         
         .fill-layout-horizontal {

data/lib/glimmer/swt/progress_bar_proxy.rb

@@ -0,0 +1,105 @@
+# 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 ProgressBarProxy < WidgetProxy
+      STYLE = <<~CSS
+        .ui-progressbar.vertical {
+          transform: rotate(-180deg);
+          height: 140px;
+          width: 28px;
+          margin-left: auto;
+          margin-right: auto;
+        }
+      CSS
+      
+      attr_reader :vertical, :indeterminate, :maximum, :selection
+      attr_accessor :state, :minimum #ignored, only there for API compatibility
+      alias vertical? vertical
+      alias indeterminate? indeterminate
+      
+      def initialize(parent, args, block)
+        @vertical = args.detect { |arg| SWTProxy[arg] == SWTProxy[:vertical] }
+        @indeterminate = args.detect { |arg| SWTProxy[arg] == SWTProxy[:indeterminate] }
+        super(parent, args, block)
+        # initialize manually if vertical
+        dom_element.progressbar if horizontal?
+        self.minimum = 0
+        self.selection = false if indeterminate?
+      end
+      
+      def horizontal
+        !vertical
+      end
+      alias horizontal? horizontal
+      
+      def minimum=(value)
+        @minimum = value
+        # re-update maximum and selection since they depend on minimum
+        self.maximum = @maximum if @maximum
+        self.selection = @selection if @selection
+      end
+      
+      def maximum=(value)
+        @maximum = value
+        if horizontal?
+          dom_element.progressbar('option', 'max', @maximum - @minimum)
+        end
+      end
+      
+      def selection=(selection_value)
+        @selection = selection_value
+        if horizontal?
+          value = @selection ? (@selection - @minimum) : @selection
+          dom_element.progressbar('option', 'value', value)
+        else
+          value = ((@selection - @minimum) / (@maximum - @minimum)) * 100
+          selection_dom_element.css('height', "#{value}%")
+        end
+      end
+
+      def element
+        'div'
+      end
+      
+      def selection_dom_element
+        dom_element.find('.ui-progressbar-value')
+      end
+      
+      def dom
+        progress_bar_id = id
+        progress_bar_class = name
+        progress_bar_class += ' vertical ui-progressbar ui-corner-all ui-widget ui-widget-content' if vertical?
+        progress_bar_class += ' indeterminate' if indeterminate?
+        @dom ||= html {
+          div(id: progress_bar_id, class: progress_bar_class) {
+            if vertical?
+              div(class: 'ui-progressbar-value ui-corner-left ui-widget-header', style: 'height: 0%;')
+            end
+          }
+        }.to_s
+      end
+    end
+  end
+end

data/lib/glimmer/swt/widget_proxy.rb

@@ -241,6 +241,11 @@ module Glimmer
       def dialog_ancestor
         parents.detect {|p| p.is_a?(DialogProxy)}
       end
+      
+      def print
+        `window.print()`
+        true
+      end
 
       def enabled=(value)
         @enabled = value
@@ -1032,6 +1037,7 @@ 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/progress_bar_proxy'
 require 'glimmer/swt/radio_proxy'
 require 'glimmer/swt/scale_proxy'
 require 'glimmer/swt/scrolled_composite_proxy'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.25.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: to_collection
   requirement: !ruby/object:Gem::Requirement
@@ -308,6 +308,8 @@ files:
 - lib/glimmer-dsl-opal/samples/hello/hello_menu_bar.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_message_box.rb
 - lib/glimmer-dsl-opal/samples/hello/hello_pop_up_context_menu.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_print.rb
+- lib/glimmer-dsl-opal/samples/hello/hello_progress_bar.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
@@ -421,6 +423,7 @@ files:
 - lib/glimmer/swt/menu_proxy.rb
 - lib/glimmer/swt/message_box_proxy.rb
 - lib/glimmer/swt/point.rb
+- lib/glimmer/swt/progress_bar_proxy.rb
 - lib/glimmer/swt/property_owner.rb
 - lib/glimmer/swt/radio_proxy.rb
 - lib/glimmer/swt/row_layout_proxy.rb