Browse Source

Merge pull request #528 from aaronfranke/panel

Remove Panel nodes that don't have panels
Aaron Franke 4 years ago
parent
commit
4d205325ad

+ 1 - 1
gui/rich_text_bbcode/rich_text_bbcode.gd

@@ -1,4 +1,4 @@
-extends Panel
+extends Control
 
 
 func _on_RichTextLabel_meta_clicked(meta):
 func _on_RichTextLabel_meta_clicked(meta):
 	var err = OS.shell_open(meta)
 	var err = OS.shell_open(meta)

+ 1 - 5
gui/rich_text_bbcode/rich_text_bbcode.tscn

@@ -22,7 +22,7 @@ font_data = ExtResource( 4 )
 size = 20
 size = 20
 font_data = ExtResource( 5 )
 font_data = ExtResource( 5 )
 
 
-[node name="RichTextBBCode" type="Panel"]
+[node name="RichTextBBCode" type="Control"]
 anchor_left = 0.5
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_right = 0.5
@@ -34,10 +34,6 @@ margin_bottom = 300.0
 size_flags_horizontal = 2
 size_flags_horizontal = 2
 size_flags_vertical = 2
 size_flags_vertical = 2
 script = ExtResource( 1 )
 script = ExtResource( 1 )
-__meta__ = {
-"__editor_plugin_screen__": "2D",
-"_edit_use_anchors_": false
-}
 
 
 [node name="RichTextLabel" type="RichTextLabel" parent="."]
 [node name="RichTextLabel" type="RichTextLabel" parent="."]
 anchor_right = 1.0
 anchor_right = 1.0

+ 1 - 1
gui/translation/translation_demo.gd

@@ -1,4 +1,4 @@
-extends Panel
+extends Control
 
 
 func _on_english_pressed():
 func _on_english_pressed():
 	TranslationServer.set_locale("en")
 	TranslationServer.set_locale("en")

+ 1 - 5
gui/translation/translation_demo.tscn

@@ -6,7 +6,7 @@
 [ext_resource path="res://flag_uk.png" type="Texture" id=4]
 [ext_resource path="res://flag_uk.png" type="Texture" id=4]
 [ext_resource path="res://hello_en.wav" type="AudioStream" id=5]
 [ext_resource path="res://hello_en.wav" type="AudioStream" id=5]
 
 
-[node name="TranslationDemo" type="Panel"]
+[node name="TranslationDemo" type="Control"]
 anchor_left = 0.5
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_right = 0.5
@@ -18,10 +18,6 @@ margin_bottom = 300.0
 size_flags_horizontal = 2
 size_flags_horizontal = 2
 size_flags_vertical = 2
 size_flags_vertical = 2
 script = ExtResource( 1 )
 script = ExtResource( 1 )
-__meta__ = {
-"__editor_plugin_screen__": "2D",
-"_edit_use_anchors_": false
-}
 
 
 [node name="English" type="Button" parent="."]
 [node name="English" type="Button" parent="."]
 margin_left = 32.0
 margin_left = 32.0