shoes-swt 4.0.0.pre2 → 4.0.0.pre3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +5 -200
- data/Rakefile +1 -0
- data/bin/shoes-swt +11 -0
- data/lib/shoes/swt.rb +5 -2
- data/lib/shoes/swt/animation.rb +2 -2
- data/lib/shoes/swt/app.rb +45 -50
- data/lib/shoes/swt/arc.rb +7 -7
- data/lib/shoes/swt/background.rb +1 -1
- data/lib/shoes/swt/border.rb +1 -2
- data/lib/shoes/swt/click_listener.rb +70 -0
- data/lib/shoes/swt/color.rb +5 -5
- data/lib/shoes/swt/common/clickable.rb +2 -53
- data/lib/shoes/swt/common/fill.rb +1 -1
- data/lib/shoes/swt/common/painter.rb +7 -7
- data/lib/shoes/swt/common/painter_updates_position.rb +2 -2
- data/lib/shoes/swt/common/remove.rb +2 -3
- data/lib/shoes/swt/common/resource.rb +1 -1
- data/lib/shoes/swt/common/selection_listener.rb +14 -14
- data/lib/shoes/swt/common/stroke.rb +1 -2
- data/lib/shoes/swt/common/update_position.rb +1 -1
- data/lib/shoes/swt/dialog.rb +3 -45
- data/lib/shoes/swt/disposed_protection.rb +1 -1
- data/lib/shoes/swt/download.rb +0 -1
- data/lib/shoes/swt/font.rb +4 -4
- data/lib/shoes/swt/generate-backend.rb +9 -0
- data/lib/shoes/swt/gradient.rb +17 -16
- data/lib/shoes/swt/image.rb +3 -5
- data/lib/shoes/swt/image_pattern.rb +2 -2
- data/lib/shoes/swt/input_box.rb +3 -3
- data/lib/shoes/swt/key_listener.rb +6 -6
- data/lib/shoes/swt/line.rb +4 -24
- data/lib/shoes/swt/link.rb +2 -2
- data/lib/shoes/swt/link_segment.rb +3 -3
- data/lib/shoes/swt/list_box.rb +4 -4
- data/lib/shoes/swt/mouse_move_listener.rb +6 -5
- data/lib/shoes/swt/oval.rb +2 -3
- data/lib/shoes/swt/packager.rb +82 -0
- data/lib/shoes/swt/progress.rb +2 -2
- data/lib/shoes/swt/radio.rb +0 -2
- data/lib/shoes/swt/radio_group.rb +54 -54
- data/lib/shoes/swt/rect_painter.rb +7 -7
- data/lib/shoes/swt/redrawing_aspect.rb +32 -34
- data/lib/shoes/swt/shape.rb +1 -1
- data/lib/shoes/swt/shoes_layout.rb +5 -2
- data/lib/shoes/swt/slot.rb +2 -3
- data/lib/shoes/swt/sound.rb +17 -22
- data/lib/shoes/swt/star.rb +30 -8
- data/lib/shoes/swt/swt_button.rb +3 -2
- data/lib/shoes/swt/text_block.rb +3 -3
- data/lib/shoes/swt/text_block/cursor_painter.rb +2 -2
- data/lib/shoes/swt/text_block/fitter.rb +5 -3
- data/lib/shoes/swt/text_block/painter.rb +9 -9
- data/lib/shoes/swt/text_block/text_font_factory.rb +3 -3
- data/lib/shoes/swt/text_block/text_segment.rb +9 -9
- data/lib/shoes/swt/text_block/text_segment_collection.rb +2 -0
- data/lib/shoes/swt/text_block/text_style_factory.rb +9 -3
- data/lib/shoes/swt/timer.rb +1 -1
- data/lib/shoes/swt/version.rb +1 -1
- data/shoes-swt.gemspec +7 -6
- data/spec/shoes/cli_spec.rb +2 -2
- data/spec/{swt_shoes → shoes/swt}/animation_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/app_spec.rb +36 -3
- data/spec/{swt_shoes → shoes/swt}/arc_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/background_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/border_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/button_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/check_spec.rb +1 -1
- data/spec/shoes/swt/click_listener_spec.rb +162 -0
- data/spec/{swt_shoes → shoes/swt}/color_factory_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/color_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/common/painter_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/common/remove_spec.rb +4 -11
- data/spec/{swt_shoes → shoes/swt}/configuration_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/dialog_spec.rb +1 -7
- data/spec/{swt_shoes → shoes/swt}/disposed_protection_spec.rb +0 -0
- data/spec/{swt_shoes → shoes/swt}/flow_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/font_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/gradient_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/image_pattern_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/image_spec.rb +4 -3
- data/spec/{swt_shoes → shoes/swt}/input_box_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/integration_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/key_listener_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/line_spec.rb +4 -8
- data/spec/{swt_shoes → shoes/swt}/link_segment_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/link_spec.rb +3 -10
- data/spec/{swt_shoes → shoes/swt}/list_box_spec.rb +5 -3
- data/spec/{swt_shoes → shoes/swt}/minimal.png +0 -0
- data/spec/{swt_shoes → shoes/swt}/mouse_move_listener_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/oval_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/progress_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/radio_group_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/radio_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/rect_painter_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/rect_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/shape_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/shared_examples/button.rb +0 -0
- data/spec/shoes/swt/shared_examples/clickable.rb +13 -0
- data/spec/{swt_shoes → shoes/swt}/shared_examples/movable.rb +0 -0
- data/spec/{swt_shoes → shoes/swt}/shared_examples/paintable.rb +0 -0
- data/spec/{swt_shoes → shoes/swt}/shared_examples/painter.rb +0 -0
- data/spec/{swt_shoes → shoes/swt}/shared_examples/pattern.rb +0 -0
- data/spec/{swt_shoes → shoes/swt}/shared_examples/removable.rb +1 -3
- data/spec/{swt_shoes → shoes/swt}/shared_examples/swt_app_context.rb +11 -3
- data/spec/{swt_shoes → shoes/swt}/shared_examples/visibility.rb +0 -0
- data/spec/{swt_shoes → shoes/swt}/shell_control_listener_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/slot_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/spec_helper.rb +0 -1
- data/spec/{swt_shoes → shoes/swt}/star_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/text_block/centered_text_segment_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/text_block/cursor_painter_spec.rb +8 -4
- data/spec/{swt_shoes → shoes/swt}/text_block/fitter_spec.rb +5 -5
- data/spec/{swt_shoes → shoes/swt}/text_block/painter_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/text_block/text_font_factory_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/text_block/text_segment_collection_spec.rb +7 -2
- data/spec/{swt_shoes → shoes/swt}/text_block/text_segment_spec.rb +1 -1
- data/spec/{swt_shoes → shoes/swt}/text_block_spec.rb +2 -5
- data/spec/spec_helper.rb +7 -3
- metadata +132 -331
- data/CHANGELOG +0 -84
- data/Gemfile +0 -24
- data/Guardfile +0 -11
- data/manifests/common.rb +0 -34
- data/manifests/shoes-swt.rb +0 -29
- data/spec/code_coverage.rb +0 -14
- data/spec/shoes/animation_spec.rb +0 -65
- data/spec/shoes/app_spec.rb +0 -484
- data/spec/shoes/arc_spec.rb +0 -51
- data/spec/shoes/background_spec.rb +0 -53
- data/spec/shoes/border_spec.rb +0 -47
- data/spec/shoes/builtin_methods_spec.rb +0 -110
- data/spec/shoes/button_spec.rb +0 -44
- data/spec/shoes/check_spec.rb +0 -35
- data/spec/shoes/color_spec.rb +0 -408
- data/spec/shoes/common/inspect_spec.rb +0 -26
- data/spec/shoes/common/remove_spec.rb +0 -38
- data/spec/shoes/common/style_normalizer_spec.rb +0 -28
- data/spec/shoes/common/style_spec.rb +0 -147
- data/spec/shoes/configuration_spec.rb +0 -36
- data/spec/shoes/constants_spec.rb +0 -38
- data/spec/shoes/dialog_spec.rb +0 -163
- data/spec/shoes/dimension_spec.rb +0 -407
- data/spec/shoes/dimensions_spec.rb +0 -837
- data/spec/shoes/download_spec.rb +0 -142
- data/spec/shoes/flow_spec.rb +0 -133
- data/spec/shoes/font_spec.rb +0 -37
- data/spec/shoes/framework_learning_spec.rb +0 -30
- data/spec/shoes/gradient_spec.rb +0 -32
- data/spec/shoes/helpers/fake_element.rb +0 -17
- data/spec/shoes/helpers/inspect_helpers.rb +0 -5
- data/spec/shoes/helpers/sample17_helper.rb +0 -66
- data/spec/shoes/image_spec.rb +0 -49
- data/spec/shoes/images/shoe.jpg +0 -0
- data/spec/shoes/input_box_spec.rb +0 -80
- data/spec/shoes/integration_spec.rb +0 -20
- data/spec/shoes/internal_app_spec.rb +0 -141
- data/spec/shoes/keypress_spec.rb +0 -11
- data/spec/shoes/keyrelease_spec.rb +0 -12
- data/spec/shoes/line_spec.rb +0 -49
- data/spec/shoes/link_spec.rb +0 -105
- data/spec/shoes/list_box_spec.rb +0 -74
- data/spec/shoes/logger/ruby_spec.rb +0 -8
- data/spec/shoes/logger_spec.rb +0 -45
- data/spec/shoes/oval_spec.rb +0 -24
- data/spec/shoes/point_spec.rb +0 -71
- data/spec/shoes/progress_spec.rb +0 -54
- data/spec/shoes/radio_spec.rb +0 -32
- data/spec/shoes/rect_spec.rb +0 -39
- data/spec/shoes/renamed_delegate_spec.rb +0 -70
- data/spec/shoes/shape_spec.rb +0 -95
- data/spec/shoes/shared_examples/button.rb +0 -6
- data/spec/shoes/shared_examples/changeable.rb +0 -26
- data/spec/shoes/shared_examples/clickable.rb +0 -5
- data/spec/shoes/shared_examples/common_methods.rb +0 -35
- data/spec/shoes/shared_examples/dimensions.rb +0 -32
- data/spec/shoes/shared_examples/dsl.rb +0 -44
- data/spec/shoes/shared_examples/dsl/animate.rb +0 -29
- data/spec/shoes/shared_examples/dsl/arc.rb +0 -45
- data/spec/shoes/shared_examples/dsl/background.rb +0 -26
- data/spec/shoes/shared_examples/dsl/border.rb +0 -10
- data/spec/shoes/shared_examples/dsl/button.rb +0 -5
- data/spec/shoes/shared_examples/dsl/cap.rb +0 -6
- data/spec/shoes/shared_examples/dsl/check.rb +0 -11
- data/spec/shoes/shared_examples/dsl/edit_box.rb +0 -8
- data/spec/shoes/shared_examples/dsl/edit_line.rb +0 -8
- data/spec/shoes/shared_examples/dsl/editable_element.rb +0 -29
- data/spec/shoes/shared_examples/dsl/fill.rb +0 -27
- data/spec/shoes/shared_examples/dsl/flow.rb +0 -15
- data/spec/shoes/shared_examples/dsl/gradient.rb +0 -62
- data/spec/shoes/shared_examples/dsl/image.rb +0 -21
- data/spec/shoes/shared_examples/dsl/line.rb +0 -9
- data/spec/shoes/shared_examples/dsl/nofill.rb +0 -6
- data/spec/shoes/shared_examples/dsl/nostroke.rb +0 -6
- data/spec/shoes/shared_examples/dsl/oval.rb +0 -88
- data/spec/shoes/shared_examples/dsl/pattern.rb +0 -34
- data/spec/shoes/shared_examples/dsl/progress.rb +0 -7
- data/spec/shoes/shared_examples/dsl/rect.rb +0 -92
- data/spec/shoes/shared_examples/dsl/rgb.rb +0 -26
- data/spec/shoes/shared_examples/dsl/shape.rb +0 -21
- data/spec/shoes/shared_examples/dsl/star.rb +0 -48
- data/spec/shoes/shared_examples/dsl/stroke.rb +0 -30
- data/spec/shoes/shared_examples/dsl/strokewidth.rb +0 -19
- data/spec/shoes/shared_examples/dsl/style.rb +0 -32
- data/spec/shoes/shared_examples/dsl/text_elements.rb +0 -81
- data/spec/shoes/shared_examples/dsl/video.rb +0 -5
- data/spec/shoes/shared_examples/dsl_app_context.rb +0 -8
- data/spec/shoes/shared_examples/hover_leave.rb +0 -11
- data/spec/shoes/shared_examples/parent.rb +0 -6
- data/spec/shoes/shared_examples/scroll.rb +0 -41
- data/spec/shoes/shared_examples/shared_element_method.rb +0 -60
- data/spec/shoes/shared_examples/slot.rb +0 -331
- data/spec/shoes/shared_examples/state.rb +0 -19
- data/spec/shoes/shared_examples/style.rb +0 -82
- data/spec/shoes/slot_spec.rb +0 -130
- data/spec/shoes/sound_spec.rb +0 -15
- data/spec/shoes/span_spec.rb +0 -112
- data/spec/shoes/spec_helper.rb +0 -24
- data/spec/shoes/stack_spec.rb +0 -79
- data/spec/shoes/star_spec.rb +0 -31
- data/spec/shoes/text_block_dimensions_spec.rb +0 -75
- data/spec/shoes/text_block_spec.rb +0 -270
- data/spec/shoes/url_spec.rb +0 -68
- data/spec/shoes/widget_spec.rb +0 -70
- data/spec/shoes_spec.rb +0 -44
- data/spec/swt_shoes/shared_examples/clickable.rb +0 -85
- data/spec/swt_shoes/sound.rb +0 -10
data/lib/shoes/swt/progress.rb
CHANGED
@@ -18,7 +18,7 @@ class Shoes
|
|
18
18
|
@real.minimum = 0
|
19
19
|
@real.maximum = 100
|
20
20
|
|
21
|
-
if @dsl.element_width
|
21
|
+
if @dsl.element_width && @dsl.element_height
|
22
22
|
@real.setSize dsl.element_width, dsl.element_height
|
23
23
|
else
|
24
24
|
@real.pack
|
@@ -28,7 +28,7 @@ class Shoes
|
|
28
28
|
end
|
29
29
|
|
30
30
|
def fraction=(value)
|
31
|
-
@real.selection = (value*100).to_i unless @real.disposed?
|
31
|
+
@real.selection = (value * 100).to_i unless @real.disposed?
|
32
32
|
end
|
33
33
|
end
|
34
34
|
end
|
data/lib/shoes/swt/radio.rb
CHANGED
@@ -1,54 +1,54 @@
|
|
1
|
-
class Shoes
|
2
|
-
module Swt
|
3
|
-
# In Swt radio groups are managed by composites which occupy space
|
4
|
-
# and can interfere with users interacting with other controls. Here
|
5
|
-
# we simulate radio groups so that they can all be in one composite.
|
6
|
-
class RadioGroup
|
7
|
-
extend Forwardable
|
8
|
-
include Enumerable
|
9
|
-
|
10
|
-
DEFAULT_RADIO_GROUP = "Default Radio Group"
|
11
|
-
|
12
|
-
@group_lookup = Hash.new { |h, k| h[k] = RadioGroup.new(k) }
|
13
|
-
|
14
|
-
attr_reader :name
|
15
|
-
def_delegators :@radio_buttons, :each, :length, :empty?
|
16
|
-
|
17
|
-
def initialize(name = DEFAULT_RADIO_GROUP)
|
18
|
-
@name = name
|
19
|
-
@radio_buttons = []
|
20
|
-
@selection_listeners = []
|
21
|
-
end
|
22
|
-
|
23
|
-
def add(radio_button)
|
24
|
-
return if @radio_buttons.include?(radio_button)
|
25
|
-
@radio_buttons << radio_button
|
26
|
-
|
27
|
-
selection_listener = SelectionListener.new radio_button do |selected_radio,
|
28
|
-
select_only_one_radio_in_group(selected_radio)
|
29
|
-
end
|
30
|
-
@selection_listeners << selection_listener
|
31
|
-
radio_button.real.add_selection_listener selection_listener
|
32
|
-
end
|
33
|
-
|
34
|
-
def remove(radio_button)
|
35
|
-
index = @radio_buttons.index(radio_button)
|
36
|
-
return if index.nil?
|
37
|
-
@radio_buttons.delete_at(index)
|
38
|
-
|
39
|
-
radio_button.real.remove_selection_listener @selection_listeners[index]
|
40
|
-
@selection_listeners.delete_at(index)
|
41
|
-
end
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
end
|
46
|
-
|
47
|
-
def select_only_one_radio_in_group(selected_radio)
|
48
|
-
@radio_buttons.each do |radio|
|
49
|
-
radio.real.set_selection(radio == selected_radio)
|
50
|
-
end
|
51
|
-
end
|
52
|
-
end
|
53
|
-
end
|
54
|
-
end
|
1
|
+
class Shoes
|
2
|
+
module Swt
|
3
|
+
# In Swt radio groups are managed by composites which occupy space
|
4
|
+
# and can interfere with users interacting with other controls. Here
|
5
|
+
# we simulate radio groups so that they can all be in one composite.
|
6
|
+
class RadioGroup
|
7
|
+
extend Forwardable
|
8
|
+
include Enumerable
|
9
|
+
|
10
|
+
DEFAULT_RADIO_GROUP = "Default Radio Group"
|
11
|
+
|
12
|
+
@group_lookup = Hash.new { |h, k| h[k] = RadioGroup.new(k) }
|
13
|
+
|
14
|
+
attr_reader :name
|
15
|
+
def_delegators :@radio_buttons, :each, :length, :empty?
|
16
|
+
|
17
|
+
def initialize(name = DEFAULT_RADIO_GROUP)
|
18
|
+
@name = name
|
19
|
+
@radio_buttons = []
|
20
|
+
@selection_listeners = []
|
21
|
+
end
|
22
|
+
|
23
|
+
def add(radio_button)
|
24
|
+
return if @radio_buttons.include?(radio_button)
|
25
|
+
@radio_buttons << radio_button
|
26
|
+
|
27
|
+
selection_listener = SelectionListener.new radio_button do |selected_radio, _event|
|
28
|
+
select_only_one_radio_in_group(selected_radio)
|
29
|
+
end
|
30
|
+
@selection_listeners << selection_listener
|
31
|
+
radio_button.real.add_selection_listener selection_listener
|
32
|
+
end
|
33
|
+
|
34
|
+
def remove(radio_button)
|
35
|
+
index = @radio_buttons.index(radio_button)
|
36
|
+
return if index.nil?
|
37
|
+
@radio_buttons.delete_at(index)
|
38
|
+
|
39
|
+
radio_button.real.remove_selection_listener @selection_listeners[index]
|
40
|
+
@selection_listeners.delete_at(index)
|
41
|
+
end
|
42
|
+
|
43
|
+
class << self
|
44
|
+
attr_reader :group_lookup
|
45
|
+
end
|
46
|
+
|
47
|
+
def select_only_one_radio_in_group(selected_radio)
|
48
|
+
@radio_buttons.each do |radio|
|
49
|
+
radio.real.set_selection(radio == selected_radio)
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
@@ -6,17 +6,17 @@ class Shoes
|
|
6
6
|
@obj.element_top,
|
7
7
|
@obj.element_width,
|
8
8
|
@obj.element_height,
|
9
|
-
@obj.corners*2,
|
10
|
-
@obj.corners*2)
|
9
|
+
@obj.corners * 2,
|
10
|
+
@obj.corners * 2)
|
11
11
|
end
|
12
12
|
|
13
13
|
def draw(gc)
|
14
14
|
stroke_width = gc.get_line_width
|
15
|
-
gc.draw_round_rectangle(@obj.element_left+stroke_width/2,
|
16
|
-
@obj.element_top+stroke_width/2,
|
17
|
-
@obj.element_width-stroke_width,
|
18
|
-
@obj.element_height-stroke_width,
|
19
|
-
@obj.corners*2, @obj.corners*2)
|
15
|
+
gc.draw_round_rectangle(@obj.element_left + stroke_width / 2,
|
16
|
+
@obj.element_top + stroke_width / 2,
|
17
|
+
@obj.element_width - stroke_width,
|
18
|
+
@obj.element_height - stroke_width,
|
19
|
+
@obj.corners * 2, @obj.corners * 2)
|
20
20
|
end
|
21
21
|
end
|
22
22
|
end
|
@@ -9,41 +9,38 @@
|
|
9
9
|
class Shoes
|
10
10
|
module Swt
|
11
11
|
class RedrawingAspect
|
12
|
-
|
13
12
|
NEED_TO_UPDATE =
|
14
|
-
{Animation => [:eval_block],
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
13
|
+
{ Animation => [:eval_block],
|
14
|
+
Button => [:eval_block],
|
15
|
+
ClickListener => [:eval_block],
|
16
|
+
::Shoes::InternalApp => [:execute_block],
|
17
|
+
Keypress => [:eval_block],
|
18
|
+
Keyrelease => [:eval_block],
|
19
|
+
MouseMoveListener => [:eval_move_block],
|
20
|
+
TextBlock::CursorPainter => [:move_textcursor],
|
21
|
+
Timer => [:eval_block],
|
22
|
+
::Shoes::Common::Changeable => [:call_change_listeners] }
|
24
23
|
# only the main thread may draw
|
25
|
-
NEED_TO_ASYNC_UPDATE_GUI = {::Shoes::Download => [:eval_block]}
|
24
|
+
NEED_TO_ASYNC_UPDATE_GUI = { ::Shoes::Download => [:eval_block] }
|
26
25
|
|
27
26
|
# These need to trigger a redraw
|
28
|
-
SAME_POSITION = {Common::Visibility => [:update_visibility],
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
27
|
+
SAME_POSITION = { Common::Visibility => [:update_visibility],
|
28
|
+
Image => [:update_image],
|
29
|
+
::Shoes::Common::Style => [:update_style],
|
30
|
+
::Shoes::Common::Remove => [:remove],
|
31
|
+
::Shoes::Slot => [:mouse_hovered,
|
32
|
+
:mouse_left],
|
33
|
+
::Shoes::TextBlock => [:replace] }
|
35
34
|
|
36
|
-
CHANGED_POSITION = {::Shoes::Common::Positioning => [:_position]}
|
35
|
+
CHANGED_POSITION = { ::Shoes::Common::Positioning => [:_position] }
|
37
36
|
|
38
37
|
# These methods trigger SWT painting listeners, so we need to be sure
|
39
38
|
# that positioning has run properly before allowing them to continue.
|
40
39
|
NEED_CONTENTS_ALIGNMENT = {
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
}
|
46
|
-
|
40
|
+
::Shoes::Swt::Dialog => [:ask_color,
|
41
|
+
:dialog_chooser,
|
42
|
+
:open_message_box]
|
43
|
+
}
|
47
44
|
|
48
45
|
attr_reader :app
|
49
46
|
|
@@ -55,12 +52,13 @@ class Shoes
|
|
55
52
|
end
|
56
53
|
|
57
54
|
def remove_redraws
|
58
|
-
affected_classes.each
|
55
|
+
affected_classes.each(&:remove_all_callbacks)
|
59
56
|
end
|
60
57
|
|
61
58
|
private
|
59
|
+
|
62
60
|
def extend_needed_classes
|
63
|
-
affected_classes.each {|klass| klass.extend AfterDo}
|
61
|
+
affected_classes.each { |klass| klass.extend AfterDo }
|
64
62
|
end
|
65
63
|
|
66
64
|
def affected_classes
|
@@ -75,17 +73,17 @@ class Shoes
|
|
75
73
|
def add_redraws
|
76
74
|
after_every NEED_TO_UPDATE do update_gui end
|
77
75
|
after_every NEED_TO_ASYNC_UPDATE_GUI do
|
78
|
-
@display.asyncExec
|
76
|
+
@display.asyncExec { update_gui }
|
79
77
|
end
|
80
|
-
after_every SAME_POSITION do |*
|
78
|
+
after_every SAME_POSITION do |*_args, element|
|
81
79
|
element = element.dsl if element.respond_to? :dsl
|
82
80
|
redraw_element element, false
|
83
81
|
end
|
84
82
|
# need to redraw old occupied area and newly occupied area
|
85
|
-
before_and_after_every CHANGED_POSITION do |*
|
83
|
+
before_and_after_every CHANGED_POSITION do |*_args, element|
|
86
84
|
redraw_element element
|
87
85
|
end
|
88
|
-
before_every NEED_CONTENTS_ALIGNMENT do |*
|
86
|
+
before_every NEED_CONTENTS_ALIGNMENT do |*_args|
|
89
87
|
app.dsl.top_slot.contents_alignment
|
90
88
|
end
|
91
89
|
end
|
@@ -107,7 +105,7 @@ class Shoes
|
|
107
105
|
end
|
108
106
|
|
109
107
|
def after_every(hash, &blk)
|
110
|
-
hash.each {|klass, methods| klass.after methods, &blk }
|
108
|
+
hash.each { |klass, methods| klass.after methods, &blk }
|
111
109
|
end
|
112
110
|
|
113
111
|
def before_and_after_every(hash, &blk)
|
@@ -116,7 +114,7 @@ class Shoes
|
|
116
114
|
end
|
117
115
|
|
118
116
|
def before_every(hash, &blk)
|
119
|
-
hash.each {|klass, methods| klass.before methods, &blk }
|
117
|
+
hash.each { |klass, methods| klass.before methods, &blk }
|
120
118
|
end
|
121
119
|
end
|
122
120
|
end
|
data/lib/shoes/swt/shape.rb
CHANGED
@@ -6,7 +6,6 @@ class Shoes
|
|
6
6
|
include Common::Stroke
|
7
7
|
include Common::PainterUpdatesPosition
|
8
8
|
|
9
|
-
|
10
9
|
# Creates a new Shoes::Swt::Shape
|
11
10
|
#
|
12
11
|
# @param [Shoes::Shape] dsl The dsl object to provide gui for
|
@@ -81,6 +80,7 @@ class Shoes
|
|
81
80
|
end
|
82
81
|
|
83
82
|
private
|
83
|
+
|
84
84
|
def new_java_float_array(length)
|
85
85
|
Java::float[length].new
|
86
86
|
end
|
@@ -1,15 +1,17 @@
|
|
1
1
|
class Shoes
|
2
2
|
module Swt
|
3
3
|
class ShoesLayout < ::Swt::Widgets::Layout
|
4
|
-
|
5
4
|
attr_accessor :gui_app
|
6
5
|
|
7
|
-
def layout(*
|
6
|
+
def layout(*_dontcare)
|
8
7
|
dsl_app = @gui_app.dsl
|
9
8
|
height = dsl_app.height
|
10
9
|
scrollable_height = dsl_app.top_slot.contents_alignment
|
11
10
|
set_gui_size(height, scrollable_height)
|
12
11
|
|
12
|
+
dsl_app.top_slot.width = dsl_app.width
|
13
|
+
dsl_app.top_slot.height = [scrollable_height, height].max
|
14
|
+
|
13
15
|
vertical_bar = @gui_app.shell.getVerticalBar
|
14
16
|
vertical_bar.setVisible(scrollable_height > height)
|
15
17
|
if scrollable_height > height
|
@@ -20,6 +22,7 @@ class Shoes
|
|
20
22
|
end
|
21
23
|
|
22
24
|
private
|
25
|
+
|
23
26
|
def set_gui_size(height, scrollable_height)
|
24
27
|
width = @gui_app.dsl.width
|
25
28
|
maximum_height = [scrollable_height, height].max
|
data/lib/shoes/swt/slot.rb
CHANGED
@@ -26,12 +26,11 @@ class Shoes
|
|
26
26
|
# #904 #905
|
27
27
|
def update_visibility
|
28
28
|
if dsl.hidden?
|
29
|
-
dsl.contents.each
|
29
|
+
dsl.contents.each(&:hide)
|
30
30
|
else
|
31
|
-
dsl.contents.each
|
31
|
+
dsl.contents.each(&:show)
|
32
32
|
end
|
33
33
|
end
|
34
|
-
|
35
34
|
end
|
36
35
|
class Flow < Slot; end
|
37
36
|
class Stack < Slot; end
|
data/lib/shoes/swt/sound.rb
CHANGED
@@ -32,7 +32,7 @@ class Shoes
|
|
32
32
|
def play
|
33
33
|
Thread.new do
|
34
34
|
begin
|
35
|
-
sound_file = JFile.new(
|
35
|
+
sound_file = JFile.new(filepath)
|
36
36
|
|
37
37
|
audio_input_stream = AudioSystem.getAudioInputStream(sound_file)
|
38
38
|
audio_format = audio_input_stream.getFormat
|
@@ -47,8 +47,8 @@ class Shoes
|
|
47
47
|
puts uafex.inspect, uafex.backtrace
|
48
48
|
rescue IOException => ioex
|
49
49
|
puts ioex.inspect, ioex.backtrace
|
50
|
-
|
51
|
-
|
50
|
+
# rescue JIOException => jioex
|
51
|
+
# jioex.stacktrace
|
52
52
|
rescue LineUnavailableException => luex
|
53
53
|
puts luex.inspect, luex.backtrace
|
54
54
|
rescue Exception => e
|
@@ -61,11 +61,11 @@ class Shoes
|
|
61
61
|
case audio_format.encoding
|
62
62
|
when Java::JavazoomSpiVorbisSampledFile::VorbisEncoding, Java::JavazoomSpiMpegSampledFile::MpegEncoding
|
63
63
|
decoded_format = AudioFormat.new(AudioFormat::Encoding::PCM_SIGNED,
|
64
|
-
audio_format.getSampleRate
|
64
|
+
audio_format.getSampleRate,
|
65
65
|
16,
|
66
|
-
audio_format.getChannels
|
67
|
-
audio_format.getChannels
|
68
|
-
audio_format.getSampleRate
|
66
|
+
audio_format.getChannels,
|
67
|
+
audio_format.getChannels * 2,
|
68
|
+
audio_format.getSampleRate,
|
69
69
|
false)
|
70
70
|
decoded_audio_input_stream = AudioSystem.getAudioInputStream(decoded_format, audio_input_stream)
|
71
71
|
|
@@ -77,38 +77,33 @@ class Shoes
|
|
77
77
|
end
|
78
78
|
|
79
79
|
def rawplay(decoded_audio_format, decoded_audio_input_stream)
|
80
|
-
|
81
|
-
#throws IOException, LineUnavailableException
|
80
|
+
# throws IOException, LineUnavailableException
|
82
81
|
|
83
82
|
sampled_data = Java::byte[BufferSize].new
|
84
83
|
|
85
84
|
line = getLine(decoded_audio_format)
|
86
|
-
|
85
|
+
unless line.nil?
|
87
86
|
|
88
87
|
# Start
|
89
|
-
line.start
|
90
|
-
bytes_read = 0
|
88
|
+
line.start
|
89
|
+
bytes_read = 0
|
91
90
|
while bytes_read != -1
|
92
91
|
|
93
92
|
bytes_read = decoded_audio_input_stream.read(sampled_data, 0, sampled_data.length)
|
94
93
|
if bytes_read != -1
|
95
|
-
|
96
|
-
bytes_written = line.write(sampled_data, 0, bytes_read)
|
94
|
+
line.write(sampled_data, 0, bytes_read)
|
97
95
|
end
|
98
96
|
end
|
99
97
|
# Stop
|
100
|
-
line.drain
|
101
|
-
line.stop
|
102
|
-
line.close
|
103
|
-
decoded_audio_input_stream.close
|
98
|
+
line.drain
|
99
|
+
line.stop
|
100
|
+
line.close
|
101
|
+
decoded_audio_input_stream.close
|
104
102
|
end
|
105
103
|
end
|
106
104
|
|
107
105
|
def getLine(audioFormat)
|
108
|
-
|
109
|
-
#throws LineUnavailableException
|
110
|
-
|
111
|
-
res = nil
|
106
|
+
# throws LineUnavailableException
|
112
107
|
info = DataLine::Info.new(SourceDataLine.java_class, audioFormat)
|
113
108
|
res = AudioSystem.getLine(info)
|
114
109
|
res.open(audioFormat)
|
data/lib/shoes/swt/star.rb
CHANGED
@@ -31,18 +31,40 @@ class Shoes
|
|
31
31
|
def draw(gc)
|
32
32
|
gc.drawPolygon make_polygon(@obj)
|
33
33
|
end
|
34
|
-
|
34
|
+
|
35
35
|
def make_polygon(obj)
|
36
36
|
outer, inner, points, left, top = obj.outer, obj.inner, obj.points,
|
37
37
|
obj.element_left, obj.element_top
|
38
|
-
polygon = []
|
39
|
-
|
40
|
-
(1..points*2).each do |i|
|
41
|
-
|
42
|
-
|
43
|
-
|
38
|
+
@polygon = []
|
39
|
+
add_edge(left, top + outer)
|
40
|
+
(1..points * 2).each do |i|
|
41
|
+
make_edge(i, left, top, outer, inner, points)
|
42
|
+
end
|
43
|
+
|
44
|
+
translate_to_proper_start(obj)
|
45
|
+
|
46
|
+
@polygon
|
47
|
+
end
|
48
|
+
|
49
|
+
def add_edge(start, finish)
|
50
|
+
@polygon << start << finish
|
51
|
+
end
|
52
|
+
|
53
|
+
def make_edge(i, left, top, outer, inner, points)
|
54
|
+
r = (i % 2 == 0) ? outer : inner
|
55
|
+
angle = i * ::Math::PI / points
|
56
|
+
add_edge(left + r * ::Math.sin(angle),
|
57
|
+
top + r * ::Math.cos(angle))
|
58
|
+
end
|
59
|
+
|
60
|
+
# Prior logic centers start on left/top, so translate to where we
|
61
|
+
# really want to start.
|
62
|
+
def translate_to_proper_start(obj)
|
63
|
+
return if obj.dsl.style[:center]
|
64
|
+
|
65
|
+
@polygon.map! do |x|
|
66
|
+
x + obj.element_width / 2
|
44
67
|
end
|
45
|
-
polygon
|
46
68
|
end
|
47
69
|
end
|
48
70
|
end
|