glimmer-dsl-libui 0.1.3 → 0.1.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (105) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +50 -0
  3. data/README.md +901 -104
  4. data/VERSION +1 -1
  5. data/examples/area_gallery.rb +36 -38
  6. data/examples/area_gallery2.rb +111 -0
  7. data/examples/area_gallery3.rb +52 -0
  8. data/examples/area_gallery4.rb +113 -0
  9. data/examples/basic_area2.rb +1 -1
  10. data/examples/basic_button.rb +2 -2
  11. data/examples/basic_entry.rb +2 -2
  12. data/examples/basic_table_progress_bar.rb +13 -3
  13. data/examples/basic_transform.rb +27 -0
  14. data/examples/control_gallery.rb +3 -3
  15. data/examples/dynamic_area.rb +1 -1
  16. data/examples/form.rb +2 -2
  17. data/examples/histogram.rb +118 -0
  18. data/examples/meta_example.rb +71 -20
  19. data/examples/midi_player.rb +8 -10
  20. data/glimmer-dsl-libui.gemspec +0 -0
  21. data/lib/glimmer/dsl/libui/control_expression.rb +0 -2
  22. data/lib/glimmer/dsl/libui/file_expression.rb +5 -1
  23. data/lib/glimmer/dsl/libui/shape_expression.rb +2 -4
  24. data/lib/glimmer/dsl/libui/tab_item_expression.rb +2 -2
  25. data/lib/glimmer/libui/control_proxy/area_proxy.rb +117 -0
  26. data/lib/glimmer/libui/{menu_item_proxy.rb → control_proxy/box/horizontal_box_proxy.rb} +9 -12
  27. data/lib/glimmer/libui/{horizontal_box_proxy.rb → control_proxy/box/vertical_box_proxy.rb} +10 -6
  28. data/lib/glimmer/libui/{box.rb → control_proxy/box.rb} +31 -27
  29. data/lib/glimmer/libui/{button_proxy.rb → control_proxy/button_proxy.rb} +14 -12
  30. data/lib/glimmer/libui/{checkbox_proxy.rb → control_proxy/checkbox_proxy.rb} +14 -12
  31. data/lib/glimmer/libui/control_proxy/color_button_proxy.rb +118 -0
  32. data/lib/glimmer/libui/control_proxy/column/button_column_proxy.rb +76 -0
  33. data/lib/glimmer/libui/control_proxy/column/checkbox_column_proxy.rb +46 -0
  34. data/lib/glimmer/libui/control_proxy/column/checkbox_text_column_proxy.rb +80 -0
  35. data/lib/glimmer/libui/{radio_buttons_proxy.rb → control_proxy/column/image_column_proxy.rb} +14 -13
  36. data/lib/glimmer/libui/control_proxy/column/image_text_column_proxy.rb +48 -0
  37. data/lib/glimmer/libui/control_proxy/column/progress_bar_column_proxy.rb +44 -0
  38. data/lib/glimmer/libui/{checkbox_column_proxy.rb → control_proxy/column/text_column_proxy.rb} +17 -13
  39. data/lib/glimmer/libui/control_proxy/column.rb +55 -0
  40. data/lib/glimmer/libui/control_proxy/combobox_proxy.rb +45 -0
  41. data/lib/glimmer/libui/control_proxy/date_time_picker_proxy/date_picker_proxy.rb +43 -0
  42. data/lib/glimmer/libui/control_proxy/date_time_picker_proxy/time_picker_proxy.rb +43 -0
  43. data/lib/glimmer/libui/control_proxy/date_time_picker_proxy.rb +72 -0
  44. data/lib/glimmer/libui/control_proxy/dual_column.rb +40 -0
  45. data/lib/glimmer/libui/control_proxy/editable_column.rb +46 -0
  46. data/lib/glimmer/libui/control_proxy/editable_combobox_proxy.rb +45 -0
  47. data/lib/glimmer/libui/{dual_column.rb → control_proxy/enableable_column.rb} +18 -10
  48. data/lib/glimmer/libui/control_proxy/font_button_proxy.rb +70 -0
  49. data/lib/glimmer/libui/{form_proxy.rb → control_proxy/form_proxy.rb} +26 -24
  50. data/lib/glimmer/libui/{grid_proxy.rb → control_proxy/grid_proxy.rb} +29 -27
  51. data/lib/glimmer/libui/{group_proxy.rb → control_proxy/group_proxy.rb} +24 -22
  52. data/lib/glimmer/libui/{image_part_proxy.rb → control_proxy/image_part_proxy.rb} +20 -18
  53. data/lib/glimmer/libui/{image_proxy.rb → control_proxy/image_proxy.rb} +32 -30
  54. data/lib/glimmer/libui/{combobox_proxy.rb → control_proxy/label_proxy.rb} +13 -13
  55. data/lib/glimmer/libui/control_proxy/matrix_proxy.rb +147 -0
  56. data/lib/glimmer/libui/{editable_column.rb → control_proxy/menu_item_proxy/about_menu_item_proxy.rb} +13 -16
  57. data/lib/glimmer/libui/control_proxy/menu_item_proxy/check_menu_item_proxy.rb +41 -0
  58. data/lib/glimmer/libui/{date_picker_proxy.rb → control_proxy/menu_item_proxy/preferences_menu_item_proxy.rb} +10 -10
  59. data/lib/glimmer/libui/{quit_menu_item_proxy.rb → control_proxy/menu_item_proxy/quit_menu_item_proxy.rb} +33 -29
  60. data/lib/glimmer/libui/control_proxy/menu_item_proxy/separator_menu_item_proxy.rb +41 -0
  61. data/lib/glimmer/libui/control_proxy/menu_item_proxy.rb +45 -0
  62. data/lib/glimmer/libui/{editable_combobox_proxy.rb → control_proxy/menu_proxy.rb} +13 -13
  63. data/lib/glimmer/libui/{vertical_box_proxy.rb → control_proxy/message_box/msg_box_error_proxy.rb} +9 -6
  64. data/lib/glimmer/libui/{multiline_entry_proxy.rb → control_proxy/message_box/msg_box_proxy.rb} +8 -6
  65. data/lib/glimmer/libui/{time_picker_proxy.rb → control_proxy/message_box.rb} +9 -10
  66. data/lib/glimmer/libui/{rectangle.rb → control_proxy/multiline_entry_proxy/non_wrapping_multiline_entry_proxy.rb} +6 -7
  67. data/lib/glimmer/libui/{progress_bar_column_proxy.rb → control_proxy/multiline_entry_proxy.rb} +10 -11
  68. data/lib/glimmer/libui/control_proxy/path_proxy.rb +190 -0
  69. data/lib/glimmer/libui/control_proxy/radio_buttons_proxy.rb +45 -0
  70. data/lib/glimmer/libui/{button_column_proxy.rb → control_proxy/tab_item_proxy.rb} +37 -40
  71. data/lib/glimmer/libui/control_proxy/table_proxy.rb +182 -0
  72. data/lib/glimmer/libui/control_proxy/transformable.rb +74 -0
  73. data/lib/glimmer/libui/control_proxy/window_proxy.rb +128 -0
  74. data/lib/glimmer/libui/control_proxy.rb +39 -20
  75. data/lib/glimmer/libui/{enableable_column.rb → parent.rb} +7 -15
  76. data/lib/glimmer/libui/{arc.rb → shape/arc.rb} +13 -10
  77. data/lib/glimmer/libui/shape/bezier.rb +38 -0
  78. data/lib/glimmer/libui/{figure.rb → shape/figure.rb} +23 -20
  79. data/lib/glimmer/libui/{line.rb → shape/line.rb} +9 -6
  80. data/lib/glimmer/libui/{bezier.rb → shape/rectangle.rb} +9 -6
  81. data/lib/glimmer/libui/{square.rb → shape/square.rb} +9 -6
  82. data/lib/glimmer/libui/shape.rb +30 -14
  83. data/lib/glimmer/libui.rb +92 -0
  84. data/lib/glimmer-dsl-libui.rb +2 -0
  85. metadata +79 -53
  86. data/lib/glimmer/libui/about_menu_item_proxy.rb +0 -37
  87. data/lib/glimmer/libui/area_proxy.rb +0 -105
  88. data/lib/glimmer/libui/check_menu_item_proxy.rb +0 -37
  89. data/lib/glimmer/libui/checkbox_text_column_proxy.rb +0 -76
  90. data/lib/glimmer/libui/color_button_proxy.rb +0 -64
  91. data/lib/glimmer/libui/column.rb +0 -51
  92. data/lib/glimmer/libui/date_time_picker_proxy.rb +0 -68
  93. data/lib/glimmer/libui/font_button_proxy.rb +0 -68
  94. data/lib/glimmer/libui/image_column_proxy.rb +0 -40
  95. data/lib/glimmer/libui/image_text_column_proxy.rb +0 -44
  96. data/lib/glimmer/libui/label_proxy.rb +0 -41
  97. data/lib/glimmer/libui/menu_proxy.rb +0 -41
  98. data/lib/glimmer/libui/non_wrapping_multiline_entry_proxy.rb +0 -32
  99. data/lib/glimmer/libui/path_proxy.rb +0 -169
  100. data/lib/glimmer/libui/preferences_menu_item_proxy.rb +0 -37
  101. data/lib/glimmer/libui/separator_menu_item_proxy.rb +0 -37
  102. data/lib/glimmer/libui/tab_item_proxy.rb +0 -67
  103. data/lib/glimmer/libui/table_proxy.rb +0 -180
  104. data/lib/glimmer/libui/text_column_proxy.rb +0 -42
  105. data/lib/glimmer/libui/window_proxy.rb +0 -119
