glimmer-dsl-swt 4.24.3.0 → 4.24.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90fac650eedadc1e677e27563bda759e5aa1ea7b2d5b6627129f906516c21a82
-  data.tar.gz: 4098c6d271799034a18747154236426cde6c7b83eca4030d5d1292f8bc0f52e2
+  metadata.gz: 44c7406f9588caef592b17f889b509db88771e545300a916f44ea1a928a89937
+  data.tar.gz: 2933dfdf3e5e1479849793cec5bbfdf3558768bb34b4c828847339c95559242a
 SHA512:
-  metadata.gz: 97d0b7a8a715410c6772b4cbb8cd45052c5d0db5e3c7b6f78a62fd9d8f23536dc467727b4441e0585f339674e63d4f9c3e622cdaea04a968e80ffde5ea6ea5f6
-  data.tar.gz: 159d537c854c56d6502a8ed248f5b54fe76590a411d5013d5f40844dd816c1212e49692e42b882c7262267de859580491ce4c9f015972f4b0baaea5169a0dddd
+  metadata.gz: 6d13f0eaa866f47c449caa5ce3e3ae652025940769b8f419c0b4b66df0e1e67b3a4e3494ab539cb81d21de79ac44d81e3982f59083c9bd0453201e1231073ee0
+  data.tar.gz: 53fe039d009a4d3476bbc2a5d96f11ca3ab4fdb442b790bafd0b9bc920943bb4cc6bc475522f1f040d355da8029cd693a76179d4e247fa9e4bd59fcd2637fe80

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 4.24.3.1
+
+- `code_text` default behavior support of zoom in (CMD+= on Mac, CTRL+= on Win/Linux), zoom out (CMD+- on Mac, CTRL+- on Win/Linux), and restore original font height (CMD+0 on Mac, CTRL+0 on Win/Linux).
+
 ## 4.24.3.0
 
 - Support `table` `items` data-binding of table row cell `background`, `foreground`, `font`, `image` to model attributes by convention based on specified `column_properties` (e.g. for `column_properties` model `name` attribute, automatically assume model `name_background` provides `[r, g, b]` array of color)

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.24.3.0
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.24.3.1
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
@@ -21,7 +21,7 @@ Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) an
 
 ![Eclipse SWT RCP NASA Mars Rover](/images/glimmer-eclipse-swt-rcp-nasa-mars-rover.png)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.24.3.0 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT.
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.24.3.1 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT.
 
 **Starting in version 4.20.0.0, [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) comes with the new [***Shine***](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#shine) syntax** for highly intuitive and visually expressive View/Model Attribute Mapping, relying on `<=>` for bidirectional (two-way) data-binding and `<=` for unidirectional (one-way) data-binding, providing an alternative to the `bind` keyword. That was [originally conceived back in 2007](https://andymaleh.blogspot.com/2007/12/data-shining-in-glimmer.html).
 
@@ -338,7 +338,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.24.3.0
+jgem install glimmer-dsl-swt -v 4.24.3.1
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -366,7 +366,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 4.24.3.0'
+gem 'glimmer-dsl-swt', '~> 4.24.3.1'
 ```
 
 And, then run:
@@ -389,7 +389,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.3.0
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.3.1
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/VERSION

@@ -1 +1 @@
-4.24.3.0
+4.24.3.1

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -3998,9 +3998,9 @@ The SWT Tree widget renders a multi-column data table, such as a contact listing
 
 To data-bind a Table, you need the main model, the collection property, and the text display attribute for each table column.
 
-This involves using the `bind` keyword mentioned above in addition to a special `column_properties` keyword that takes the table column text attribute methods.
+This involves using the `<=>` operator in addition to a special `column_properties` kwarg that takes an array that maps table columns to model attributes.
 
-It assumes you have defined the table columns via `table_column` widget.
+It assumes you have already defined table columns via the `table_column` `table`-nested widget.
 
 Example:
 
@@ -4029,11 +4029,11 @@ shell {
 ```
 
 The code above includes two data-bindings:
-- Table `items`, which first bind to the model collection property (group.people), and then maps each column property (name, age, adult) for displaying each table item column.
-- Table `selection`, which binds the single table item selected by the user to the attribute denoted by the `bind` keyword (or binds multiple table items selected for a table with `:multi` SWT style)
+- Table `items`, which first data-binds to the model collection property (group.people), and then maps each column property (name, age, adult) for displaying each table item column.
+- Table `selection`, which data-binds the single table item (row) selected by the user to the model attribute denoted by `<=>` (or data-binds multiple table items to a model attribute array value for a table with `:multi` SWT style)
 - The `on_mouse_up` event handler invokes `@table.edit_table_item(event.table_item, event.column_index)` to start edit mode on the clicked table item cell, and then saves or cancel depending on whether the user hits ENTER or ESC once done editing (or focus-out after either making a change or not making any changes.)
 
-Additionally, Table `items` data-binding automatically stores each node model unto the SWT TableItem object via `setData` method. This enables things like searchability.
+Additionally, Table `items` data-binding automatically stores each row model in the [SWT `TableItem`](https://help.eclipse.org/latest/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/widgets/TableItem.html) object representing it, by using the `set_data` method. This enables things like searchability.
 
 The table widget in Glimmer is represented by a subclass of `WidgetProxy` called `TableProxy`.
 TableProxy includes a `search` method that takes a block to look for a table item.
@@ -4044,7 +4044,7 @@ Example:
 found_array = @table.search { |table_item| table_item.getData == company.owner }
 ```
 
-This finds a person. The array is a Java array. This enables easy passing of it to SWT `Table#setSelection` method, which expects a Java array of `TableItem` objects.
+This finds a person. The array is a Java array. This enables easy passing of it to SWT `Table#setSelection` method, which expects a Java array of [`TableItem`](https://help.eclipse.org/latest/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/widgets/TableItem.html) objects.
 
 To edit a table, you must invoke `TableProxy#edit_selected_table_item(column_index, before_write: nil, after_write: nil, after_cancel: nil)` or `TableProxy#edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil)`.
 This automatically leverages the SWT TableEditor custom class behind the scenes, displaying a text widget to the user to change the selected or
@@ -4825,7 +4825,7 @@ You may see another example at the [Hello, Radio Group!](/docs/reference/GLIMMER
 
 ##### Code Text Custom Widget
 
-`code_text` is a Glimmer built-in custom widget that displays syntax highlighted code (e.g. Ruby/JavaScript/HTML code) for 204 languages (see [options](#code-text-options) for the full list) by automating customizations for the SWT [StyledText](https://help.eclipse.org/2020-09/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/custom/StyledText.html) widget.
+`code_text` is a Glimmer built-in custom widget that displays syntax highlighted code (e.g. Ruby/JavaScript/HTML code) for 204 languages (see [options](#code-text-options) for the full list) by automating customizations for the SWT [StyledText](https://help.eclipse.org/2020-09/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/custom/StyledText.html) widget, including ability to zoom font in and out, or restore original font height (more details below).
 
 To utilize, simply use `code_text` in place of the multi-line `text` and `styled_text` widgets. If you set the `code_text` `text` property value to multi-line code content (e.g. Ruby/JavaScript/HTML code), it automatically styles it with syntax highlighting.
 
@@ -5151,6 +5151,9 @@ This adds some default keyboard shortcuts:
 - CMD+A (CTRL+A on Windows/Linux) to select all
 - CTRL+A on Mac to jump to beginning of line
 - CTRL+E on Mac to jump to end of line
+- CMD+= (CTRL+= on Windows/Linux) to zoom in (bump font height up by 1)
+- CMD+- (CTRL+- on Windows/Linux) to zoom out (bump font height down by 1)
+- CMD+0 (CTRL+0 on Windows/Linux) to restore to original font height
 - Attempts to add proper indentation upon adding a new line when hitting ENTER (currently supporting Ruby only)
 
 If you prefer it to be vanilla with no default key event listeners, then pass the `default_behavior: false` option.

data/docs/reference/GLIMMER_SAMPLES.md

@@ -730,7 +730,7 @@ Hello, Spinner!
 
 #### Hello, Table!
 
-This sample demonstrates the use of [table](#table) widget in Glimmer, including data-binding, multi-type editing, sorting, and filtering.
+This sample demonstrates the use of [table](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#table) widget in Glimmer, including data-binding, multi-type editing, sorting, and filtering.
 
 Code:
 
@@ -820,17 +820,29 @@ Code:
 
 [samples/hello/hello_code_text.rb](/samples/hello/hello_code_text.rb)
 
-Hello, Code Text! Ruby Language / Glimmer Theme / Show Line Numbers (default width of 4)
+Hello, Code Text! HTML Language / GitHub Theme / No Line Numbers
 
-![Hello Code Text Ruby](/images/glimmer-hello-code-text-ruby.png)
+![Hello Code Text HTML](/images/glimmer-hello-code-text-html.png)
 
 Hello, Code Text! JavaScript Language / Pastie Theme / Show Line Numbers (custom width of 2)
 
 ![Hello Code Text JavaScript](/images/glimmer-hello-code-text-javascript.png)
 
-Hello, Code Text! HTML Language / GitHub Theme / No Line Numbers
+Hello, Code Text! Ruby Language / Glimmer Theme / Show Line Numbers (default width of 4)
 
-![Hello Code Text HTML](/images/glimmer-hello-code-text-html.png)
+![Hello Code Text Ruby](/images/glimmer-hello-code-text-ruby.png)
+
+Hello, Code Text! Zoom In (via keyboard shortcut CMD+= on Mac, CTRL+= on Win/Linux)
+
+![Hello Code Text Zoom In](/images/glimmer-hello-code-text-zoom-in.png)
+
+Hello, Code Text! Zoom Out (via keyboard shortcut CMD+- on Mac, CTRL+- on Win/Linux)
+
+![Hello Code Text Zoom Out](/images/glimmer-hello-code-text-zoom-out.png)
+
+Hello, Code Text! Restore Original Font Height (via keyboard shortcut CMD+0 on Mac, CTRL+0 on Win/Linux)
+
+![Hello Code Text Restore Original Font Height](/images/glimmer-hello-code-text-ruby.png)
 
 #### Hello, Canvas!
 

data/lib/glimmer/swt/custom/code_text.rb

@@ -42,6 +42,7 @@ module Glimmer
         
         REGEX_COLOR_HEX6 = /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/
         FONT_NAMES_PREFERRED = ['Consolas', 'Courier', 'Monospace', 'Liberation Mono']
+        SHORTCUT_KEY_COMMAND = OS.mac? ? :command : :ctrl
         
         # TODO support auto language detection
               
@@ -145,7 +146,7 @@ module Glimmer
         
         body {
           if lines
-            composite {
+            @composite = composite {
               grid_layout(2, false)
               
               @line_numbers_styled_text_proxy = styled_text(swt(swt(swt_style), :h_scroll!, :v_scroll!)) {
@@ -204,12 +205,18 @@ module Glimmer
               on_key_pressed { |event|
                 character = event.keyCode.chr rescue nil
                 case [event.stateMask, character]
-                when [(OS.mac? ? swt(:command) : swt(:ctrl)), 'a']
+                when [swt(SHORTCUT_KEY_COMMAND), 'a']
                   @styled_text_proxy.selectAll
                 when [(swt(:ctrl) if OS.mac?), 'a']
                   jump_to_beginning_of_line
                 when [(swt(:ctrl) if OS.mac?), 'e']
                   jump_to_end_of_line
+                when [swt(SHORTCUT_KEY_COMMAND), '=']
+                  bump_font_height_up
+                when [swt(SHORTCUT_KEY_COMMAND), '-']
+                  bump_font_height_down
+                when [swt(SHORTCUT_KEY_COMMAND), '0']
+                  restore_font_height
                 end
               }
               on_verify_text { |verify_event|
@@ -333,6 +340,36 @@ module Glimmer
           @font_name ||= all_font_names.find {|font_name| font_name.downcase.include?('mono')}
           @font_name
         end
+        
+        def bump_font_height_up
+          @original_font_height ||= font_datum.height
+          new_font_height = font_datum.height + 1
+          update_font_height(new_font_height)
+        end
+        
+        def bump_font_height_down
+          @original_font_height ||= font_datum.height
+          new_font_height = font_datum.height - 1
+          update_font_height(new_font_height)
+        end
+        
+        def restore_font_height
+          return if @original_font_height.nil?
+          update_font_height(@original_font_height)
+          @original_font_height = nil
+        end
+        
+        def update_font_height(new_font_height)
+          return if new_font_height.nil?
+          @styled_text_proxy.font = {name: font_datum.name, height: new_font_height, style: font_datum.style}
+          @line_numbers_styled_text_proxy&.font = {name: font_datum.name, height: new_font_height, style: font_datum.style}
+          @body_root.shell_proxy.layout(true, true)
+          @body_root.shell_proxy.pack_same_size
+        end
+        
+        def font_datum
+          @styled_text_proxy.font.font_data.first
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.24.3.0
+  version: 4.24.3.1
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-27 00:00:00.000000000 Z
+date: 2022-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement