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

Fix showing Content Search window to properly use context window

Browse Source
This commit is contained in:
Wojtek Figat
2025-03-31 14:12:03 +02:00
parent f947aa3ae2
commit c00876fa94
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Editor/Modules/ContentFindingModule.cs
View File

@@ -92,7 +92,7 @@ namespace FlaxEditor.Modules
DockWindow window = null; DockWindow window = null;
foreach (var editorWindow in Editor.Windows.Windows) foreach (var editorWindow in Editor.Windows.Windows)
{ {
if (editorWindow.Visible && editorWindow.ContainsFocus) if (editorWindow.Visible && editorWindow.ContainsFocus && editorWindow.Parent != null)
{ {
window = editorWindow; window = editorWindow;
break; break;

5
Source/Editor/Surface/SurfaceUtils.cs
View File

@@ -570,6 +570,7 @@ namespace FlaxEditor.Surface
var interfaceOptions = editor.Options.Options.Interface; var interfaceOptions = editor.Options.Options.Interface;
var inputOptions = editor.Options.Options.Input; var inputOptions = editor.Options.Options.Input;
var undo = surface.Undo; var undo = surface.Undo;
var showSearch = () => editor.ContentFinding.ShowSearch(window);
// Toolstrip // Toolstrip
saveButton = toolStrip.AddButton(editor.Icons.Save64, window.Save).LinkTooltip("Save", ref inputOptions.Save); saveButton = toolStrip.AddButton(editor.Icons.Save64, window.Save).LinkTooltip("Save", ref inputOptions.Save);
@@ -577,7 +578,7 @@ namespace FlaxEditor.Surface
undoButton = toolStrip.AddButton(editor.Icons.Undo64, undo.PerformUndo).LinkTooltip("Undo", ref inputOptions.Undo); undoButton = toolStrip.AddButton(editor.Icons.Undo64, undo.PerformUndo).LinkTooltip("Undo", ref inputOptions.Undo);
redoButton = toolStrip.AddButton(editor.Icons.Redo64, undo.PerformRedo).LinkTooltip("Redo", ref inputOptions.Redo); redoButton = toolStrip.AddButton(editor.Icons.Redo64, undo.PerformRedo).LinkTooltip("Redo", ref inputOptions.Redo);
toolStrip.AddSeparator(); toolStrip.AddSeparator();
toolStrip.AddButton(editor.Icons.Search64, editor.ContentFinding.ShowSearch).LinkTooltip("Open content search tool", ref inputOptions.Search); toolStrip.AddButton(editor.Icons.Search64, showSearch).LinkTooltip("Open content search tool", ref inputOptions.Search);
toolStrip.AddButton(editor.Icons.CenterView64, surface.ShowWholeGraph).LinkTooltip("Show whole graph"); toolStrip.AddButton(editor.Icons.CenterView64, surface.ShowWholeGraph).LinkTooltip("Show whole graph");
var gridSnapButton = toolStrip.AddButton(editor.Icons.Grid32, surface.ToggleGridSnapping); var gridSnapButton = toolStrip.AddButton(editor.Icons.Grid32, surface.ToggleGridSnapping);
gridSnapButton.LinkTooltip("Toggle grid snapping for nodes."); gridSnapButton.LinkTooltip("Toggle grid snapping for nodes.");
@@ -588,7 +589,7 @@ namespace FlaxEditor.Surface
// Setup input actions // Setup input actions
window.InputActions.Add(options => options.Undo, undo.PerformUndo); window.InputActions.Add(options => options.Undo, undo.PerformUndo);
window.InputActions.Add(options => options.Redo, undo.PerformRedo); window.InputActions.Add(options => options.Redo, undo.PerformRedo);
window.InputActions.Add(options => options.Search, editor.ContentFinding.ShowSearch); window.InputActions.Add(options => options.Search, showSearch);
} }
} }
} }