@@ -23,17 +23,20 @@ require 'glimmer/libui/shape'
23
23
 
24
24
  module Glimmer
25
25
  module LibUI
26
- class Arc < Shape
27
- parameters :x_center, :y_center, :radius, :start_angle, :sweep, :is_negative
28
-
29
- def draw(area_draw_params)
30
- @args[5] ||= ControlProxy.boolean_to_integer(@args[5], allow_nil: false)
31
- if parent.is_a?(Figure) && parent.x.nil? && parent.y.nil?
32
- ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *@args)
33
- else
34
- ::LibUI.draw_path_arc_to(path_proxy.libui, *@args)
26
+ class Shape
27
+ class Arc < Shape
28
+ parameters :x_center, :y_center, :radius, :start_angle, :sweep, :is_negative
29
+ parameter_defaults 0, 0, 0, 0, 360, false
30
+
31
+ def draw(area_draw_params)
32
+ @args[5] ||= Glimmer::LibUI.boolean_to_integer(@args[5], allow_nil: false)
33
+ if parent.is_a?(Figure) && parent.x.nil? && parent.y.nil?
34
+ ::LibUI.draw_path_new_figure_with_arc(path_proxy.libui, *@args)
35
+ else
36
+ ::LibUI.draw_path_arc_to(path_proxy.libui, *@args)
37
+ end
38
+ super
35
39
  end
