Skip to content

Commit

Permalink
Applies comment node color
Browse files Browse the repository at this point in the history
  • Loading branch information
madjyc committed Oct 22, 2022
1 parent d11de7c commit db0e2dc
Show file tree
Hide file tree
Showing 11 changed files with 617 additions and 559 deletions.
14 changes: 14 additions & 0 deletions Resources/CommentNormalFrame.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[gd_resource type="StyleBoxFlat" format=2]

[resource]
content_margin_left = 12.0
content_margin_right = 12.0
content_margin_top = 25.0
content_margin_bottom = 5.0
bg_color = Color( 0.498039, 0.498039, 0.498039, 0.498039 )
border_width_top = 24
border_color = Color( 0.498039, 0.498039, 0.498039, 0.498039 )
corner_radius_top_left = 20
corner_radius_top_right = 20
corner_radius_bottom_right = 20
corner_radius_bottom_left = 20
51 changes: 33 additions & 18 deletions Scenes/CommentGraphNode.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=17 format=2]
[gd_scene load_steps=19 format=2]

[ext_resource path="res://Scripts/CommentGraphNode.gd" type="Script" id=1]
[ext_resource path="res://Assets/Icons/Remove.svg" type="Texture" id=2]
Expand All @@ -16,11 +16,17 @@
[ext_resource path="res://Assets/UserIcons/Cross.svg" type="Texture" id=14]
[ext_resource path="res://Assets/UserIcons/Question.svg" type="Texture" id=15]
[ext_resource path="res://Assets/UserIcons/Exclamation.svg" type="Texture" id=16]
[ext_resource path="res://Resources/CommentNormalFrame.tres" type="StyleBox" id=17]
[ext_resource path="res://Resources/theme.tres" type="Theme" id=18]

[node name="CommentNode" type="GraphNode"]
margin_right = 231.0
margin_bottom = 81.0
margin_right = 230.0
margin_bottom = 80.0
rect_min_size = Vector2( 230, 80 )
mouse_filter = 2
theme = ExtResource( 18 )
custom_styles/commentfocus = ExtResource( 17 )
custom_styles/comment = ExtResource( 17 )
title = "Title"
show_close = true
comment = true
Expand All @@ -35,24 +41,24 @@ script = ExtResource( 1 )
[node name="VBoxContainer" type="VBoxContainer" parent="."]
margin_left = 16.0
margin_top = 24.0
margin_right = 215.0
margin_bottom = 75.0
margin_right = 240.0
margin_bottom = 74.0
size_flags_horizontal = 3
size_flags_vertical = 3

[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
margin_right = 199.0
margin_bottom = 22.0
margin_right = 224.0
margin_bottom = 24.0
size_flags_horizontal = 3

[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/HBoxContainer"]
margin_right = 135.0
margin_bottom = 22.0
margin_right = 128.0
margin_bottom = 24.0
size_flags_horizontal = 3

[node name="IconButton1" type="OptionButton" parent="VBoxContainer/HBoxContainer/HBoxContainer"]
margin_right = 29.0
margin_bottom = 22.0
margin_bottom = 24.0
icon = ExtResource( 4 )
flat = true
expand_icon = true
Expand All @@ -62,7 +68,7 @@ selected = 0
[node name="IconButton2" type="OptionButton" parent="VBoxContainer/HBoxContainer/HBoxContainer"]
margin_left = 33.0
margin_right = 62.0
margin_bottom = 22.0
margin_bottom = 24.0
icon = ExtResource( 4 )
flat = true
expand_icon = true
Expand All @@ -72,7 +78,7 @@ selected = 0
[node name="IconButton3" type="OptionButton" parent="VBoxContainer/HBoxContainer/HBoxContainer"]
margin_left = 66.0
margin_right = 95.0
margin_bottom = 22.0
margin_bottom = 24.0
icon = ExtResource( 4 )
flat = true
expand_icon = true
Expand All @@ -82,31 +88,40 @@ selected = 0
[node name="IconButton4" type="OptionButton" parent="VBoxContainer/HBoxContainer/HBoxContainer"]
margin_left = 99.0
margin_right = 128.0
margin_bottom = 22.0
margin_bottom = 24.0
icon = ExtResource( 4 )
flat = true
expand_icon = true
items = [ "", ExtResource( 4 ), false, 0, null, "", ExtResource( 6 ), false, 1, null, "", ExtResource( 5 ), false, 2, null, "", ExtResource( 9 ), false, 3, null, "", ExtResource( 10 ), false, 4, null, "", ExtResource( 11 ), false, 5, null, "", ExtResource( 13 ), false, 6, null, "", ExtResource( 15 ), false, 7, null, "", ExtResource( 16 ), false, 8, null, "", ExtResource( 14 ), false, 9, null, "", ExtResource( 12 ), false, 10, null, "", ExtResource( 7 ), false, 11, null, "", ExtResource( 8 ), false, 12, null ]
selected = 0

[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer/HBoxContainer"]
margin_left = 139.0
margin_right = 199.0
margin_bottom = 22.0
margin_left = 132.0
margin_right = 224.0
margin_bottom = 24.0

[node name="AddButton" type="Button" parent="VBoxContainer/HBoxContainer/HBoxContainer2"]
margin_right = 28.0
margin_bottom = 22.0
margin_bottom = 24.0
icon = ExtResource( 3 )
flat = true

[node name="SubButton" type="Button" parent="VBoxContainer/HBoxContainer/HBoxContainer2"]
margin_left = 32.0
margin_right = 60.0
margin_bottom = 22.0
margin_bottom = 24.0
icon = ExtResource( 2 )
flat = true

[node name="ColorPicker" type="ColorPickerButton" parent="VBoxContainer/HBoxContainer/HBoxContainer2"]
margin_left = 64.0
margin_right = 92.0
margin_bottom = 24.0
rect_min_size = Vector2( 28, 24 )
hint_tooltip = "Frame background color"

[connection signal="close_request" from="." to="." method="_on_CommentNode_close_request"]
[connection signal="dragged" from="." to="." method="_on_CommentNode_dragged"]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/HBoxContainer2/AddButton" to="." method="_on_AddButton_pressed"]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/HBoxContainer2/SubButton" to="." method="_on_SubButton_pressed"]
[connection signal="color_changed" from="VBoxContainer/HBoxContainer/HBoxContainer2/ColorPicker" to="." method="_on_ColorPicker_color_changed"]
67 changes: 0 additions & 67 deletions Scenes/CommentRect.tscn

This file was deleted.

6 changes: 3 additions & 3 deletions Scenes/GraphEdit.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ margin_left = 142.0
margin_right = 168.0
margin_bottom = 24.0
hint_tooltip = "Add a new frame"
disabled = true
icon = ExtResource( 5 )
flat = true

Expand All @@ -70,9 +69,10 @@ flat = true

[node name="DebugButton" type="Button" parent="CanvasLayer/HBoxContainer"]
visible = false
margin_left = 174.0
margin_right = 227.0
margin_left = 204.0
margin_right = 257.0
margin_bottom = 24.0
toggle_mode = true
text = "Debug"

[node name="DisplayDialog" parent="." instance=ExtResource( 1 )]
Expand Down
Loading

0 comments on commit db0e2dc

Please sign in to comment.