mirror/sbox-public
1
0
Fork 0
mirror of https://github.com/Facepunch/sbox-public.git synced 2025-12-23 22:48:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Component context menu tidy (#3582)

Browse Source 
* Only show property-prefab options on prefab instances, simplify names a bit

* Tweak these to match

* Transform

* Order

* Guessing this meant to pick the shortest source location path

* dotnet format
This commit is contained in:
Sol Williams
2025-12-22 07:15:06 +00:00
committed by GitHub
parent 08c4ae6d73
commit c496bedb0d
5 changed files with 107 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/Sandbox.Reflection/TypeLibrary/TypeDescription.cs
View File

@@ -448,7 +448,7 @@ public sealed class TypeDescription : ISourceLineProvider
SourceLine = 0;
SourceFile = null;
if ( OwnAttributes.OfType<SourceLocationAttribute>().MinBy( x => x.Path ) is { } sourceLocation )
if ( OwnAttributes.OfType<SourceLocationAttribute>().MinBy( x => x.Path.Length ) is { } sourceLocation )
{
SourceLine = sourceLocation.Line;
SourceFile = sourceLocation.Path;

19
game/addons/tools/Code/Editor/ControlSheet/ControlSheetRow.cs
View File

@@ -248,7 +248,8 @@ class ControlSheetRow : Widget
property.Parent.NoteFinishEdit( property );
} );
if ( IsEditingComponent || IsEditingGameObject )
bool isPrefab = property.GetContainingGameObject()?.IsPrefabInstance ?? false;
if ( isPrefab && (IsEditingComponent || IsEditingGameObject) )
{
menu.AddSeparator();
@@ -258,28 +259,20 @@ class ControlSheetRow : Widget
editedObject ??= EditedGameObjects.FirstOrDefault();
var prefabName = EditorUtility.Prefabs.GetOuterMostPrefabName( editedObject ) ?? "";
var revertChangesActionName = $"Revert Property instance change";
menu.AddOption( revertChangesActionName, "history", () =>
var revertActionName = "Revert Change";
menu.AddOption( revertActionName, "history", () =>
{
using var scene = SceneEditorSession.Scope();
using ( SceneEditorSession.Active.UndoScope( revertChangesActionName ).WithComponentChanges( EditedComponents ).WithGameObjectChanges( EditedGameObjects, GameObjectUndoFlags.Properties ).Push() )
using ( SceneEditorSession.Active.UndoScope( revertActionName ).WithComponentChanges( EditedComponents ).WithGameObjectChanges( EditedGameObjects, GameObjectUndoFlags.Properties ).Push() )
{
EditorUtility.Prefabs.RevertPropertyChange( property );
}
} ).Enabled = isPropertyModified;
var applyChangesActionName = $"Apply Property instance change to prefab \"{prefabName}\"";
menu.AddOption( applyChangesActionName, "update", () =>
{
using var scene = SceneEditorSession.Scope();
using ( SceneEditorSession.Active.UndoScope( applyChangesActionName ).WithComponentChanges( EditedComponents ).WithGameObjectChanges( EditedGameObjects, GameObjectUndoFlags.Properties ).Push() )
menu.AddOption( "Apply to Prefab", "save", () =>
{
EditorUtility.Prefabs.ApplyPropertyChange( property );
}
} ).Enabled = isPropertyModified;
}

59
game/addons/tools/Code/Scene/GameObjectInspector/ComponentListWidget.cs
View File

@@ -196,6 +196,7 @@ public class ComponentListWidget : Widget
component.Reset();
}
} );
menu.AddSeparator();
var componentIndex = componentList.GetAll().ToList().IndexOf( component );
@@ -230,16 +231,29 @@ public class ComponentListWidget : Widget
menu.AddSeparator();
menu.AddOption( "Remove Component", "remove", action: () =>
menu.AddOption( $"Cut {title}", "content_cut", action: () =>
{
ActivateSession();
using var scene = SceneEditorSession.Scope();
using ( SceneEditorSession.Active.UndoScope( $"Remove {component.GetType().Name} Component" ).WithComponentDestructions( component ).Push() )
using ( SceneEditorSession.Active.UndoScope( $"Cut {component.GetType().Name} Component" ).WithComponentDestructions( component ).Push() )
{
component.CopyToClipboard();
component.Destroy();
}
} );
}
menu.AddOption( $"Copy {title}", "copy_all", action: () => component.CopyToClipboard() );
if ( editable )
{
bool clipboardComponent = SceneEditor.HasComponentInClipboard();
menu.AddOption( "Paste Values", "content_paste", action: () => component.PasteValues() ).Enabled = clipboardComponent;
menu.AddOption( "Paste As New", "content_paste_go", action: () => component.GameObject.PasteComponent() ).Enabled = clipboardComponent;
}
menu.AddSeparator();
if ( component.GameObject.IsPrefabInstance )
{
@@ -247,7 +261,7 @@ public class ComponentListWidget : Widget
var prefabName = EditorUtility.Prefabs.GetOuterMostPrefabName( component );
var revertChangesActionName = $"Revert Component instance changes";
var revertChangesActionName = "Revert Changes";
menu.AddOption( revertChangesActionName, "history", action: () =>
{
ActivateSession();
@@ -260,8 +274,7 @@ public class ComponentListWidget : Widget
} ).Enabled = isComponentModified;
var applyChangesActionName = $"Apply Component instance changes to prefab \"{prefabName}\"";
menu.AddOption( applyChangesActionName, "update", action: () =>
menu.AddOption( "Apply to Prefab", "save", action: () =>
{
ActivateSession();
using var scene = SceneEditorSession.Scope();
@@ -269,8 +282,21 @@ public class ComponentListWidget : Widget
EditorUtility.Prefabs.ApplyComponentInstanceChangesToPrefab( component );
} ).Enabled = isComponentModified;
menu.AddSeparator();
}
menu.AddOption( "Remove Component", "remove", action: () =>
{
ActivateSession();
using var scene = SceneEditorSession.Scope();
using ( SceneEditorSession.Active.UndoScope( $"Remove {component.GetType().Name} Component" ).WithComponentDestructions( component ).Push() )
{
component.Destroy();
}
} );
var replace = menu.AddMenu( "Replace Component", "find_replace" );
replace.AddWidget( new MenuComponentTypeSelectorWidget( replace )
{
@@ -290,27 +316,6 @@ public class ComponentListWidget : Widget
}
} );
menu.AddOption( $"Cut {title}", "content_cut", action: () =>
{
ActivateSession();
using var scene = SceneEditorSession.Scope();
using ( SceneEditorSession.Active.UndoScope( $"Cut {component.GetType().Name} Component" ).WithComponentDestructions( component ).Push() )
{
component.CopyToClipboard();
component.Destroy();
}
} );
}
menu.AddOption( $"Copy {title}", "copy_all", action: () => component.CopyToClipboard() );
if ( editable && SceneEditor.HasComponentInClipboard() )
{
menu.AddOption( "Paste Values", "content_paste", action: () => component.PasteValues() );
menu.AddOption( "Paste As New", "content_paste_go", action: () => component.GameObject.PasteComponent() );
}
menu.AddSeparator();
var t = EditorTypeLibrary.GetType( component.GetType() );
@@ -318,7 +323,7 @@ public class ComponentListWidget : Widget
{
bool isPackage = component.GetType().Assembly.IsPackage();
var filename = System.IO.Path.GetFileName( t.SourceFile );
menu.AddOption( $"Open {filename}", "open_in_new", action: () => CodeEditor.OpenFile( t ) ).Enabled = isPackage;
menu.AddOption( $"Open {filename}", "code", action: () => CodeEditor.OpenFile( t ) ).Enabled = isPackage;
}
}