36
- super
37
40
  end
38
41
  end
39
42
  end
@@ -0,0 +1,38 @@
1
+ # Copyright (c) 2021 Andy Maleh
2
+ #
3
+ # Permission is hereby granted, free of charge, to any person obtaining
4
+ # a copy of this software and associated documentation files (the
5
+ # "Software"), to deal in the Software without restriction, including
6
+ # without limitation the rights to use, copy, modify, merge, publish,
7
+ # distribute, sublicense, and/or sell copies of the Software, and to
8
+ # permit persons to whom the Software is furnished to do so, subject to
9
+ # the following conditions:
10
+ #
11
+ # The above copyright notice and this permission notice shall be
12
+ # included in all copies or substantial portions of the Software.
13
+ #
14
+ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15
+ # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16
+ # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17
+ # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18
+ # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19
+ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20
+ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21
+
22
+ require 'glimmer/libui/shape'
23
+
24
+ module Glimmer
25
+ module LibUI
26
+ class Shape
27
+ class Bezier < Shape
28
+ parameters :c1_x, :c1_y, :c2_x, :c2_y, :end_x, :end_y
29
+ parameter_defaults 0, 0, 0, 0, 0, 0
30
+
31
+ def draw(area_draw_params)
32
+ ::LibUI.draw_path_bezier_to(path_proxy.libui, *@args)
33
+ super
34
+ end
35
+ end
36
+ end
37
+ end
38
+ end
@@ -23,29 +23,32 @@ require 'glimmer/libui/shape'
23
23
 
24
24
  module Glimmer
25
25
  module LibUI
26
- # Represents a figure consisting of shapes (nested under path)
27
- # Can optionally have `closed true` property (connecting last point to first point automatically)
28
- class Figure < Shape
29
- parameters :x, :y
30
-
31
- def draw(area_draw_params)
32
- ::LibUI.draw_path_new_figure(path_proxy.libui, *@args) unless @args.empty? # TODO if args empty then wait till there is an arc child and it starts the figure
33
- children.each {|child| child.draw(area_draw_params)}
34
- ::LibUI.draw_path_close_figure(path_proxy.libui) if closed?
35
- super
36
- end
26
+ class Shape
27
+ # Represents a figure consisting of shapes (nested under path)
28
+ # Can optionally have `closed true` property (connecting last point to first point automatically)
29
+ class Figure < Shape
30
+ parameters :x, :y
31
+ parameter_defaults nil, nil
37
32
 
