glimmer-dsl-opal 0.26.1 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1bec8104295a4c2f4a5b3f6d1464c9e0b0f5175092e93b7dd9508a5c4feabd0
-  data.tar.gz: 778f2026c647b7454d0586cf2310297d143d122a4b8937ec6189abdba260667d
+  metadata.gz: dd9df390a04a8efb59afa0dcfe42a88d3a2ebcc89b19f51b5daf325e85495898
+  data.tar.gz: f842142ce4346af198197cacaa1695eddc9f15f684c4b4250ebed41872d9253f
 SHA512:
-  metadata.gz: 33e3f1b4bd51b3cfdc34d9f24403bb47d0a889c235e169232a3e8b8dae6db26617110dd55f8ed4a40d752c2e5f60569ea70c2b95db7a4435f1a2fddac25e3d7f
-  data.tar.gz: 8fafbadda7e92fcf19ac96b994e3dcb67ed25febcdd521a97e94f57a66f272312cbc6763a341c30b1f1cf46e27ff62928eaed02cf8f1aa91c72590794e6ec7ee
+  metadata.gz: 1090a9d0bf0cab0bb673e32ce5711e3d034866e4d195995db125b40a43fa798f09f6944ba2e2bfbb38d06731248717bc38fd166d50c543e6271564aa8e80f978
+  data.tar.gz: 57e6aa38f7829508d5a6f0a54814ada1d58c79fda05f56d353a069271960727b9d92c2bb642839215a6942958d267d00e9befc7b5f688755037fe46fcd7b8f53

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.26.2
+
+- Support key_event.key_location to distinguish between left and right alt/shift/command/ctrl buttons
+- Use right/left alt/shift keys in Tetris for rotate right and rotate left
+
 ## 0.26.1
 
 - Support display on_swt_keydown event keyCode/key_code values for arrow keys and alt/shift/ctrl

data/README.md

@@ -145,7 +145,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.26.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.26.2 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)
@@ -269,7 +269,7 @@ gem 'opal', '1.0.5'
 gem 'opal-rails', '1.1.2'
 gem 'opal-async', '~> 1.4.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.26.1'
+gem 'glimmer-dsl-opal', '~> 0.26.2'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 

data/VERSION

@@ -1 +1 @@
-0.26.1
+0.26.2

data/lib/glimmer/swt/display_proxy.rb

@@ -13,6 +13,12 @@ module Glimmer
         39 => SWTProxy[:arrow_right],
         40 => SWTProxy[:arrow_down],
       }
+      
+      JS_LOCATION_TO_SWT_KEY_LOCATION_MAP = {
+        1 => SWTProxy[:left],
+        2 => SWTProxy[:right],
+      }
+      
     
       class << self
         def instance
@@ -143,7 +149,14 @@ module Glimmer
               event: 'keydown',
               event_handler: -> (event_listener) {
                 -> (event) {
-                  event.singleton_class.define_method(:character) do
+                  original_event = event
+                  event = ::Event.new(event)
+                  event.define_singleton_method(:keyLocation) do
+                    key_location = `#{original_event}.location`
+                    JS_LOCATION_TO_SWT_KEY_LOCATION_MAP[key_location]
+                  end
+                  event.define_singleton_method(:key_location, &event.method(:keyLocation))
+                  event.define_singleton_method(:character) do
                     which || key_code
                   end
                   event.define_singleton_method(:keyCode) {
@@ -174,7 +187,6 @@ module Glimmer
                     event.stop_propagation
                     event.stop_immediate_propagation
                   end
-                  
                   doit
                 }
               }

data/lib/glimmer/swt/widget_proxy.rb

@@ -800,7 +800,11 @@ module Glimmer
           end
           the_listener_dom_element = event_element_css_selector ? Element[event_element_css_selector] : listener_dom_element
           unless the_listener_dom_element.empty?
-            the_listener_dom_element.on(event, &async_event_listener)
+            if is_a?(DisplayProxy) && event == 'keydown'
+              `document.addEventListener('keydown', #{async_event_listener})`
+            else
+              the_listener_dom_element.on(event, &async_event_listener)
+            end
             # TODO ensure uniqueness of insertion (perhaps adding equals/hash method to event listener proxy)
             
             event_listener_proxies << EventListenerProxy.new(element_proxy: self, selector: selector, dom_element: the_listener_dom_element, event: event, listener: async_event_listener, original_event_listener: original_event_listener)

data/lib/glimmer-dsl-opal/samples/elaborate/tetris.rb

@@ -72,8 +72,13 @@ class Tetris
         when 'e'.bytes.first
           game.rotate!(:right)
         when swt(:shift), swt(:alt)
-          game.rotate!(:right)
+          if key_event.keyLocation == swt(:right) # right key
+            game.rotate!(:right)
+          elsif key_event.keyLocation == swt(:left) # left key
+            game.rotate!(:left)
+          end
         end
+        
       end
     }
   end
@@ -142,7 +147,7 @@ class Tetris
   def show_about_dialog
     message_box {
       text 'Glimmer Tetris'
-      message "Glimmer Tetris\n\nGlimmer DSL for SWT Sample\n\nLeft is A\nRight is D\nDown is S\nUp is W\nRotate Left is Q\nRotate Right is E\n\n for Left, Down, Right, Up\n\nCopyright (c) 2007-2021 Andy Maleh"
+      message "Glimmer Tetris\n\nGlimmer DSL for SWT Sample\n\nUse arrow keys for movement\nand right/left alt/shift keys for rotation\nAlternatively:\nLeft is A\nRight is D\nDown is S\nUp is W\nRotate Left is Q\nRotate Right is E\n\n for Left, Down, Right, Up\n\nCopyright (c) 2007-2021 Andy Maleh"
     }.open
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.26.2
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer