GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Visject-CommentRenameImprovementsTwo' of https://github.com/Chikinsupu/FlaxEngine into Chikinsupu-Visject-CommentRenameImprovementsTwo

Browse Source
This commit is contained in:
Wojtek Figat
2024-12-16 23:17:56 +01:00
parent ff0840d6dd e9243d0358
commit 06dcc7ba8e
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Editor/Surface/Archetypes/Tools.cs
View File

@@ -1502,9 +1502,10 @@ namespace FlaxEditor.Surface.Archetypes
{
data = new object[]
{
filterText.Substring(2),
new Color(1.0f, 1.0f, 1.0f, 0.2f),
new Float2(400.0f, 400.0f),
filterText.Substring(2), // Title
new Color(1.0f, 1.0f, 1.0f, 0.2f), // Color
new Float2(400.0f, 400.0f), // Size
-1, // Order
};
return true;
}

23
Source/Editor/Surface/SurfaceComment.cs
View File

@@ -172,10 +172,21 @@ namespace FlaxEditor.Surface
/// <inheritdoc />
public override void Update(float deltaTime)
{
if (_isRenaming && (!_renameTextBox.IsFocused || !RootWindow.IsFocused))
if (_isRenaming)
{
Rename(_renameTextBox.Text);
StopRenaming();
// Stop renaming when clicking anywhere else
if (!_renameTextBox.IsFocused || !RootWindow.IsFocused)
{
Rename(_renameTextBox.Text);
StopRenaming();
}
}
else
{
if (IsSelected && Input.GetKeyDown(KeyboardKeys.F2))
{
StartRenaming();
}
}
base.Update(deltaTime);
@@ -417,6 +428,12 @@ namespace FlaxEditor.Surface
base.OnShowSecondaryContextMenu(menu, location);
menu.AddSeparator();
menu.AddButton("Rename", () =>
{
if(!_isRenaming)
StartRenaming();
});
ContextMenuChildMenu cmOrder = menu.AddChildMenu("Order");
{
cmOrder.ContextMenu.AddButton("Bring Forward", () =>