38
- def closed(value = nil)
39
- if value.nil?
40
- @closed
41
- else
42
- @closed = value
43
- area_proxy&.queue_redraw_all
33
+ def draw(area_draw_params)
34
+ ::LibUI.draw_path_new_figure(path_proxy.libui, *@args) unless @args.compact.empty? # TODO if args empty then wait till there is an arc child and it starts the figure
35
+ children.dup.each {|child| child.draw(area_draw_params)}
36
+ ::LibUI.draw_path_close_figure(path_proxy.libui) if closed?
37
+ super
38
+ end
39
+
40
+ def closed(value = nil)
41
+ if value.nil?
42
+ @closed
43
+ else
44
+ @closed = value
45
+ area_proxy&.queue_redraw_all
46
+ end
44
47
  end
48
+ alias closed= closed
49
+ alias set_closed closed
50
+ alias closed? closed
45
51
  end
46
- alias closed= closed
47
- alias set_closed closed
48
- alias closed? closed
49
52
  end
50
53
  end
51
54
  end
@@ -23,12 +23,15 @@ require 'glimmer/libui/shape'
23
23
 
24
24
  module Glimmer
25
25
  module LibUI
26
- class Line < Shape
27
- parameters :x, :y
28
-
29
- def draw(area_draw_params)
30
- ::LibUI.draw_path_line_to(path_proxy.libui, *@args)
31
- super
26
+ class Shape
27
+ class Line < Shape
28
+ parameters :x, :y
29
+ parameter_defaults 0, 0
30
+
31
+ def draw(area_draw_params)
32
+ ::LibUI.draw_path_line_to(path_proxy.libui, *@args)
33
+ super
34
+ end
32
35
  end
33
36
  end
34
37
  end
@@ -23,12 +23,15 @@ require 'glimmer/libui/shape'
23
23
 
24
24
  module Glimmer
25
25
  module LibUI
26
- class Bezier < Shape
27
- parameters :c1_x, :c1_y, :c2_x, :c2_y, :end_x, :end_y
28
-
29
- def draw(area_draw_params)
30
- ::LibUI.draw_path_bezier_to(path_proxy.libui, *@args)
31
- super
26
+ class Shape
27
+ class Rectangle < Shape
28
+ parameters :x, :y, :width, :height
29
+ parameter_defaults 0, 0, 0, 0
30
+
31
+ def draw(area_draw_params)
32
+ ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args)
33
+ super
34
+ end
32
35
  end
33
36
  end
34
37
  end
@@ -23,12 +23,15 @@ require 'glimmer/libui/shape'
23
23
 
24
24
  module Glimmer
25
25
  module LibUI
26
- class Square < Shape
27
- parameters :x, :y, :length
28
-
29
- def draw(area_draw_params)
30
- ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args, length)
31
- super
26
+ class Shape
27
+ class Square < Shape
28
+ parameters :x, :y, :length
29
+ parameter_defaults 0, 0, 0
30
+
31
+ def draw(area_draw_params)
32
+ ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args, length)
33
+ super
34
+ end
32
35
  end
33
36
  end
34
37
  end
@@ -19,13 +19,17 @@
19
19
  # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20
20
  # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21
21
 
22
+ require 'glimmer/libui/parent'
23
+ require 'glimmer/libui/control_proxy/area_proxy'
24
+ require 'glimmer/libui/control_proxy/path_proxy'
25
+
22
26
  module Glimmer
23
27
  module LibUI
24
28
  # Represents LibUI lightweight shape objects nested under path (e.g. line, rectangle, arc, bezier)
25
29
  class Shape
26
30
  class << self
27
31
  def exists?(keyword)
28
- Glimmer::LibUI.constants.include?(constant_symbol(keyword)) and
32
+ Shape.constants.include?(constant_symbol(keyword)) and
29
33
  shape_class(keyword).respond_to?(:ancestors) and
30
34
  shape_class(keyword).ancestors.include?(Shape)
31
35
  end
@@ -35,7 +39,7 @@ module Glimmer
35
39
  end
36
40
 
37
41
  def shape_class(keyword)
38
- Glimmer::LibUI.const_get(constant_symbol(keyword))
42
+ Shape.const_get(constant_symbol(keyword))
39
43
  end
40
44
 
41
45
  def parameters(*params)
@@ -46,13 +50,21 @@ module Glimmer
46
50
  end
47
51
  end
48
52
 
49
- private
53
+ def parameter_defaults(*defaults)
54
+ if defaults.empty?
55
+ @parameter_defaults
56
+ else
57
+ @parameter_defaults = defaults
58
+ end
59
+ end
50
60
 
51
61
  def constant_symbol(keyword)
52
62
  "#{keyword.camelcase(:upper)}".to_sym
53
63
  end
54
64
  end
55
65
 
66
+ include Parent
67
+
56
68
  attr_reader :parent, :args, :keyword, :block
57
69
 
58
70
  def initialize(keyword, parent, args, &block)
