From db2d4a2fd5ce591cb79255e7e2ce573be82b55b3 Mon Sep 17 00:00:00 2001 From: Kasper Frandsen Date: Sun, 29 Aug 2021 16:04:36 +0100 Subject: [PATCH 1/2] fix: change popup to popup panel to add background to color picker --- material_maker/nodes/comment/comment.tscn | 24 +++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/material_maker/nodes/comment/comment.tscn b/material_maker/nodes/comment/comment.tscn index 407a4931..7ad790f3 100644 --- a/material_maker/nodes/comment/comment.tscn +++ b/material_maker/nodes/comment/comment.tscn @@ -51,11 +51,11 @@ __meta__ = { [node name="VBox" type="VBoxContainer" parent="."] margin_left = 16.0 margin_top = 24.0 -margin_right = 239.0 +margin_right = 346.0 margin_bottom = 38.0 [node name="Label" type="Label" parent="VBox"] -margin_right = 223.0 +margin_right = 330.0 margin_bottom = 14.0 mouse_filter = 0 text = "Double-click to write a comment" @@ -71,18 +71,22 @@ custom_styles/focus = SubResource( 2 ) custom_styles/normal = SubResource( 2 ) wrap_enabled = true -[node name="Popup" type="Popup" parent="."] +[node name="Popup" type="PopupPanel" parent="."] +visible = true margin_left = 16.0 margin_top = 39.0 -margin_right = 239.0 -margin_bottom = 39.0 +margin_right = 346.0 +margin_bottom = 509.0 [node name="ColorPicker" type="ColorPicker" parent="Popup"] -margin_left = 12.0 -margin_top = 12.0 -margin_right = 12.0 -margin_bottom = 12.0 -rect_scale = Vector2( 0.75, 0.75 ) +margin_left = 4.0 +margin_top = 4.0 +margin_right = 326.0 +margin_bottom = 466.0 +__meta__ = { +"_edit_use_anchors_": false +} + [connection signal="resize_request" from="." to="." method="_on_resize_request"] [connection signal="gui_input" from="VBox/Label" to="." method="_on_Label_gui_input"] [connection signal="focus_entered" from="VBox/TextEdit" to="." method="_on_TextEdit_focus_entered"] From 287b94e78034d0822a5a1a01f1e24161c9d3995f Mon Sep 17 00:00:00 2001 From: Kasper Frandsen Date: Sun, 29 Aug 2021 16:17:49 +0100 Subject: [PATCH 2/2] fix: forgot to set visibility back to false --- material_maker/nodes/comment/comment.tscn | 1 - 1 file changed, 1 deletion(-) diff --git a/material_maker/nodes/comment/comment.tscn b/material_maker/nodes/comment/comment.tscn index 7ad790f3..9fc3d953 100644 --- a/material_maker/nodes/comment/comment.tscn +++ b/material_maker/nodes/comment/comment.tscn @@ -72,7 +72,6 @@ custom_styles/normal = SubResource( 2 ) wrap_enabled = true [node name="Popup" type="PopupPanel" parent="."] -visible = true margin_left = 16.0 margin_top = 39.0 margin_right = 346.0