Skip to content

Commit 0ce77fb

Browse files
committed
Fix #71
This commits moves DialogManager and CharacterName nodes to DialogBox node. That doesn't affect its behaviour
1 parent 09e7c61 commit 0ce77fb

File tree

2 files changed

+31
-35
lines changed

2 files changed

+31
-35
lines changed

addons/textalog/nodes/dialogue_base_node/dialogue_base_node.tscn

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ __meta__ = {
3131
"_edit_group_": true,
3232
"_edit_use_anchors_": false
3333
}
34-
DialogNode_Path = NodePath("DialogManager")
34+
DialogNode_Path = NodePath("DialogBox/DialogManager")
3535
PortraitNode_Path = NodePath("PortraitManager")
3636
OptionsNode_Path = NodePath("Options")
37-
NameNode_path = NodePath("CharacterName")
37+
NameNode_path = NodePath("DialogBox/CharacterName")
3838

3939
[node name="PortraitManager" type="Control" parent="."]
4040
anchor_right = 1.0
@@ -44,36 +44,28 @@ __meta__ = {
4444
"_edit_use_anchors_": false
4545
}
4646

47-
[node name="DialogManager" type="Container" parent="."]
48-
anchor_left = 0.028
49-
anchor_top = 0.733
50-
anchor_right = 0.977
51-
anchor_bottom = 0.963
52-
margin_left = 0.327999
53-
margin_top = 0.199982
54-
margin_right = -0.448059
55-
margin_bottom = 0.199951
56-
script = ExtResource( 1 )
57-
__meta__ = {
58-
"_edit_use_anchors_": false
59-
}
60-
text_show_scroll_at_end = false
61-
6247
[node name="Options" parent="." instance=ExtResource( 4 )]
6348
margin_left = 27.0
6449
margin_top = 94.0
6550
margin_right = -25.0
6651
margin_bottom = -387.0
6752

68-
[node name="CharacterName" type="Label" parent="."]
53+
[node name="DialogBox" type="Control" parent="."]
54+
anchor_right = 1.0
55+
anchor_bottom = 1.0
56+
__meta__ = {
57+
"_edit_use_anchors_": false
58+
}
59+
60+
[node name="CharacterName" type="Label" parent="DialogBox"]
6961
anchor_left = 0.023
7062
anchor_top = 0.643
7163
anchor_right = 0.181
7264
anchor_bottom = 0.72
7365
margin_left = 0.447996
74-
margin_top = 0.199951
66+
margin_top = -4.30005
7567
margin_right = -0.344009
76-
margin_bottom = -6.10352e-05
68+
margin_bottom = 4.49994
7769
grow_horizontal = 2
7870
grow_vertical = 2
7971
custom_styles/normal = SubResource( 2 )
@@ -83,3 +75,18 @@ valign = 1
8375
__meta__ = {
8476
"_edit_use_anchors_": false
8577
}
78+
79+
[node name="DialogManager" type="Container" parent="DialogBox"]
80+
anchor_left = 0.028
81+
anchor_top = 0.733
82+
anchor_right = 0.977
83+
anchor_bottom = 0.963
84+
margin_left = 0.327999
85+
margin_top = 0.199982
86+
margin_right = -0.448059
87+
margin_bottom = 0.199951
88+
script = ExtResource( 1 )
89+
__meta__ = {
90+
"_edit_use_anchors_": false
91+
}
92+
text_show_scroll_at_end = false

addons/textalog/nodes/dialogue_bubble_node/dialog_bubble.tscn

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[ext_resource path="res://addons/textalog/nodes/dialogue_bubble_node/dialog_bubble.gd" type="Script" id=2]
55
[ext_resource path="res://addons/textalog/assets/themes/default_bubble/default_bubble.tres" type="Theme" id=3]
66

7-
[sub_resource type="Image" id=4]
7+
[sub_resource type="Image" id=1]
88
data = {
99
"data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ),
1010
"format": "LumAlpha8",
@@ -16,7 +16,7 @@ data = {
1616
[sub_resource type="ImageTexture" id=2]
1717
flags = 4
1818
flags = 4
19-
image = SubResource( 4 )
19+
image = SubResource( 1 )
2020
size = Vector2( 16, 16 )
2121

2222
[sub_resource type="StyleBoxTexture" id=3]
@@ -33,19 +33,8 @@ margin_bottom = -530.0
3333
theme = ExtResource( 3 )
3434
script = ExtResource( 2 )
3535

36-
[node name="DialogManager" parent="." index="1"]
37-
anchor_right = 1.0
38-
anchor_bottom = 1.0
39-
margin_left = 0.0
40-
margin_top = 0.0
41-
margin_right = 0.0
42-
margin_bottom = 0.0
43-
grow_horizontal = 2
44-
grow_vertical = 0
45-
46-
[node name="Options" parent="." index="2"]
36+
[node name="Options" parent="." index="1"]
4737
visible = false
4838

49-
[node name="CharacterName" parent="." index="3"]
50-
visible = false
39+
[node name="CharacterName" parent="DialogBox" index="0"]
5140
custom_styles/normal = SubResource( 3 )

0 commit comments

Comments
 (0)