@@ -60,6 +72,7 @@ module Glimmer
60
72
  @parent = parent
61
73
  @args = args
62
74
  @block = block
75
+ set_parameter_defaults
63
76
  post_add_content if @block.nil?
64
77
  end
65
78
 
@@ -68,30 +81,25 @@ module Glimmer
68
81
  @parent&.post_initialize_child(self)
69
82
  end
70
83
 
71
- # Subclasses may override to perform post initialization work on an added child (normally must call super)
72
- def post_initialize_child(child)
73
- children << child
74
- end
75
-
76
- def children
77
- @children ||= []
78
- end
79
-
80
84
  # Subclasses must override to perform draw work and call super afterwards to ensure calling destroy when semi-declarative in an on_draw method
81
85
  def draw(area_draw_params)
82
86
  destroy if area_proxy.nil?
83
87
  end
84
88
 
89
+ def redraw
90
+ area_proxy&.queue_redraw_all
91
+ end
92
+
85
93
  def destroy
86
94
  @parent.children.delete(self)
87
95
  end
88
96
 
89
97
  def area_proxy
90
- find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(AreaProxy) }
98
+ find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(ControlProxy::AreaProxy) }
91
99
  end
92
100
 
93
101
  def path_proxy
94
- find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(PathProxy) }
102
+ find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(ControlProxy::PathProxy) }
95
103
  end
96
104
 
97
105
  def respond_to?(method_name, *args, &block)
@@ -117,6 +125,12 @@ module Glimmer
117
125
 
118
126
  private
119
127
 
128
+ def set_parameter_defaults
129
+ self.class.parameter_defaults.each_with_index do |default, i|
130
+ @args[i] ||= default
131
+ end
132
+ end
133
+
120
134
  def find_parent_in_ancestors(&condition)
121
135
  found = self
122
136
  until condition.call(found)
@@ -127,3 +141,5 @@ module Glimmer
127
141
  end
128
142
  end
129
143
  end
144
+
145
+ Dir[File.expand_path("./#{File.basename(__FILE__, '.rb')}/*.rb", __dir__)].each {|f| require f}
@@ -0,0 +1,92 @@
1
+ # Copyright (c) 2021 Andy Maleh
2
+ #
3
+ # Permission is hereby granted, free of charge, to any person obtaining
4
+ # a copy of this software and associated documentation files (the
5
+ # "Software"), to deal in the Software without restriction, including
6
+ # without limitation the rights to use, copy, modify, merge, publish,
7
+ # distribute, sublicense, and/or sell copies of the Software, and to
8
+ # permit persons to whom the Software is furnished to do so, subject to
9
+ # the following conditions:
10
+ #
11
+ # The above copyright notice and this permission notice shall be
12
+ # included in all copies or substantial portions of the Software.
13
+ #
14
+ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15
+ # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16
+ # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17
+ # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18
+ # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19
+ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20
+ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21
+
22
+ module Glimmer
23
+ module LibUI
24
+ class << self
25
+ def integer_to_boolean(int, allow_nil: true)
26
+ int.nil? ? (allow_nil ? nil : false) : int == 1
27
+ end
28
+
29
+ def boolean_to_integer(bool, allow_nil: true)
30
+ bool.nil? ? (allow_nil ? nil : 0) : (bool ? 1 : 0)
31
+ end
32
+
33
+ def interpret_color(value)
34
+ if value.is_a?(Array) && value.last.is_a?(Hash)
35
+ options = value.last
36
+ value = value[0...-1]
37
+ end
38
+ value = value.first if value.is_a?(Array) && value.size == 1
39
+ value = value.to_s if value.is_a?(Symbol)
40
+ value = value[:color] if value.is_a?(Hash) && value[:color]
41
+ result = if value.is_a?(Array)
42
+ old_value = value
43
+ value = {
44
+ r: value[0],
45
+ g: value[1],
46
+ b: value[2],
47
+ }
48
+ value[:a] = value[3] unless value[3].nil?
49
+ value
50
+ elsif value.is_a?(Hash)
51
+ old_value = value
52
+ value = old_value.dup
53
+ value[:r] = value.delete(:red) if value[:red]
54
+ value[:g] = value.delete(:green) if value[:green]
55
+ value[:b] = value.delete(:blue) if value[:blue]
56
+ value[:a] = value.delete(:alpha) if value[:alpha]
57
+ value
58
+ elsif value.is_a?(String) && !value.start_with?('0x') && !value.downcase.match(/^((([1-9a-f]){6})|(([1-9a-f]){3}))$/)
59
+ color = Color::RGB.extract_colors(value).first
60
+ color.nil? ? {} : {
61
+ r: color.red,
62
+ g: color.green,
63
+ b: color.blue,
64
+ }
65
+ else
66
+ hex_to_rgb(value)
67
+ end
68
+ result.merge!(options) if options
69
+ result
70
+ end
71
+
72
+ def hex_to_rgb(value)
73
+ if value.is_a?(String)
74
+ if !value.start_with?('0x')
75
+ value = value.chars.map {|char| [char, char]}.flatten.join if value.length == 3
76
+ value = "0x#{value}"
77
+ end
78
+ value = value.to_i(16)
79
+ end
80
+ if value.is_a?(Integer)
81
+ hex_value = value
82
+ value = {
83
+ r: ((hex_value >> 16) & 0xFF),
84
+ g: ((hex_value >> 8) & 0xFF),
85
+ b: (hex_value & 0xFF),
86
+ }
87
+ end
88
+ value
89
+ end
90
+ end
91
+ end
92
+ end
@@ -26,6 +26,7 @@ require 'glimmer'
26
26
  # require 'logging'