12
game/addons/tools/Code/Scene/GameObjectInspector/GameObjectTransformControl.cs
View File

@@ -94,7 +94,7 @@ partial class TransformComponentWidget : ComponentEditorWidget
menu.Clear();
menu.AddOption( UseLocal ? "Display Worldspace" : "Display Localspace", null, () =>
menu.AddOption( UseLocal ? "Display Worldspace" : "Display Localspace", "public", () =>
{
UseLocal = !UseLocal;
Rebuild();
@@ -102,19 +102,19 @@ partial class TransformComponentWidget : ComponentEditorWidget
menu.AddSeparator();
menu.AddOption( "Reset", action: () =>
menu.AddOption( "Reset", "restart_alt", () =>
{
SerializedObject.GetProperty( UseLocal ? "Local" : "World" ).SetValue( Transform.Zero );
} );
menu.AddSeparator();
menu.AddOption( "Copy Local Transform", action: () =>
menu.AddOption( "Copy Local Transform", "content_copy", () =>
{
var tx = SerializedObject.GetProperty( "Local" ).GetValue<Transform>();
EditorUtility.Clipboard.Copy( Json.Serialize( tx ) );
} );
menu.AddOption( "Copy World Transform", action: () =>
menu.AddOption( "Copy World Transform", "content_copy", () =>
{
var tx = SerializedObject.GetProperty( "World" ).GetValue<Transform>();
EditorUtility.Clipboard.Copy( Json.Serialize( tx ) );
@@ -126,12 +126,12 @@ partial class TransformComponentWidget : ComponentEditorWidget
var tx = Json.Deserialize<Transform>( clipText );
if ( tx != default )
{
menu.AddOption( "Paste as Local Transform", action: () =>
menu.AddOption( "Paste as Local Transform", "content_paste", () =>
{
SerializedObject.GetProperty( "Local" ).SetValue( tx );
} );
menu.AddOption( "Paste as World Transform", action: () =>
menu.AddOption( "Paste as World Transform", "content_paste", () =>
{
SerializedObject.GetProperty( "World" ).SetValue( tx );
} );

51
game/addons/tools/Code/Scene/SceneTree/GameObjectNode.cs
View File

@@ -600,8 +600,28 @@ partial class GameObjectNode : TreeNode<GameObject>
var isModified = selectedGos.Any( x => (x.IsPrefabInstanceRoot && EditorUtility.Prefabs.IsInstanceModified( x ))
|| (x.IsPrefabInstance && EditorUtility.Prefabs.IsGameObjectInstanceModified( gameObject )) );
var isAdded = selectedGos.All( x => x.IsPrefabInstance && EditorUtility.Prefabs.IsGameObjectAddedToInstance( x ) );
var revertChangesActionName = "Revert Changes";
prefabMenu.AddOption( revertChangesActionName, "history", () =>
{
using var scene = SceneEditorSession.Scope();
using ( SceneEditorSession.Active.UndoScope( revertChangesActionName ).WithGameObjectChanges( selectedGos, GameObjectUndoFlags.Properties ).Push() )
{
foreach ( var go in selectedGos )
{
if ( go.IsPrefabInstanceRoot )
{
EditorUtility.Prefabs.RevertInstanceToPrefab( go );
}
else if ( go.IsPrefabInstance )
{
EditorUtility.Prefabs.RevertGameObjectInstanceChanges( go );
}
}
}
} ).Enabled = isModified;
var isAdded = selectedGos.All( x => x.IsPrefabInstance && EditorUtility.Prefabs.IsGameObjectAddedToInstance( x ) );
if ( isAdded )
{
var applyAddActionName = multipleSources ? "Add Objects to Prefabs" : "Add Object to Prefab";
@@ -610,7 +630,7 @@ partial class GameObjectNode : TreeNode<GameObject>
var parentPrefabName = EditorUtility.Prefabs.GetOuterMostPrefabName( gameObject.Parent );
applyAddActionName += $" '{parentPrefabName ?? "Invalid"}'";
}
prefabMenu.AddOption( applyAddActionName, "update", () =>
prefabMenu.AddOption( applyAddActionName, "save", () =>
{
using var scene = SceneEditorSession.Scope();
@@ -629,8 +649,8 @@ partial class GameObjectNode : TreeNode<GameObject>
}
else
{
var applyChangesActionName = multipleSources ? "Apply Instance Changes to Prefabs" : "Apply Instance Changes To Prefab";
prefabMenu.AddOption( applyChangesActionName, "update", () =>
var applyChangesActionName = multipleSources ? "Apply to Prefabs" : "Apply to Prefab";
prefabMenu.AddOption( applyChangesActionName, "save", () =>
{
using var scene = SceneEditorSession.Scope();
@@ -651,29 +671,6 @@ partial class GameObjectNode : TreeNode<GameObject>
}
} ).Enabled = isModified;
}
var revertChangesActionName = "Revert Instance Changes";
prefabMenu.AddOption( revertChangesActionName, "history", () =>
{
using var scene = SceneEditorSession.Scope();
using ( SceneEditorSession.Active.UndoScope( revertChangesActionName ).WithGameObjectChanges( selectedGos, GameObjectUndoFlags.Properties ).Push() )
{
foreach ( var go in selectedGos )
{
if ( go.IsPrefabInstanceRoot )
{
EditorUtility.Prefabs.RevertInstanceToPrefab( go );
}
else if ( go.IsPrefabInstance )
{
EditorUtility.Prefabs.RevertGameObjectInstanceChanges( go );
}
}
}
} ).Enabled = isModified;
}
if ( !isPrefabRoot )