Skip to content

Commit

Permalink
Merge pull request #198 from bojidar-bg/x-fixes
Browse files Browse the repository at this point in the history
Make some demos work again, reimport
  • Loading branch information
akien-mga authored Jan 16, 2018
2 parents 59751d3 + 03ba4fc commit 219783e
Show file tree
Hide file tree
Showing 34 changed files with 823 additions and 494 deletions.
62 changes: 40 additions & 22 deletions gui/drag_and_drop/drag_and_drop.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

[ext_resource path="res://drag_drop_script.gd" type="Script" id=1]

[node name="Control" type="Control"]
[node name="Control" type="Control" index="0"]

anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0
anchor_bottom = 1.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 2
size_flags_vertical = 2
__meta__ = {
"__editor_plugin_screen__": "2D"
}

[node name="ColorPickerButton0" type="ColorPickerButton" parent="."]
[node name="ColorPickerButton0" type="ColorPickerButton" parent="." index="0"]

anchor_left = 0.0
anchor_top = 0.0
Expand All @@ -28,20 +28,22 @@ margin_top = 64.0
margin_right = 160.0
margin_bottom = 128.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
focus_mode = 2
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 2
size_flags_vertical = 2
toggle_mode = false
enabled_focus_mode = 2
shortcut = null
group = null
flat = false
align = 1
color = Color( 0.671032, 0.605183, 0, 1 )
edit_alpha = true
script = ExtResource( 1 )

[node name="ColorPickerButton1" type="ColorPickerButton" parent="."]
[node name="ColorPickerButton1" type="ColorPickerButton" parent="." index="1"]

anchor_left = 0.0
anchor_top = 0.0
Expand All @@ -52,20 +54,22 @@ margin_top = 64.0
margin_right = 320.0
margin_bottom = 128.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
focus_mode = 2
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 2
size_flags_vertical = 2
toggle_mode = false
enabled_focus_mode = 2
shortcut = null
group = null
flat = false
align = 1
color = Color( 0, 0.797347, 0.741037, 1 )
edit_alpha = true
script = ExtResource( 1 )

[node name="ColorPickerButton2" type="ColorPickerButton" parent="."]
[node name="ColorPickerButton2" type="ColorPickerButton" parent="." index="2"]

anchor_left = 0.0
anchor_top = 0.0
Expand All @@ -76,20 +80,22 @@ margin_top = 64.0
margin_right = 480.0
margin_bottom = 128.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
focus_mode = 2
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 2
size_flags_vertical = 2
toggle_mode = false
enabled_focus_mode = 2
shortcut = null
group = null
flat = false
align = 1
color = Color( 0.443924, 0, 0.632923, 1 )
edit_alpha = true
script = ExtResource( 1 )

[node name="ColorPickerButton3" type="ColorPickerButton" parent="."]
[node name="ColorPickerButton3" type="ColorPickerButton" parent="." index="3"]

anchor_left = 0.0
anchor_top = 0.0
Expand All @@ -100,20 +106,22 @@ margin_top = 160.0
margin_right = 160.0
margin_bottom = 224.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
focus_mode = 2
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 2
size_flags_vertical = 2
toggle_mode = false
enabled_focus_mode = 2
shortcut = null
group = null
flat = false
align = 1
color = Color( 1, 1, 1, 1 )
edit_alpha = true
script = ExtResource( 1 )

[node name="ColorPickerButton4" type="ColorPickerButton" parent="."]
[node name="ColorPickerButton4" type="ColorPickerButton" parent="." index="4"]

anchor_left = 0.0
anchor_top = 0.0
Expand All @@ -124,20 +132,22 @@ margin_top = 160.0
margin_right = 320.0
margin_bottom = 224.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
focus_mode = 2
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 2
size_flags_vertical = 2
toggle_mode = false
enabled_focus_mode = 2
shortcut = null
group = null
flat = false
align = 1
color = Color( 1, 0.933842, 0, 1 )
edit_alpha = true
script = ExtResource( 1 )

[node name="ColorPickerButton5" type="ColorPickerButton" parent="."]
[node name="ColorPickerButton5" type="ColorPickerButton" parent="." index="5"]

anchor_left = 0.0
anchor_top = 0.0
Expand All @@ -148,20 +158,22 @@ margin_top = 160.0
margin_right = 480.0
margin_bottom = 224.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
focus_mode = 2
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 2
size_flags_vertical = 2
toggle_mode = false
enabled_focus_mode = 2
shortcut = null
group = null
flat = false
align = 1
color = Color( 0.287293, 0.886362, 0.122933, 1 )
edit_alpha = true
script = ExtResource( 1 )

[node name="ColorPickerButton6" type="ColorPickerButton" parent="."]
[node name="ColorPickerButton6" type="ColorPickerButton" parent="." index="6"]

anchor_left = 0.0
anchor_top = 0.0
Expand All @@ -172,20 +184,22 @@ margin_top = 256.0
margin_right = 160.0
margin_bottom = 320.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
focus_mode = 2
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 2
size_flags_vertical = 2
toggle_mode = false
enabled_focus_mode = 2
shortcut = null
group = null
flat = false
align = 1
color = Color( 0.908461, 0, 0.88789, 1 )
edit_alpha = true
script = ExtResource( 1 )

[node name="ColorPickerButton7" type="ColorPickerButton" parent="."]
[node name="ColorPickerButton7" type="ColorPickerButton" parent="." index="7"]

anchor_left = 0.0
anchor_top = 0.0
Expand All @@ -196,20 +210,22 @@ margin_top = 256.0
margin_right = 320.0
margin_bottom = 320.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
focus_mode = 2
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 2
size_flags_vertical = 2
toggle_mode = false
enabled_focus_mode = 2
shortcut = null
group = null
flat = false
align = 1
color = Color( 0, 0.283703, 0, 1 )
edit_alpha = true
script = ExtResource( 1 )

[node name="ColorPickerButton8" type="ColorPickerButton" parent="."]
[node name="ColorPickerButton8" type="ColorPickerButton" parent="." index="8"]

anchor_left = 0.0
anchor_top = 0.0
Expand All @@ -220,20 +236,22 @@ margin_top = 256.0
margin_right = 480.0
margin_bottom = 320.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
focus_mode = 2
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 2
size_flags_vertical = 2
toggle_mode = false
enabled_focus_mode = 2
shortcut = null
group = null
flat = false
align = 1
color = Color( 0, 0, 0.178211, 1 )
edit_alpha = true
script = ExtResource( 1 )

[node name="Label" type="Label" parent="."]
[node name="Label" type="Label" parent="." index="9"]

anchor_left = 0.0
anchor_top = 0.0
Expand All @@ -244,8 +262,8 @@ margin_top = 11.0
margin_right = 470.0
margin_bottom = 24.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 2
size_flags_vertical = 0
text = "Drag colors from button to button, or change button colors and drag them again."
Expand Down
Loading

0 comments on commit 219783e

Please sign in to comment.