27
27
  # require 'puts_debuggerer' if ENV['pd'].to_s.downcase == 'true'
28
28
  # require 'super_module'
29
+ require 'color'
29
30
  require 'os'
30
31
  require 'array_include_methods'
31
32
  require 'libui'
@@ -34,6 +35,7 @@ require 'libui'
34
35
  # require 'ext/glimmer/config'
35
36
  # require 'ext/glimmer'
36
37
  require 'glimmer/dsl/libui/dsl'
38
+ require 'glimmer/libui'
37
39
  Glimmer::Config.loop_max_count = -1
38
40
  Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
39
41
  method = method_symbol.to_s
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: glimmer-dsl-libui
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.1.7
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-09-29 00:00:00.000000000 Z
11
+ date: 2021-10-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: glimmer
@@ -44,6 +44,20 @@ dependencies:
44
44
  - - "<"
45
45
  - !ruby/object:Gem::Version
46
46
  version: 2.0.0
47
+ - !ruby/object:Gem::Dependency
48
+ name: color
49
+ requirement: !ruby/object:Gem::Requirement
50
+ requirements:
51
+ - - "~>"
52
+ - !ruby/object:Gem::Version
53
+ version: '1.8'
54
+ type: :runtime
55
+ prerelease: false
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ requirements:
58
+ - - "~>"
59
+ - !ruby/object:Gem::Version
60
+ version: '1.8'
47
61
  - !ruby/object:Gem::Dependency
48
62
  name: libui
49
63
  requirement: !ruby/object:Gem::Requirement
@@ -195,6 +209,9 @@ files:
195
209
  - bin/girb
196
210
  - bin/girb_runner.rb
197
211
  - examples/area_gallery.rb
212
+ - examples/area_gallery2.rb
213
+ - examples/area_gallery3.rb
214
+ - examples/area_gallery4.rb
198
215
  - examples/basic_area.rb
199
216
  - examples/basic_area2.rb
200
217
  - examples/basic_button.rb
@@ -206,6 +223,7 @@ files:
206
223
  - examples/basic_table_image.rb
207
224
  - examples/basic_table_image_text.rb
208
225
  - examples/basic_table_progress_bar.rb
226
+ - examples/basic_transform.rb
209
227
  - examples/basic_window.rb
210
228
  - examples/basic_window2.rb
211
229
  - examples/color_button.rb
@@ -219,6 +237,7 @@ files:
219
237
  - examples/form.rb
220
238
  - examples/form_table.rb
221
239
  - examples/grid.rb
240
+ - examples/histogram.rb
222
241
  - examples/meta_example.rb
223
242
  - examples/midi_player.rb
224
243
  - examples/simple_notepad.rb
@@ -234,58 +253,65 @@ files:
234
253
  - lib/glimmer/dsl/libui/shape_expression.rb
235
254
  - lib/glimmer/dsl/libui/tab_item_expression.rb
236
255
  - lib/glimmer/fiddle_consumer.rb
237
- - lib/glimmer/libui/about_menu_item_proxy.rb
238
- - lib/glimmer/libui/arc.rb
239
- - lib/glimmer/libui/area_proxy.rb
240
- - lib/glimmer/libui/bezier.rb
241
- - lib/glimmer/libui/box.rb
242
- - lib/glimmer/libui/button_column_proxy.rb
243
- - lib/glimmer/libui/button_proxy.rb
244
- - lib/glimmer/libui/check_menu_item_proxy.rb
245
- - lib/glimmer/libui/checkbox_column_proxy.rb
246
- - lib/glimmer/libui/checkbox_proxy.rb
247
- - lib/glimmer/libui/checkbox_text_column_proxy.rb
248
- - lib/glimmer/libui/color_button_proxy.rb
249
- - lib/glimmer/libui/column.rb
250
- - lib/glimmer/libui/combobox_proxy.rb
256
+ - lib/glimmer/libui.rb
251
257
  - lib/glimmer/libui/control_proxy.rb
