glimmer-dsl-swt 4.18.3.4 → 4.18.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63410b8b302bc061b5089d24bcadaacbd54b83bbb581ffecd0a46c7c026329c1
-  data.tar.gz: 60da9c410a221130713e209c0e6127d3e04f17feccbcb29788c2234a90802bb9
+  metadata.gz: 9d3b93ed7e1bfaddf902080def3c370528f1f7d199f470e504cab6c60cc78934
+  data.tar.gz: 5cd60a864c6b5ba100ba5293632e7eb85411da636ef87338d4f8ef090190b726
 SHA512:
-  metadata.gz: 81a1feac2ef1bf9c7329d26714d0d7c61b926f710a785f0b7d2e1a424b2548cf159604ada03f368996c99cb45d0834bb362a715cbfae0fa5ec1b4e5af659ee8b
-  data.tar.gz: a4c1e06cf9aa7f3b656e9d5d22d56883f1def62865b1aa56555041c8238c07e0f333f17cd6f6108ada800e1738294f148757752e4609e1dd34dcbdc8183bd1ba
+  metadata.gz: a53eea373c988e58a5a5e021eeb8ba5e0be74254a53e7a50c7ab1bf716df6db9fc9ce0fed70169d88b3f6ffa54cdb39bd4ba9cdc415ae1f9feeb3980c84c9538
+  data.tar.gz: 5965bb2ba7ebda9858228a06dddc74309032f435b13426c9fe4922d646f2698d77f045f4025d04085775e36fc1ea5e3529b77d309776579ef084009ebfbfca1a

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+### 4.18.3.5
+
+- Add `write_on_cancel: true` option for TableProxy#edit_table_item to make cancel behave just like save for special cases where you cannot cancel except the edit mode itself
+- Make code_text custom widget support multiple code languages via `language: 'java'` option
+- Make code_text custom widget support multiple themes via `theme: 'github'` option
+- Hello, Code Text! Sample
+- Fix issue with High Score Dialog in Tetris Sample not sorting by scores correctly (string compare instead of numeric compare) until first game is completed
+- Fix issue with setting date geting rejected in `date_time` for month or day being incompatible with the year/month/day combo
+
 ### 4.18.3.4
 
 - Support building Image objects with the Glimmer Canvas Shape DSL

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.18.3.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.18.3.5
 ## 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)
