glimmer-dsl-swt 4.20.12.2 → 4.20.12.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/README.md +5 -5
- data/VERSION +1 -1
- data/glimmer-dsl-swt.gemspec +0 -0
- data/lib/glimmer/dsl/swt/dsl.rb +1 -1
- data/lib/glimmer/dsl/swt/{widget_listener_expression.rb → listener_expression.rb} +4 -4
- data/lib/glimmer/swt/custom/shape.rb +14 -5
- data/lib/glimmer/ui/custom_shape.rb +10 -0
- data/samples/hello/hello_custom_shape.rb +6 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0373a7dc65537a71945ca562aec3612f9acb7762ce04a54efb64deb3b4089c7f
|
4
|
+
data.tar.gz: 77fdddc56f1571a426b9786d6ab5343ab400d9a61efc92644ab62482085f3ce2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: baf76febcbe0b29e675c411fa4301cdc1b1ad7b3168a2f63ba91bfdd89a1ac2e8ae35eacebabdeb317bd6b68cbedefeaffc4e2b66e0e460cd2a704f20064c69f
|
7
|
+
data.tar.gz: cf93ef1f0efd3ad957c219a8024003c948d9f5c2fc6f260547ccf089786463624287e2648773c3992095dfa38ba0589d95fdf8cfaef2161c71b3d05971870978
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,10 @@
|
|
1
1
|
# Change Log
|
2
2
|
|
3
|
+
### 4.20.12.3
|
4
|
+
|
5
|
+
- Make Custom Shapes support on_event listeners just like Shapes
|
6
|
+
- Update Hello, Custom Shape! to take advantage of custom shape listeners (on mouse click, change color)
|
7
|
+
|
3
8
|
### 4.20.12.2
|
4
9
|
|
5
10
|
- Make Shape listeners check inclusion against all sub-shapes
|
data/README.md
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
# [<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.20.12.
|
1
|
+
# [<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.20.12.3
|
2
2
|
## JRuby Desktop Development GUI Framework
|
3
3
|
[![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
|
4
4
|
[![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
|
@@ -15,7 +15,7 @@
|
|
15
15
|
[<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
|
16
16
|
Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
|
17
17
|
|
18
|
-
[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.12.
|
18
|
+
[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.12.3 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. 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. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
|
19
19
|
|
20
20
|
**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 (keep in mind that it is still a beta, so default back to `bind` whenever needed).
|
21
21
|
|
@@ -326,7 +326,7 @@ jgem install glimmer-dsl-swt
|
|
326
326
|
|
327
327
|
Or this command if you want a specific version:
|
328
328
|
```
|
329
|
-
jgem install glimmer-dsl-swt -v 4.20.12.
|
329
|
+
jgem install glimmer-dsl-swt -v 4.20.12.3
|
330
330
|
```
|
331
331
|
|
332
332
|
`jgem` is JRuby's version of `gem` command.
|
@@ -354,7 +354,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
|
|
354
354
|
|
355
355
|
Add the following to `Gemfile`:
|
356
356
|
```
|
357
|
-
gem 'glimmer-dsl-swt', '~> 4.20.12.
|
357
|
+
gem 'glimmer-dsl-swt', '~> 4.20.12.3'
|
358
358
|
```
|
359
359
|
|
360
360
|
And, then run:
|
@@ -375,7 +375,7 @@ glimmer
|
|
375
375
|
```
|
376
376
|
|
377
377
|
```
|
378
|
-
Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.12.
|
378
|
+
Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.12.3
|
379
379
|
|
380
380
|
Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
|
381
381
|
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
4.20.12.
|
1
|
+
4.20.12.3
|
data/glimmer-dsl-swt.gemspec
CHANGED
Binary file
|
data/lib/glimmer/dsl/swt/dsl.rb
CHANGED
@@ -22,17 +22,17 @@
|
|
22
22
|
require 'glimmer/dsl/expression'
|
23
23
|
require 'glimmer/swt/display_proxy'
|
24
24
|
require 'glimmer/swt/custom/shape'
|
25
|
+
require 'glimmer/ui/custom_shape'
|
25
26
|
|
26
27
|
module Glimmer
|
27
28
|
module DSL
|
28
29
|
module SWT
|
29
|
-
|
30
|
-
|
31
|
-
|
30
|
+
# Widget, Shape, and Display listener experssion
|
31
|
+
class ListenerExpression < Expression
|
32
32
|
def can_interpret?(parent, keyword, *args, &block)
|
33
33
|
Glimmer::Config.logger.debug {"keyword starts with on_: #{keyword.start_with?('on_')}"}
|
34
34
|
return false unless keyword.start_with?('on_')
|
35
|
-
proper_parent = parent.respond_to?(:swt_widget) || parent.is_a?(Glimmer::SWT::DisplayProxy) || parent.is_a?(Glimmer::SWT::Custom::Shape)
|
35
|
+
proper_parent = parent.respond_to?(:swt_widget) || parent.is_a?(Glimmer::SWT::DisplayProxy) || parent.is_a?(Glimmer::SWT::Custom::Shape) || parent.is_a?(Glimmer::UI::CustomShape)
|
36
36
|
Glimmer::Config.logger.debug {"parent #{parent} is a widget, shape, or display: #{proper_parent}"}
|
37
37
|
return false unless proper_parent
|
38
38
|
Glimmer::Config.logger.debug {"block exists?: #{!block.nil?}"}
|
@@ -509,6 +509,7 @@ module Glimmer
|
|
509
509
|
def set_attribute(attribute_name, *args)
|
510
510
|
options = args.last if args.last.is_a?(Hash)
|
511
511
|
args.pop if !options.nil? && !options[:redraw].nil?
|
512
|
+
options ||= {}
|
512
513
|
perform_redraw = @perform_redraw
|
513
514
|
perform_redraw = options[:redraw] if perform_redraw.nil? && !options.nil?
|
514
515
|
perform_redraw ||= true
|
@@ -529,11 +530,12 @@ module Glimmer
|
|
529
530
|
@properties[ruby_attribute_getter_name] = args
|
530
531
|
amend_method_name_options_based_on_properties! if @content_added && new_property
|
531
532
|
property_change = true
|
533
|
+
calculated_paint_args_changed! if container?
|
532
534
|
end
|
533
535
|
if @content_added && perform_redraw && !drawable.is_disposed
|
534
536
|
redrawn = false
|
535
537
|
unless property_change
|
536
|
-
|
538
|
+
calculated_paint_args_changed!(children: false)
|
537
539
|
if is_a?(PathSegment)
|
538
540
|
root_path&.calculated_path_args = @calculated_path_args = false
|
539
541
|
calculated_args_changed!
|
@@ -549,7 +551,7 @@ module Glimmer
|
|
549
551
|
end
|
550
552
|
# TODO consider redrawing an image proxy's gc in the future
|
551
553
|
# TODO consider ensuring only a single redraw happens for a hierarchy of nested shapes
|
552
|
-
drawable.redraw
|
554
|
+
drawable.redraw if !redrawn && !drawable.is_a?(ImageProxy)
|
553
555
|
end
|
554
556
|
end
|
555
557
|
|
@@ -571,7 +573,7 @@ module Glimmer
|
|
571
573
|
def handle_observation_request(observation_request, &block)
|
572
574
|
shape_block = lambda do |event|
|
573
575
|
included = include?(event.x, event.y)
|
574
|
-
included ||=
|
576
|
+
included ||= expanded_shapes.detect { |shape| shape.include?(event.x, event.y) }
|
575
577
|
block.call(event) if included
|
576
578
|
end
|
577
579
|
drawable.handle_observation_request(observation_request, &shape_block)
|
@@ -790,7 +792,7 @@ module Glimmer
|
|
790
792
|
extent_args << extent_flags unless extent_flags.nil?
|
791
793
|
self.extent = paint_event.gc.send("#{@name}Extent", *extent_args)
|
792
794
|
end
|
793
|
-
if !@extent.nil? && (old_extent&.x != @extent&.x || old_extent&.y != @extent&.y)
|
795
|
+
if !@extent.nil? && (old_extent&.x != @extent&.x || old_extent&.y != @extent&.y) # TODO add a check to text content changing too
|
794
796
|
calculated_args_changed!
|
795
797
|
parent.calculated_args_changed_for_defaults! if parent.is_a?(Shape)
|
796
798
|
end
|
@@ -812,6 +814,12 @@ module Glimmer
|
|
812
814
|
shapes.each(&:calculated_args_changed!) if children
|
813
815
|
end
|
814
816
|
|
817
|
+
def calculated_paint_args_changed!(children: true)
|
818
|
+
@calculated_paint_args = nil
|
819
|
+
@all_parent_properties = nil
|
820
|
+
shapes.each(&:calculated_paint_args_changed!) if children
|
821
|
+
end
|
822
|
+
|
815
823
|
# Notifies object that calculated args changed for defaults. Returns true if redrawing and false otherwise.
|
816
824
|
def calculated_args_changed_for_defaults!
|
817
825
|
has_default_dimensions = default_width? || default_height?
|
@@ -1205,7 +1213,8 @@ module Glimmer
|
|
1205
1213
|
end
|
1206
1214
|
end
|
1207
1215
|
else
|
1208
|
-
@
|
1216
|
+
@original_properties ||= @properties
|
1217
|
+
@properties = all_parent_properties.merge(@original_properties)
|
1209
1218
|
@properties['background'] = [@drawable.background] if fill? && !has_some_background?
|
1210
1219
|
@properties['foreground'] = [@drawable.foreground] if @drawable.respond_to?(:foreground) && draw? && !has_some_foreground?
|
1211
1220
|
# TODO regarding alpha, make sure to reset it to parent stored alpha once we allow setting shape properties on parents directly without shapes
|
@@ -254,6 +254,16 @@ module Glimmer
|
|
254
254
|
end
|
255
255
|
end
|
256
256
|
|
257
|
+
# TODO consider bringing observer_registrations method from CustomWidget if needed
|
258
|
+
|
259
|
+
def can_handle_observation_request?(observation_request)
|
260
|
+
body_root&.can_handle_observation_request?(observation_request)
|
261
|
+
end
|
262
|
+
|
263
|
+
def handle_observation_request(observation_request, &block)
|
264
|
+
body_root.handle_observation_request(observation_request, &block)
|
265
|
+
end
|
266
|
+
|
257
267
|
def method_missing(method, *args, &block)
|
258
268
|
# TODO Consider supporting a glimmer error silencing option for methods defined here
|
259
269
|
# but fail the glimmer DSL for the right reason to avoid seeing noise in the log output
|
@@ -65,8 +65,13 @@ class HelloCustomShape
|
|
65
65
|
y_location = (rand*HEIGHT/2).to_i%HEIGHT + (rand*15).to_i
|
66
66
|
foreground_color = rgb(rand*255, rand*255, rand*255)
|
67
67
|
|
68
|
-
stick_figure(x: x_location, y: y_location, width: 35+n*2, height: 35+n*2) {
|
68
|
+
a_stick_figure = stick_figure(x: x_location, y: y_location, width: 35+n*2, height: 35+n*2) {
|
69
69
|
foreground foreground_color
|
70
|
+
|
71
|
+
# on mouse click, change color
|
72
|
+
on_mouse_up do
|
73
|
+
a_stick_figure.foreground = rgb(rand*255, rand*255, rand*255)
|
74
|
+
end
|
70
75
|
}
|
71
76
|
}
|
72
77
|
}
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: glimmer-dsl-swt
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.20.12.
|
4
|
+
version: 4.20.12.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Andy Maleh
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-07-
|
11
|
+
date: 2021-07-27 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
@@ -438,6 +438,7 @@ files:
|
|
438
438
|
- lib/glimmer/dsl/swt/layout_data_expression.rb
|
439
439
|
- lib/glimmer/dsl/swt/layout_expression.rb
|
440
440
|
- lib/glimmer/dsl/swt/list_selection_data_binding_expression.rb
|
441
|
+
- lib/glimmer/dsl/swt/listener_expression.rb
|
441
442
|
- lib/glimmer/dsl/swt/menu_bar_expression.rb
|
442
443
|
- lib/glimmer/dsl/swt/menu_expression.rb
|
443
444
|
- lib/glimmer/dsl/swt/message_box_expression.rb
|
@@ -462,7 +463,6 @@ files:
|
|
462
463
|
- lib/glimmer/dsl/swt/tree_items_data_binding_expression.rb
|
463
464
|
- lib/glimmer/dsl/swt/tree_properties_expression.rb
|
464
465
|
- lib/glimmer/dsl/swt/widget_expression.rb
|
465
|
-
- lib/glimmer/dsl/swt/widget_listener_expression.rb
|
466
466
|
- lib/glimmer/launcher.rb
|
467
467
|
- lib/glimmer/rake_task.rb
|
468
468
|
- lib/glimmer/rake_task/list.rb
|