252
- - lib/glimmer/libui/date_picker_proxy.rb
253
- - lib/glimmer/libui/date_time_picker_proxy.rb
254
- - lib/glimmer/libui/dual_column.rb
255
- - lib/glimmer/libui/editable_column.rb
256
- - lib/glimmer/libui/editable_combobox_proxy.rb
257
- - lib/glimmer/libui/enableable_column.rb
258
- - lib/glimmer/libui/figure.rb
259
- - lib/glimmer/libui/font_button_proxy.rb
260
- - lib/glimmer/libui/form_proxy.rb
261
- - lib/glimmer/libui/grid_proxy.rb
262
- - lib/glimmer/libui/group_proxy.rb
263
- - lib/glimmer/libui/horizontal_box_proxy.rb
264
- - lib/glimmer/libui/image_column_proxy.rb
265
- - lib/glimmer/libui/image_part_proxy.rb
266
- - lib/glimmer/libui/image_proxy.rb
267
- - lib/glimmer/libui/image_text_column_proxy.rb
268
- - lib/glimmer/libui/label_proxy.rb
269
- - lib/glimmer/libui/line.rb
270
- - lib/glimmer/libui/menu_item_proxy.rb
271
- - lib/glimmer/libui/menu_proxy.rb
272
- - lib/glimmer/libui/multiline_entry_proxy.rb
273
- - lib/glimmer/libui/non_wrapping_multiline_entry_proxy.rb
274
- - lib/glimmer/libui/path_proxy.rb
275
- - lib/glimmer/libui/preferences_menu_item_proxy.rb
276
- - lib/glimmer/libui/progress_bar_column_proxy.rb
277
- - lib/glimmer/libui/quit_menu_item_proxy.rb
278
- - lib/glimmer/libui/radio_buttons_proxy.rb
279
- - lib/glimmer/libui/rectangle.rb
280
- - lib/glimmer/libui/separator_menu_item_proxy.rb
258
+ - lib/glimmer/libui/control_proxy/area_proxy.rb
259
+ - lib/glimmer/libui/control_proxy/box.rb
260
+ - lib/glimmer/libui/control_proxy/box/horizontal_box_proxy.rb
261
+ - lib/glimmer/libui/control_proxy/box/vertical_box_proxy.rb
262
+ - lib/glimmer/libui/control_proxy/button_proxy.rb
263
+ - lib/glimmer/libui/control_proxy/checkbox_proxy.rb
264
+ - lib/glimmer/libui/control_proxy/color_button_proxy.rb
265
+ - lib/glimmer/libui/control_proxy/column.rb
266
+ - lib/glimmer/libui/control_proxy/column/button_column_proxy.rb
267
+ - lib/glimmer/libui/control_proxy/column/checkbox_column_proxy.rb
268
+ - lib/glimmer/libui/control_proxy/column/checkbox_text_column_proxy.rb
269
+ - lib/glimmer/libui/control_proxy/column/image_column_proxy.rb
270
+ - lib/glimmer/libui/control_proxy/column/image_text_column_proxy.rb
271
+ - lib/glimmer/libui/control_proxy/column/progress_bar_column_proxy.rb
272
+ - lib/glimmer/libui/control_proxy/column/text_column_proxy.rb
273
+ - lib/glimmer/libui/control_proxy/combobox_proxy.rb
274
+ - lib/glimmer/libui/control_proxy/date_time_picker_proxy.rb
275
+ - lib/glimmer/libui/control_proxy/date_time_picker_proxy/date_picker_proxy.rb
276
+ - lib/glimmer/libui/control_proxy/date_time_picker_proxy/time_picker_proxy.rb
277
+ - lib/glimmer/libui/control_proxy/dual_column.rb
278
+ - lib/glimmer/libui/control_proxy/editable_column.rb
279
+ - lib/glimmer/libui/control_proxy/editable_combobox_proxy.rb
280
+ - lib/glimmer/libui/control_proxy/enableable_column.rb
281
+ - lib/glimmer/libui/control_proxy/font_button_proxy.rb
282
+ - lib/glimmer/libui/control_proxy/form_proxy.rb
283
+ - lib/glimmer/libui/control_proxy/grid_proxy.rb
284
+ - lib/glimmer/libui/control_proxy/group_proxy.rb
285
+ - lib/glimmer/libui/control_proxy/image_part_proxy.rb
286
+ - lib/glimmer/libui/control_proxy/image_proxy.rb
287
+ - lib/glimmer/libui/control_proxy/label_proxy.rb
288
+ - lib/glimmer/libui/control_proxy/matrix_proxy.rb
289
+ - lib/glimmer/libui/control_proxy/menu_item_proxy.rb
290
+ - lib/glimmer/libui/control_proxy/menu_item_proxy/about_menu_item_proxy.rb
291
+ - lib/glimmer/libui/control_proxy/menu_item_proxy/check_menu_item_proxy.rb
292
+ - lib/glimmer/libui/control_proxy/menu_item_proxy/preferences_menu_item_proxy.rb
293
+ - lib/glimmer/libui/control_proxy/menu_item_proxy/quit_menu_item_proxy.rb
294
+ - lib/glimmer/libui/control_proxy/menu_item_proxy/separator_menu_item_proxy.rb
295
+ - lib/glimmer/libui/control_proxy/menu_proxy.rb
296
+ - lib/glimmer/libui/control_proxy/message_box.rb
297
+ - lib/glimmer/libui/control_proxy/message_box/msg_box_error_proxy.rb
298
+ - lib/glimmer/libui/control_proxy/message_box/msg_box_proxy.rb
299
+ - lib/glimmer/libui/control_proxy/multiline_entry_proxy.rb
300
+ - lib/glimmer/libui/control_proxy/multiline_entry_proxy/non_wrapping_multiline_entry_proxy.rb
301
+ - lib/glimmer/libui/control_proxy/path_proxy.rb
302
+ - lib/glimmer/libui/control_proxy/radio_buttons_proxy.rb
303
+ - lib/glimmer/libui/control_proxy/tab_item_proxy.rb
304
+ - lib/glimmer/libui/control_proxy/table_proxy.rb
305
+ - lib/glimmer/libui/control_proxy/transformable.rb
306
+ - lib/glimmer/libui/control_proxy/window_proxy.rb
307
+ - lib/glimmer/libui/parent.rb
281
308
  - lib/glimmer/libui/shape.rb