@@ -8,7 +8,7 @@
 
 **[Contributors Wanted! (Submit a Glimmer App Sample to Get Started)](#contributing)**
 
-[Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer) is a native-GUI cross-platform desktop development library written in [JRuby](https://www.jruby.org/), an OS-threaded faster JVM version of [Ruby](https://www.ruby-lang.org/en/). [Glimmer](https://github.com/AndyObtiva/glimmer)'s main innovation is a declarative [Ruby DSL](#glimmer-dsl-syntax) that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust [Eclipse SWT library](https://www.eclipse.org/swt/). [Glimmer](https://rubygems.org/gems/glimmer) additionally innovates by having built-in [data-binding](#data-binding) support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models (test-first) afterwards. Not only does Glimmer provide a large set of GUI [widgets](#widgets), but it also supports drawing Canvas Graphics like [Shapes](#canvas-shape-dsl) and [Animations](#canvas-animation-dsl). To get started quickly, [Glimmer](https://rubygems.org/gems/glimmer) s [scaffolding](#scaffolding) options for [Apps](#in-production), [Gems](#custom-shell-gem), and [Custom Widgets](#custom-widgets). [Glimmer](https://rubygems.org/gems/glimmer) also includes native-executable [packaging](#packaging--distribution) support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in [Ruby](https://www.ruby-lang.org/en/) as truly native DMG/PKG/APP files on the [Mac](https://www.apple.com/ca/macos) + [App Store](https://developer.apple.com/macos/distribution/), MSI/EXE files on [Windows](https://www.microsoft.com/en-ca/windows), and [Gem Packaged Shell Scripts](#custom-shell-gem) on [Linux](https://www.linux.org/).
+[Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer) is a native-GUI cross-platform desktop development library written in [JRuby](https://www.jruby.org/), an OS-threaded faster JVM version of [Ruby](https://www.ruby-lang.org/en/). [Glimmer](https://github.com/AndyObtiva/glimmer)'s main innovation is a declarative [Ruby DSL](#glimmer-dsl-syntax) that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust [Eclipse SWT library](https://www.eclipse.org/swt/). [Glimmer](https://rubygems.org/gems/glimmer) additionally innovates by having built-in [data-binding](#data-binding) support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models (test-first) afterwards. Not only does Glimmer provide a large set of GUI [widgets](#widgets), but it also supports drawing Canvas Graphics like [Shapes](#canvas-shape-dsl) and [Animations](#canvas-animation-dsl). To get started quickly, [Glimmer](https://rubygems.org/gems/glimmer) offers [scaffolding](#scaffolding) options for [Apps](#in-production), [Gems](#custom-shell-gem), and [Custom Widgets](#custom-widgets). [Glimmer](https://rubygems.org/gems/glimmer) also includes native-executable [packaging](#packaging--distribution) support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in [Ruby](https://www.ruby-lang.org/en/) as truly native DMG/PKG/APP files on the [Mac](https://www.apple.com/ca/macos) + [App Store](https://developer.apple.com/macos/distribution/), MSI/EXE files on [Windows](https://www.microsoft.com/en-ca/windows), and [Gem Packaged Shell Scripts](#custom-shell-gem) on [Linux](https://www.linux.org/).
 
 [Glimmer receives two updates per month](https://rubygems.org/gems/glimmer-dsl-swt/versions). You can trust [Glimmer](https://rubygems.org/gems/glimmer) with your Ruby desktop GUI development needs. Please make [Glimmer](https://rubygems.org/gems/glimmer) even better by providing feedback and [contributing](#contributing) when possible.
 
@@ -493,7 +493,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.18.3.4
+jgem install glimmer-dsl-swt -v 4.18.3.5
 
 
 ```
@@ -513,7 +513,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.18.3.4
+gem 'glimmer-dsl-swt', '~> 4.18.3.5
 '
 ```
 
@@ -572,7 +572,7 @@ bin/glimmer samples
 Below are the full usage instructions that come up when running `glimmer` without args.
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.3.4
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.18.3.5
 
 
       
@@ -1053,7 +1053,7 @@ Output:
                                                                          
   Css    glimmer-dsl-css    1.1.0     AndyMaleh    Glimmer DSL for CSS
   Opal   glimmer-dsl-opal   0.10.2     AndyMaleh    Glimmer DSL for Opal
-  Swt    glimmer-dsl-swt    4.18.3.4
+  Swt    glimmer-dsl-swt    4.18.3.5
 
   AndyMaleh    Glimmer DSL for SWT
   Tk     glimmer-dsl-tk     0.0.6     AndyMaleh    Glimmer DSL for Tk
@@ -4017,6 +4017,225 @@ Glimmer Meta-Sample Code Example:
 
 To use, simply use `code_text` in place of the `text` or `styled_text` widget. If you set its `text` value to Ruby code, it automatically styles it with syntax highlighting.
 
+##### Options
+
+**theme**
+(default: 'glimmer')
+
+Changes syntax color highlighting theme. Can be one of the following:
+- glimmer
+- github
+- pastie
+
+**language**
+(default: `'ruby'`)
+
+Sets the code language, which can be one of the following supported rouge gem languages:
+- abap
+- actionscript
+- ada
+- apache
+- apex
+- apiblueprint
+- apple_script
+- armasm
+- augeas
+- awk
+- batchfile
+- bbcbasic
+- bibtex
+- biml
+- bpf
+- brainfuck
+- brightscript
+- bsl
+- c
+- ceylon
+- cfscript
+- clean
+- clojure
+- cmake
+- cmhg
+- coffeescript
+- common_lisp
+- conf
+- console
+- coq
+- cpp
+- crystal
+- csharp
+- css
+- csvs
+- cuda
+- cypher
+- cython
+- d
+- dart
+- datastudio
+- diff
+- digdag
+- docker
+- dot
+- ecl
+- eex
+- eiffel
+- elixir
+- elm
+- email
+- epp
+- erb
+- erlang
+- escape
+- factor
+- fortran
+- freefem
+- fsharp
+- gdscript
+- ghc_cmm
+- ghc_core
+- gherkin
+- glsl
+- go
+- gradle
+- graphql
+- groovy
+- hack
+- haml
+- handlebars
+- haskell
+- haxe
+- hcl
+- hlsl
+- hocon
+- hql
+- html
+- http
+- hylang
+- idlang
+- igorpro
+- ini
+- io
+- irb
+- isbl
+- j
+- janet
+- java
+- javascript
+- jinja
+- jsl
+- json
+- json_doc
+- jsonnet
+- jsp
+- jsx
+- julia
+- kotlin
+- lasso
+- liquid
+- literate_coffeescript
+- literate_haskell
+- livescript
+- llvm
+- lua
+- lustre
+- lutin
+- m68k
+- magik
+- make
+- markdown
+- mason
+- mathematica
+- matlab
+- minizinc
+- moonscript
+- mosel
+- msgtrans
+- mxml
+- nasm
+- nesasm
+- nginx
+- nim
+- nix
+- objective_c
+- objective_cpp
+- ocaml
+- ocl
+- openedge
+- opentype_feature_file
+- pascal
+- perl
+- php
+- plain_text
+- plist
+- pony
+- postscript
+- powershell
+- praat
+- prolog
+- prometheus
+- properties
+- protobuf
+- puppet
+- python
+- q
+- qml
+- r
+- racket
+- reasonml
+- rego
+- rescript
+- robot_framework
+- ruby
+- rust
+- sas
+- sass
+- scala
+- scheme
+- scss
+- sed
+- shell
+- sieve
+- slice
+- slim
+- smalltalk
+- smarty
+- sml
+- solidity
+- sparql
+- sqf
+- sql
+- ssh
+- supercollider
+- swift
+- systemd
+- tap
+- tcl
+- terraform
+- tex
+- toml
+- tsx
+- ttcn3
+- tulip
+- turtle
+- twig
+- typescript
+- vala
+- varnish
+- vb
+- velocity
+- verilog
+- vhdl
+- viml
+- vue
+- wollok
+- xml
+- xojo
+- xpath
+- xquery
+- yaml
+- yang
+- zig
+
 #### Video Widget
 
 [![Video Widget](images/glimmer-video-widget.png)](https://github.com/AndyObtiva/glimmer-cw-video)

data/VERSION

@@ -1 +1 @@
-4.18.3.4
+4.18.3.5

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.18.3.4 ruby lib
+# stub: glimmer-dsl-swt 4.18.3.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.3.4"
+  s.version = "4.18.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2021-01-30"
+  s.date = "2021-02-01"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI cross-platform desktop development library written in JRuby, an OS-threaded faster JVM version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models (test-first) afterwards. Not only does Glimmer provide a large set of GUI widgets, but it also supports drawing Canvas Graphics like Shapes and Animations. To get started quickly, Glimmer offers scaffolding options for Apps, Gems, and Custom Widgets. Glimmer also includes native-executable packaging support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in Ruby as truly native DMG/PKG/APP files on the Mac + App Store, MSI/EXE files on Windows, and Gem Packaged Shell Scripts on Linux.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "icons/scaffold_app.png",
     "lib/ext/glimmer.rb",
     "lib/ext/glimmer/config.rb",
+    "lib/ext/rouge/themes/glimmer.rb",
     "lib/glimmer-dsl-swt.rb",
     "lib/glimmer/Rakefile",
     "lib/glimmer/data_binding/list_selection_binding.rb",
@@ -156,6 +157,7 @@ Gem::Specification.new do |s|
     "samples/hello/hello_canvas_transform.rb",
     "samples/hello/hello_checkbox.rb",
     "samples/hello/hello_checkbox_group.rb",
+    "samples/hello/hello_code_text.rb",
     "samples/hello/hello_combo.rb",
     "samples/hello/hello_computed.rb",
     "samples/hello/hello_computed/contact.rb",

data/lib/ext/rouge/themes/glimmer.rb

@@ -0,0 +1,29 @@
+module Rouge
+  module Themes
+    # A port of the pastie style from Pygments.
+    # See https://bitbucket.org/birkenfeld/pygments-main/src/default/pygments/styles/pastie.py
+    class Glimmer < Github
+      name 'glimmer'
+      style Comment::Single, fg:      [106,115,125], italic: true # Also, Comments
+      style Keyword::Pseudo, fg:      [:dark_red]
+      style Keyword, fg:     [:blue]
+      style Literal::String::Single, fg:      [106,115,125] # Also, Comments
+      style Literal::String::Double, fg:     [0,92,197]
+      style Literal::String::Escape, fg:      [:red]
+      style Literal::Number::Integer, fg:     [:blue]
+      style Literal::String::Interpol, fg:    [:blue]
+      style Literal::String::Symbol, fg:      [:dark_green]
+      style Literal::String, fg:      [:dark_blue]
+      style Name::Builtin, fg:     [215,58,73]
+      style Name::Class, fg:       [3,47,98]
+      style Name::Namespace, fg: [3,47,98]
+      style Name::Constant, fg:    [0,92,197]
+      style Name::Function, fg:    [:blue]
+      style Name::Variable::Instance, fg:    [227,98,9]
+      style Name, fg:        [111,66,193] #purple
+      style Operator, fg:    [:red]
+      style Punctuation, fg: [:blue]
+      style Text, fg:        [75, 75, 75]
+    end
+  end
+end

data/lib/glimmer-dsl-swt.rb

@@ -34,7 +34,6 @@ require 'glimmer'
 require 'logging'
 require 'nested_inherited_jruby_include_package'
 require 'super_module'
-require 'rouge'
 require 'date'
 require 'facets/string/capitalized'
 require 'facets/hash/symbolize_keys'

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

@@ -7,36 +7,59 @@ module Glimmer
       class CodeText
         include Glimmer::UI::CustomWidget
         
-        SYNTAX_COLOR_MAP = {
-           Builtin:     [215,58,73],
-           Class:       [3,47,98],
-           Constant:    [0,92,197],
-           Double:      [0,92,197],
-           Escape:      [:red],
-           Function:    [:blue],
-           Instance:    [227,98,9],
-           Integer:     [:blue],
-           Interpol:    [:blue],
-           Keyword:     [:blue],
-           Name:        [111,66,193], #purple
-           Operator:    [:red],
-           Pseudo:      [:dark_red],
-           Punctuation: [:blue],
-           Single:      [106,115,125], # Also, Comments
-           Symbol:      [:dark_green],
-           Text:        [75, 75, 75],
-        }
+        class << self
+          def languages
+            require 'rouge'
+            Rouge::Lexer.all.map {|lexer| lexer.tag}.sort
+          end
+          
+          def lexers
+            require 'rouge'
+            Rouge::Lexer.all.sort_by(&:title)
+          end
+        end
+        
+        REGEX_COLOR_HEX6 = /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/
         
-        # TODO support `option :language`
         # TODO support auto language detection
+        # TODO support end of line via CMD+E and beginning of line via CMD+A
+        # TODO support select all via CMD+A
+              
+        option :language, default: 'ruby'
+        # TODO consider supporting data-binding of language
+        # TODO support switcher of language that automatically updates the lexer
+        # TODO support method for redrawing the syntax highlighting
+        option :theme, default: 'glimmer'
+#         option :lines, default: false
       
-        def text=(value)
-          swt_widget&.text = value
-        end
+#         attr_accessor :code_text_widget_text, :code_text_widget_top_pixel
+#         attr_reader :styled_text_proxy
         
-        def text
-          swt_widget&.text
-        end
+        
+      
+#         def text=(value)
+#           if lines
+#             @styled_text_proxy&.swt_widget&.text = value
+#           else
+#             super
+#           end
+#         end
+        
+#         def text(*args)
+#           if lines
+#             @styled_text_proxy&.swt_widget&.text
+#           else
+#             super
+#           end
+#         end
+        
+#         def lines_width
+#           if lines == true
+#             4
+#           elsif lines.is_a?(Hash)
+#             lines[:width]
+#           end
+#         end
         
         def syntax_highlighting(text)
           return [] if text.to_s.strip.empty?
@@ -56,16 +79,68 @@ module Glimmer
         
         def lexer
           # TODO Try to use Rouge::Lexer.find_fancy('guess', code) in the future to guess the language or otherwise detect it from file extension
-          @lexer ||= Rouge::Lexer.find_fancy('ruby')
+          @lexer ||= Rouge::Lexer.find_fancy(language)
         end
         
         before_body {
+          require 'rouge'
+          require 'ext/rouge/themes/glimmer'
           @swt_style = swt_style == 0 ? [:border, :multi, :v_scroll, :h_scroll] : swt_style
           @font_name = display.get_font_list(nil, true).map(&:name).include?('Consolas') ? 'Consolas' : 'Courier'
         }
         
         body {
-          styled_text(swt_style) {
+          # TODO enable this once fully implemented
+#           if lines
+#             composite {
+#               grid_layout(2, false)
+#               layout_data :fill, :fill, true, true
+#               @line_numbers_text = styled_text(:multi, :border) {
+#                 layout_data(:right, :fill, false, true)
+#                 text '   1'
+#                 line_count = code_text_widget_text.to_s.split("\n").count
+#                 line_count = 1 if line_count == 0
+#                 lines_text_size = [line_count.to_s.size, 4].max
+#                 text line_count.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n")
+#                 text bind(self, :code_text_widget_text, read_only: true) { |text_value|
+#                   line_count = text_value.to_s.split("\n").count
+#                   line_count = 1 if line_count == 0
+#                   lines_text_size = [line_count.to_s.size, 4].max
+#                   line_count.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n")
+#                 }
+#                 top_pixel bind(self, :code_text_widget_top_pixel, read_only: true)
+#                 font name: @font_name, height: OS.mac? ? 15 : 12
+#                 background color(:widget_background)
+#                 foreground :dark_blue
+#                 top_margin 5
+#                 right_margin 5
+#                 bottom_margin 5
+#                 left_margin 5
+#                 editable false
+#                 caret nil
+#                 on_focus_gained {
+#                   @styled_text_proxy&.swt_widget.setFocus
+#                 }
+#                 on_key_pressed {
+#                   @styled_text_proxy&.swt_widget.setFocus
+#                 }
+#                 on_mouse_up {
+#                   @styled_text_proxy&.swt_widget.setFocus
+#                 }
+#               }
+#
+#               code_text_widget
+#             }
+#           else
+            code_text_widget
+#           end
+        }
+        
+        def code_text_widget
+          @styled_text_proxy = styled_text(swt_style) {
+#             layout_data :fill, :fill, true, true if lines
+#             text bind(self, :code_text_widget_text) if lines
+#             top_pixel bind(self, :code_text_widget_top_pixel) if lines
             font name: @font_name, height: 15
             foreground rgb(75, 75, 75)
             left_margin 5
@@ -88,18 +163,38 @@ module Glimmer
             }
                   
             on_line_get_style { |line_style_event|
-              styles = []
-              syntax_highlighting(line_style_event.lineText).to_a.each do |token_hash|
-                start_index = token_hash[:token_index]
-                size = token_hash[:token_text].size
-                token_color = SYNTAX_COLOR_MAP[token_hash[:token_type].name] || [:black]
-                token_color = color(*token_color).swt_color
-                styles << StyleRange.new(line_style_event.lineOffset + start_index, size, token_color, nil)
+              begin
+                styles = []
+                style_data = nil
+                syntax_highlighting(line_style_event.lineText).to_a.each do |token_hash|
+                  start_index = token_hash[:token_index]
+                  size = token_hash[:token_text].size
+                  style_data = Rouge::Theme.find(theme).new.style_for(token_hash[:token_type])
+                  foreground_color = hex_color_to_swt_color(style_data[:fg], [:black])
+                  background_color = hex_color_to_swt_color(style_data[:bg], [:white])
+                  font_styles = []
+                  font_styles << :bold if style_data[:bold]
+                  font_styles << :italic if style_data[:italic]
+                  font_style = SWTProxy[*font_styles]
+                  styles << StyleRange.new(line_style_event.lineOffset + start_index, size, foreground_color, background_color, font_style)
+                end
+                line_style_event.styles = styles.to_java(StyleRange) unless styles.empty?
+              rescue => e
+                Glimmer::Config.logger.error {"Error encountered with style data: #{style_data}"}
+                Glimmer::Config.logger.error {e.message}
+                Glimmer::Config.logger.error {e.full_message}
               end
-              line_style_event.styles = styles.to_java(StyleRange) unless styles.empty?
             }
           }
-        }
+        end
+        
+        def hex_color_to_swt_color(color_data, default_color)
+          color_data = "##{color_data.chars.drop(1).map {|c| c*2}.join}" if color_data.is_a?(String) && color_data.start_with?('#') && color_data&.size == 4
+          color_data = color_data.match(REGEX_COLOR_HEX6).to_a.drop(1).map {|c| "0x#{c}".hex}.to_a if color_data.is_a?(String) && color_data.start_with?('#')
+          color_data = [color_data] unless color_data.nil? || color_data.empty? || color_data.is_a?(Array)
+          color_data = default_color if color_data.nil? || color_data.empty?
+          color(*color_data).swt_color
+        end
       end
     end
   end

data/lib/glimmer/swt/date_time_proxy.rb

@@ -43,9 +43,7 @@ module Glimmer
       end
       
       def date=(date_value)
-        self.year = date_value.year
-        self.month = date_value.month
-        self.day = date_value.day
+        swt_widget.setDate(date_value.year, date_value.month - 1, date_value.day)
       end
       
       def time

data/lib/glimmer/swt/font_proxy.rb

@@ -43,6 +43,7 @@ module Glimmer
 
       attr_reader :widget_proxy, :swt_font, :font_properties
 
+
       # Builds a new font proxy from passed in widget_proxy and font_properties hash,
       #
       # It begins with existing SWT widget font and amends it with font properties.

data/lib/glimmer/swt/table_proxy.rb

@@ -457,7 +457,7 @@ module Glimmer
         edit_table_item(swt_widget.getSelection.first, column_index, before_write: before_write, after_write: after_write, after_cancel: after_cancel)
       end
             
-      def edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil)
+      def edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil, write_on_cancel: false)
         return if table_item.nil?
         model = table_item.data
         property = column_properties[column_index]
@@ -476,18 +476,22 @@ module Glimmer
         widget_value_property = TableProxy::editors.symbolize_keys[editor_widget][:widget_value_property]
         
         @cancel_edit = lambda do |event=nil|
-          @cancel_in_progress = true
-          @table_editor_widget_proxy&.swt_widget&.dispose
-          @table_editor_widget_proxy = nil
-          if after_cancel&.arity == 0
-            after_cancel&.call
+          if write_on_cancel
+            @finish_edit.call(event)
           else
-            after_cancel&.call(table_item)
+            @cancel_in_progress = true
+            @table_editor_widget_proxy&.swt_widget&.dispose
+            @table_editor_widget_proxy = nil
+            if after_cancel&.arity == 0
+              after_cancel&.call
+            else
+              after_cancel&.call(table_item)
+            end
+            @edit_in_progress = false
+            @cancel_in_progress = false
+            @cancel_edit = nil
+            @edit_mode = false
           end
-          @edit_in_progress = false
-          @cancel_in_progress = false
-          @cancel_edit = nil
-          @edit_mode = false
         end
         
         @finish_edit = lambda do |event=nil|

data/samples/elaborate/tetris/model/game.rb

@@ -21,6 +21,7 @@
 
 require 'fileutils'
 require 'etc'
+require 'json'
 require 'glimmer/data_binding/observer'
 require 'glimmer/config'
 

data/samples/elaborate/tetris/model/past_game.rb

@@ -21,6 +21,19 @@
 
 class Tetris
   module Model
-    PastGame = Struct.new(:name, :score, :lines, :level)
+    class PastGame
+      attr_accessor :name, :score, :lines, :level
+      
+      def initialize(name, score, lines, level)
+        @name = name
+        @score = score.to_i
+        @lines = lines.to_i
+        @level = level.to_i
+      end
+      
+      def to_a
+        [@name, @score, @lines, @level]
+      end
+    end
   end
 end

data/samples/elaborate/tetris/view/high_score_dialog.rb

@@ -99,13 +99,11 @@ class Tetris
               @high_score_table.edit_table_item(
                 @high_score_table.items.first, # row item
                 0, # column
+                write_on_cancel: true,
                 after_write: -> {
                   game.save_high_scores!
                   @play_close_button.set_focus
                 },
-                after_cancel: -> {
-                  @play_close_button.set_focus
-                },
               )
             end
           }

data/samples/hello/hello_code_text.rb

@@ -0,0 +1,84 @@
+# Copyright (c) 2007-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.
+
+include Glimmer
+
+shell {
+  minimum_size 640, 480
+  text 'Hello, Code Text!'
+  
+  tab_folder {
+    tab_item {
+      fill_layout
+      text 'ruby (glimmer theme)'
+      code_text(language: 'ruby', theme: 'glimmer') {
+        text <<~CODE
+          greeting = 'Hello, World!'
+          
+          include Glimmer
+          
+          shell {
+            text 'Glimmer'
+            
+            label {
+              text greeting
+              font height: 30, style: :bold
+            }
+          }
+        CODE
+      }
+    }
+    tab_item {
+      fill_layout
+      text 'html (github theme)'
+      code_text(language: 'html', theme: 'github') {
+        text <<~CODE
+          <html>
+            <body>
+              <section class="accordion">
+                <form method="post" id="name">
+                  <label for="name">
+                    Name
+                  </label>
+                  <input name="name" type="text" />
+                  <input type="submit" />
+                </form>
+              </section>
+            </body>
+          </html>
+        CODE
+      }
+    }
+    tab_item {
+      fill_layout
+      text 'javascript (pastie theme)'
+      code_text(language: 'javascript', theme: 'pastie') {
+        text <<~CODE
+          function helloWorld(greeting) {
+            alert(greeting);
+          }
+          var greetingString = 'Hello, World!';
+          helloWorld(greetingString);
+        CODE
+      }
+    }
+  }
+}.open

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.3.4
+  version: 4.18.3.5
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-30 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -367,6 +367,7 @@ files:
 - icons/scaffold_app.png
 - lib/ext/glimmer.rb
 - lib/ext/glimmer/config.rb
+- lib/ext/rouge/themes/glimmer.rb
 - lib/glimmer-dsl-swt.rb
 - lib/glimmer/Rakefile
 - lib/glimmer/data_binding/list_selection_binding.rb
@@ -489,6 +490,7 @@ files:
 - samples/hello/hello_canvas_transform.rb
 - samples/hello/hello_checkbox.rb
 - samples/hello/hello_checkbox_group.rb
+- samples/hello/hello_code_text.rb
 - samples/hello/hello_combo.rb
 - samples/hello/hello_computed.rb
 - samples/hello/hello_computed/contact.rb