FR-#24b6jmz-tooltips finalizing changes and prepping for release

TomNCatz · Mar 28, 2022 · 49c6c7f · 49c6c7f
1 parent 8be57bf
commit 49c6c7f
Show file tree

Hide file tree

Showing 62 changed files with 7,101 additions and 7,168 deletions.
diff --git a/Code/NodeCode/NodeSlots/AutoSlot.cs b/Code/NodeCode/NodeSlots/AutoSlot.cs
@@ -25,6 +25,14 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 			template.GetValue( "label", out string label );
 			_label.Text = label;
 
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_field.HintTooltip = info;
+
+			template.GetValue( "expandedField", out bool expandedField );
+			_label.SizeFlagsHorizontal = expandedField ? (int) SizeFlags.Fill : (int) SizeFlags.ExpandFill;
+			_field.Align = expandedField ? Godot.Label.AlignEnum.Right : Godot.Label.AlignEnum.Left;
+
 			template.GetValue( "defaultValue", out string text );
 			_field.Text = text;
 

diff --git a/Code/NodeCode/NodeSlots/BooleanSlot.cs b/Code/NodeCode/NodeSlots/BooleanSlot.cs
@@ -38,6 +38,10 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 		{
 			template.GetValue( "label", out string label );
 			_label.Text = label;
+
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_field.HintTooltip = info;
 
 			parentModel.TryGetValue(_label.Text, out GenericDataObject<bool> model);
 			if(model != null)

diff --git a/Code/NodeCode/NodeSlots/ColorSlot.cs b/Code/NodeCode/NodeSlots/ColorSlot.cs
@@ -45,6 +45,13 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 		{
 			template.GetValue( "label", out string label );
 			_label.Text = label;
+
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_colorRect.HintTooltip = info;
+
+			template.GetValue( "expandedField", out bool expandedField );
+			_label.SizeFlagsHorizontal = expandedField ? (int) SizeFlags.Fill : (int) SizeFlags.ExpandFill;
 
 			template.GetValue( "asHtml", out asHtml );
 

diff --git a/Code/NodeCode/NodeSlots/DateTimeOffsetSlot.cs b/Code/NodeCode/NodeSlots/DateTimeOffsetSlot.cs
@@ -206,6 +206,10 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 		{
 			template.GetValue( "label", out string label );
 			_label.Text = label;
+
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_field.HintTooltip = info;
 
 			_model = parentModel.TryGetRelativeGdo(_label.Text);
 			if(_model != null)

diff --git a/Code/NodeCode/NodeSlots/DoubleSlot.cs b/Code/NodeCode/NodeSlots/DoubleSlot.cs
@@ -29,6 +29,14 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 			template.GetValue( "label", out string label );
 			_label.Text = label;
 
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_field.HintTooltip = info;
+
+			template.GetValue( "expandedField", out bool expandedField );
+			_label.SizeFlagsHorizontal = expandedField ? (int) SizeFlags.Fill : (int) SizeFlags.ExpandFill;
+			_field.Align = expandedField ? Godot.LineEdit.AlignEnum.Right : Godot.LineEdit.AlignEnum.Left;
+
 			template.GetValue( "hasMax", out bool hasMax );
 			template.GetValue( "hasMin", out bool hasMin );
 

diff --git a/Code/NodeCode/NodeSlots/EnumSlot.cs b/Code/NodeCode/NodeSlots/EnumSlot.cs
@@ -28,6 +28,14 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 			template.GetValue( "label", out string label );
 			_label.Text = label;
 
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_field.HintTooltip = info;
+
+			template.GetValue( "expandedField", out bool expandedField );
+			_label.SizeFlagsHorizontal = expandedField ? (int) SizeFlags.Fill : (int) SizeFlags.ExpandFill;
+			_field.Align = expandedField ? Godot.Button.TextAlign.Right : Godot.Button.TextAlign.Left;
+
 			template.GetValue( "values", out List<string> values );
 			foreach( string value in values )
 			{

diff --git a/Code/NodeCode/NodeSlots/FieldListSlot.cs b/Code/NodeCode/NodeSlots/FieldListSlot.cs
@@ -47,6 +47,9 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 			template.GetValue( "label", out string label );
 			_label.Text = label;
 			template.GetValue( "field", out _field );
+
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
 
 			parentModel.TryGetValue(_label.Text, out GenericDataList model);
 			if(model != null)

diff --git a/Code/NodeCode/NodeSlots/FlagItem.cs b/Code/NodeCode/NodeSlots/FlagItem.cs
@@ -32,6 +32,15 @@ public bool Value
 		}
 		private bool _value;
 
+		public string Info
+		{
+			set
+			{
+				_title.HintTooltip = value;
+				_check.HintTooltip = value;
+			}
+		}
+
 		public override void _Ready()
 		{
 			_title = this.GetNodeFromPath<Label>( _titlePath );

diff --git a/Code/NodeCode/NodeSlots/FlagsSlot.cs b/Code/NodeCode/NodeSlots/FlagsSlot.cs
@@ -33,13 +33,17 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 		{
 			template.GetValue( "label", out string label );
 			_label.Text = label;
+
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
 
 			template.GetValue("flags", out List<string> flags);
 			foreach(var flag in flags)
 			{
 				FlagItem item = flagsScene.Instance() as FlagItem;
 				AddChild(item);
 				item.Label = flag;
+				item.Info = info;
 				item.OnValueUpdated += OnValueChange;
 				items.Add(item);
 			}

diff --git a/Code/NodeCode/NodeSlots/FloatSlot.cs b/Code/NodeCode/NodeSlots/FloatSlot.cs
@@ -28,6 +28,14 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 			template.GetValue( "label", out string label );
 			_label.Text = label;
 
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_field.HintTooltip = info;
+
+			template.GetValue( "expandedField", out bool expandedField );
+			_label.SizeFlagsHorizontal = expandedField ? (int) SizeFlags.Fill : (int) SizeFlags.ExpandFill;
+			_field.Align = expandedField ? Godot.LineEdit.AlignEnum.Right : Godot.LineEdit.AlignEnum.Left;
+
 			template.GetValue( "hasMax", out bool hasMax );
 			template.GetValue( "hasMin", out bool hasMin );
 

diff --git a/Code/NodeCode/NodeSlots/IntSlot.cs b/Code/NodeCode/NodeSlots/IntSlot.cs
@@ -27,6 +27,14 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 			template.GetValue( "label", out string label );
 			_label.Text = label;
 
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_field.HintTooltip = info;
+
+			template.GetValue( "expandedField", out bool expandedField );
+			_label.SizeFlagsHorizontal = expandedField ? (int) SizeFlags.Fill : (int) SizeFlags.ExpandFill;
+			_field.Align = expandedField ? Godot.LineEdit.AlignEnum.Right : Godot.LineEdit.AlignEnum.Left;
+
 			template.GetValue( "hasMax", out bool hasMax );
 			template.GetValue( "hasMin", out bool hasMin );
 

diff --git a/Code/NodeCode/NodeSlots/KeyLinkSlot.cs b/Code/NodeCode/NodeSlots/KeyLinkSlot.cs
@@ -85,8 +85,13 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 			_label.Text = label;
 
 			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
 			_field.HintTooltip = info;
 
+			template.GetValue( "expandedField", out bool expandedField );
+			_label.SizeFlagsHorizontal = expandedField ? (int) SizeFlags.Fill : (int) SizeFlags.ExpandFill;
+			_field.Align = expandedField ? Godot.Label.AlignEnum.Right : Godot.Label.AlignEnum.Left;
+
 			template.GetValue( "slotType", out int slotType );
 			LinkType = slotType;
 

diff --git a/Code/NodeCode/NodeSlots/KeyManualSlot.cs b/Code/NodeCode/NodeSlots/KeyManualSlot.cs
@@ -45,8 +45,12 @@ public override void Init(GenericDataDictionary template, GenericDataObject pare
 			_label.Text = label;
 
 			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
 			_field.HintTooltip = info;
 
+			template.GetValue( "expandedField", out bool expandedField );
+			_label.SizeFlagsHorizontal = expandedField ? (int) SizeFlags.Fill : (int) SizeFlags.ExpandFill;
+
 			template.GetValue( "keyPrefix", out _keyPrefix );
 			_prefixLabel.Text = _keyPrefix;
 

diff --git a/Code/NodeCode/NodeSlots/KeySelectSlot.cs b/Code/NodeCode/NodeSlots/KeySelectSlot.cs
@@ -123,7 +123,12 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 			_label.Text = label;
 
 			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
 			_field.HintTooltip = info;
+
+			template.GetValue( "expandedField", out bool expandedField );
+			_label.SizeFlagsHorizontal = expandedField ? (int) SizeFlags.Fill : (int) SizeFlags.ExpandFill;
+			_field.Align = expandedField ? Godot.Label.AlignEnum.Right : Godot.Label.AlignEnum.Left;
 
 			template.GetValue( "slotType", out int slotType );
 			LinkType = slotType;

diff --git a/Code/NodeCode/NodeSlots/KeySlot.cs b/Code/NodeCode/NodeSlots/KeySlot.cs
@@ -41,8 +41,13 @@ public override void Init(GenericDataDictionary template, GenericDataObject pare
 			_label.Text = label;
 
 			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
 			_field.HintTooltip = info;
 
+			template.GetValue( "expandedField", out bool expandedField );
+			_label.SizeFlagsHorizontal = expandedField ? (int) SizeFlags.Fill : (int) SizeFlags.ExpandFill;
+			_field.Align = expandedField ? Godot.Label.AlignEnum.Right : Godot.Label.AlignEnum.Left;
+
 			template.GetValue( "keyPrefix", out _keyPrefix );
 			template.GetValue( "keySize", out _keySize );
 			template.GetValue( "slotType", out _linkType );

diff --git a/Code/NodeCode/NodeSlots/LinkToChildSlot.cs b/Code/NodeCode/NodeSlots/LinkToChildSlot.cs
@@ -53,6 +53,9 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 		{
 			template.GetValue( "label", out string label );
 			_label.Text = label;
+
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
 
 			if( template.values.ContainsKey( App.GRAPH_EXPLICIT_KEY ) )
 			{

diff --git a/Code/NodeCode/NodeSlots/LongSlot.cs b/Code/NodeCode/NodeSlots/LongSlot.cs
@@ -65,6 +65,14 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 			template.GetValue( "label", out string label );
 			_label.Text = label;
 
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_field.HintTooltip = info;
+
+			template.GetValue( "expandedField", out bool expandedField );
+			_label.SizeFlagsHorizontal = expandedField ? (int) SizeFlags.Fill : (int) SizeFlags.ExpandFill;
+			_field.Align = expandedField ? Godot.LineEdit.AlignEnum.Right : Godot.LineEdit.AlignEnum.Left;
+
 			parentModel.TryGetValue(_label.Text, out GenericDataObject<string> model);
 			if(model != null)
 			{

diff --git a/Code/NodeCode/NodeSlots/RelativePathSlot.cs b/Code/NodeCode/NodeSlots/RelativePathSlot.cs
@@ -96,6 +96,14 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 		{
 			template.GetValue( "label", out string label );
 			_label.Text = label;
+
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_field.HintTooltip = info;
+
+			template.GetValue( "expandedField", out bool expandedField );
+			_label.SizeFlagsHorizontal = expandedField ? (int) SizeFlags.Fill : (int) SizeFlags.ExpandFill;
+			_field.Align = expandedField ? Godot.Label.AlignEnum.Right : Godot.Label.AlignEnum.Left;
 
 			template.GetValue( "startOffset", out _startOffset );
 			template.GetValue( "prefix", out _prefix );

diff --git a/Code/NodeCode/NodeSlots/TextAreaRichSlot.cs b/Code/NodeCode/NodeSlots/TextAreaRichSlot.cs
@@ -35,6 +35,7 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 			_label.Text = label;
 
 			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
 			_field.HintTooltip = info;
 
 			template.GetValue( "minHeight", out float height );

diff --git a/Code/NodeCode/NodeSlots/TextAreaSlot.cs b/Code/NodeCode/NodeSlots/TextAreaSlot.cs
@@ -31,6 +31,7 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 			_label.Text = label;
 
 			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
 			_field.HintTooltip = info;
 
 			parentModel.TryGetValue(_label.Text, out GenericDataObject<string> model);

diff --git a/Code/NodeCode/NodeSlots/TextLineSlot.cs b/Code/NodeCode/NodeSlots/TextLineSlot.cs
@@ -27,6 +27,13 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 		{
 			template.GetValue( "label", out string label );
 			_label.Text = label;
+
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_field.HintTooltip = info;
+
+			template.GetValue( "expandedField", out bool expandedField );
+			_label.SizeFlagsHorizontal = expandedField ? (int) SizeFlags.Fill : (int) SizeFlags.ExpandFill;
 
 			parentModel.TryGetValue(_label.Text, out GenericDataObject<string> model);
 			parentModel.TryGetValue(_label.Text, out GenericDataObject nullToken);

diff --git a/Code/NodeCode/NodeSlots/TimeSpanSlot.cs b/Code/NodeCode/NodeSlots/TimeSpanSlot.cs
@@ -102,6 +102,10 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 		{
 			template.GetValue( "label", out string label );
 			_label.Text = label;
+
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_field.HintTooltip = info;
 
 			template.GetValue( "asSeconds", out asSeconds );
 

diff --git a/Code/NodeCode/NodeSlots/TypeSlot.cs b/Code/NodeCode/NodeSlots/TypeSlot.cs
@@ -43,6 +43,11 @@ public override void _GuiInput( InputEvent @event )
 
 		public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 		{
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_assemblyLabel.HintTooltip = info;
+			_typeLabel.HintTooltip = info;
+
 			template.GetValue( "Class Assembly", out assembly );
 			_assemblyLabel.Text = assembly;
 

diff --git a/Code/NodeCode/NodeSlots/Vector2Slot.cs b/Code/NodeCode/NodeSlots/Vector2Slot.cs
@@ -32,6 +32,11 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 		{
 			template.GetValue( "label", out string label );
 			_label.Text = label;
+
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_x.HintTooltip = info;
+			_y.HintTooltip = info;
 
 			parentModel.TryGetValue(_label.Text, out GenericDataDictionary model);
 			if(model != null)

diff --git a/Code/NodeCode/NodeSlots/Vector3Slot.cs b/Code/NodeCode/NodeSlots/Vector3Slot.cs
@@ -36,6 +36,12 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 		{
 			template.GetValue( "label", out string label );
 			_label.Text = label;
+
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_x.HintTooltip = info;
+			_y.HintTooltip = info;
+			_z.HintTooltip = info;
 
 			parentModel.TryGetValue(_label.Text, out GenericDataDictionary model);
 			if(model != null)

diff --git a/Code/NodeCode/NodeSlots/Vector4Slot.cs b/Code/NodeCode/NodeSlots/Vector4Slot.cs
@@ -41,6 +41,13 @@ public void Init(GenericDataDictionary template, GenericDataObject parentModel)
 		{
 			template.GetValue( "label", out string label );
 			_label.Text = label;
+
+			template.GetValue( "info", out string info );
+			_label.HintTooltip = info;
+			_x.HintTooltip = info;
+			_y.HintTooltip = info;
+			_z.HintTooltip = info;
+			_w.HintTooltip = info;
 
 			parentModel.TryGetValue(_label.Text, out GenericDataDictionary model);
 			if(model != null)

diff --git a/Code/NodeCode/SlottedGraphNode.cs b/Code/NodeCode/SlottedGraphNode.cs
@@ -482,7 +482,7 @@ public void CloseRequest()
 
 		private void OnResizeRequest(Vector2 newSize)
 		{
-			RectSize = new Vector2( newSize.x, newSize.y < RectSize.y ? newSize.y : RectSize.y );
+			RectSize = newSize;
 			_model.AddValue( App.NODE_SIZE_KEY, RectSize );
 			Dirty = true;
 		}

diff --git a/Nodes/Objects/Slots/BooleanSlot.tscn b/Nodes/Objects/Slots/BooleanSlot.tscn
@@ -17,6 +17,7 @@ _fieldPath = NodePath("../BooleanSlot/Field")
 margin_top = 13.0
 margin_right = 110.0
 margin_bottom = 27.0
+mouse_filter = 0
 size_flags_horizontal = 3
 
 [node name="Field" type="CheckBox" parent="."]

diff --git a/Nodes/Objects/Slots/ColorSlot.tscn b/Nodes/Objects/Slots/ColorSlot.tscn
@@ -21,6 +21,7 @@ margin_bottom = 18.0
 margin_top = 2.0
 margin_right = 74.0
 margin_bottom = 16.0
+mouse_filter = 0
 size_flags_horizontal = 3
 text = "Color"
 

diff --git a/Nodes/Objects/Slots/DateTimeOffsetSlot.tscn b/Nodes/Objects/Slots/DateTimeOffsetSlot.tscn
@@ -28,6 +28,7 @@ margin_bottom = 14.0
 [node name="Label" type="Label" parent="HBoxContainer"]
 margin_right = 74.0
 margin_bottom = 14.0
+mouse_filter = 0
 size_flags_horizontal = 3
 text = "Color"
 

diff --git a/Nodes/Objects/Slots/DateTimeSlot.tscn b/Nodes/Objects/Slots/DateTimeSlot.tscn
@@ -28,6 +28,7 @@ margin_bottom = 14.0
 [node name="Label" type="Label" parent="HBoxContainer"]
 margin_right = 74.0
 margin_bottom = 14.0
+mouse_filter = 0
 size_flags_horizontal = 3
 text = "Color"
 

diff --git a/Nodes/Objects/Slots/DoubleSlot.tscn b/Nodes/Objects/Slots/DoubleSlot.tscn
@@ -17,6 +17,7 @@ _fieldPath = NodePath("Field")
 margin_top = 13.0
 margin_right = 60.0
 margin_bottom = 27.0
+mouse_filter = 0
 size_flags_horizontal = 3
 
 [node name="Field" type="SpinBox" parent="."]

diff --git a/Nodes/Objects/Slots/EnumSlot.tscn b/Nodes/Objects/Slots/EnumSlot.tscn
@@ -17,6 +17,7 @@ _fieldPath = NodePath("Field")
 margin_top = 13.0
 margin_right = 7.0
 margin_bottom = 27.0
+mouse_filter = 0
 size_flags_horizontal = 3
 
 [node name="Field" type="OptionButton" parent="."]