282
- - lib/glimmer/libui/square.rb
283
- - lib/glimmer/libui/tab_item_proxy.rb
284
- - lib/glimmer/libui/table_proxy.rb
285
- - lib/glimmer/libui/text_column_proxy.rb
286
- - lib/glimmer/libui/time_picker_proxy.rb
287
- - lib/glimmer/libui/vertical_box_proxy.rb
288
- - lib/glimmer/libui/window_proxy.rb
309
+ - lib/glimmer/libui/shape/arc.rb
310
+ - lib/glimmer/libui/shape/bezier.rb
311
+ - lib/glimmer/libui/shape/figure.rb
312
+ - lib/glimmer/libui/shape/line.rb
313
+ - lib/glimmer/libui/shape/rectangle.rb
314
+ - lib/glimmer/libui/shape/square.rb
289
315
  homepage: http://github.com/AndyObtiva/glimmer-dsl-libui
290
316
  licenses:
291
317
  - MIT
@@ -306,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
306
332
  - !ruby/object:Gem::Version
307
333
  version: '0'
308
334
  requirements: []
309
- rubygems_version: 3.2.22
335
+ rubygems_version: 3.2.28
310
336
  signing_key:
311
337
  specification_version: 4
312
338
  summary: Glimmer DSL for LibUI
@@ -1,37 +0,0 @@
1
- # Copyright (c) 2021 Andy Maleh
2
- #
3
- # Permission is hereby granted, free of charge, to any person obtaining
4
- # a copy of this software and associated documentation files (the
5
- # "Software"), to deal in the Software without restriction, including
6
- # without limitation the rights to use, copy, modify, merge, publish,
7
- # distribute, sublicense, and/or sell copies of the Software, and to
8
- # permit persons to whom the Software is furnished to do so, subject to
9
- # the following conditions:
10
- #
11
- # The above copyright notice and this permission notice shall be
12
- # included in all copies or substantial portions of the Software.
13
- #
14
- # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15
- # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16
- # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17
- # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18
- # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19
- # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20
- # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
21
-
22
- require 'glimmer/libui/menu_item_proxy'
23
-
24
- module Glimmer
25
- module LibUI
26
- # Proxy for LibUI about menu item object
27
- #
28
- # Follows the Proxy Design Pattern
29
- class AboutMenuItemProxy < MenuItemProxy
30
- private
31
-
32
- def build_control
33
- @libui = @parent_proxy.append_about_item(*@args)
34
- end
35
- end
36
- end
37
- end