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

Changed all search boxes to new class.

Browse Source
This commit is contained in:
Chandler Cox
2022-12-15 21:18:49 -06:00
parent 1c85b30e9f
commit e725533ba7
6 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Editor/GUI/ItemsListContextMenu.cs
View File

@@ -3,6 +3,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using FlaxEditor.GUI.ContextMenu; using FlaxEditor.GUI.ContextMenu;
using FlaxEditor.GUI.Input;
using FlaxEditor.Utilities; using FlaxEditor.Utilities;
using FlaxEngine; using FlaxEngine;
using FlaxEngine.GUI; using FlaxEngine.GUI;
@@ -204,11 +205,10 @@ namespace FlaxEditor.GUI
Size = new Float2(width, height); Size = new Float2(width, height);
// Search box // Search box
_searchBox = new TextBox(false, 1, 1) _searchBox = new SearchBox(false, 1, 1)
{ {
Parent = this, Parent = this,
Width = Width - 3, Width = Width - 3,
WatermarkText = "Search...",
}; };
_searchBox.TextChanged += OnSearchFilterChanged; _searchBox.TextChanged += OnSearchFilterChanged;

4
Source/Editor/Surface/ContextMenu/VisjectCM.cs
View File

@@ -4,6 +4,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using FlaxEditor.GUI.ContextMenu; using FlaxEditor.GUI.ContextMenu;
using FlaxEditor.GUI.Input;
using FlaxEditor.Scripting; using FlaxEditor.Scripting;
using FlaxEngine; using FlaxEngine;
using FlaxEngine.GUI; using FlaxEngine.GUI;
@@ -128,10 +129,9 @@ namespace FlaxEditor.Surface.ContextMenu
Size = new Float2(320, 220); Size = new Float2(320, 220);
// Search box // Search box
_searchBox = new TextBox(false, 1, 1) _searchBox = new SearchBox(false, 1, 1)
{ {
Width = Width - 3, Width = Width - 3,
WatermarkText = "Search...",
Parent = this Parent = this
}; };
_searchBox.TextChanged += OnSearchFilterChanged; _searchBox.TextChanged += OnSearchFilterChanged;

4
Source/Editor/Utilities/Utils.cs
View File

@@ -14,6 +14,7 @@ using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
using FlaxEditor.GUI.ContextMenu; using FlaxEditor.GUI.ContextMenu;
using FlaxEditor.GUI.Input;
using FlaxEditor.GUI.Tree; using FlaxEditor.GUI.Tree;
using FlaxEditor.SceneGraph; using FlaxEditor.SceneGraph;
using FlaxEditor.Scripting; using FlaxEditor.Scripting;
@@ -956,10 +957,9 @@ namespace FlaxEditor.Utilities
{ {
Size = new Float2(320, 220), Size = new Float2(320, 220),
}; };
searchBox = new TextBox(false, 1, 1) searchBox = new SearchBox(false, 1, 1)
{ {
Width = menu.Width - 3, Width = menu.Width - 3,
WatermarkText = "Search...",
Parent = menu, Parent = menu,
}; };
var panel1 = new Panel(ScrollBars.Vertical) var panel1 = new Panel(ScrollBars.Vertical)

4
Source/Editor/Windows/Assets/PrefabWindow.cs
View File

@@ -6,6 +6,7 @@ using FlaxEditor.Content;
using FlaxEditor.CustomEditors; using FlaxEditor.CustomEditors;
using FlaxEditor.Gizmo; using FlaxEditor.Gizmo;
using FlaxEditor.GUI; using FlaxEditor.GUI;
using FlaxEditor.GUI.Input;
using FlaxEditor.SceneGraph; using FlaxEditor.SceneGraph;
using FlaxEditor.Viewport; using FlaxEditor.Viewport;
using FlaxEngine; using FlaxEngine;
@@ -124,10 +125,9 @@ namespace FlaxEditor.Windows.Assets
IsScrollable = false, IsScrollable = false,
Offsets = new Margin(0, 0, 0, 18 + 6), Offsets = new Margin(0, 0, 0, 18 + 6),
}; };
_searchBox = new TextBox _searchBox = new SearchBox()
{ {
AnchorPreset = AnchorPresets.HorizontalStretchMiddle, AnchorPreset = AnchorPresets.HorizontalStretchMiddle,
WatermarkText = "Search...",
Parent = headerPanel, Parent = headerPanel,
Bounds = new Rectangle(4, 4, headerPanel.Width - 8, 18), Bounds = new Rectangle(4, 4, headerPanel.Width - 8, 18),
}; };

1
Source/Editor/Windows/ContentWindow.cs
View File

@@ -151,7 +151,6 @@ namespace FlaxEditor.Windows
_itemsSearchBox = new SearchBox _itemsSearchBox = new SearchBox
{ {
AnchorPreset = AnchorPresets.HorizontalStretchMiddle, AnchorPreset = AnchorPresets.HorizontalStretchMiddle,
WatermarkText = "Search...",
Parent = contentItemsSearchPanel, Parent = contentItemsSearchPanel,
Bounds = new Rectangle(viewDropdownWidth + 8, 4, contentItemsSearchPanel.Width - 12 - viewDropdownWidth, 18), Bounds = new Rectangle(viewDropdownWidth + 8, 4, contentItemsSearchPanel.Width - 12 - viewDropdownWidth, 18),
}; };

4
Source/Editor/Windows/Search/ContentSearchWindow.cs
View File

@@ -10,6 +10,7 @@ using FlaxEditor;
using FlaxEditor.GUI; using FlaxEditor.GUI;
using FlaxEditor.GUI.ContextMenu; using FlaxEditor.GUI.ContextMenu;
using FlaxEditor.GUI.Docking; using FlaxEditor.GUI.Docking;
using FlaxEditor.GUI.Input;
using FlaxEditor.GUI.Tree; using FlaxEditor.GUI.Tree;
using FlaxEditor.Scripting; using FlaxEditor.Scripting;
using FlaxEditor.Surface; using FlaxEditor.Surface;
@@ -224,10 +225,9 @@ namespace FlaxEngine.Windows.Search
Parent = topPanel, Parent = topPanel,
}; };
optionsButton.ButtonClicked += OnOptionsDropdownClicked; optionsButton.ButtonClicked += OnOptionsDropdownClicked;
_searchBox = new TextBox _searchBox = new SearchBox
{ {
AnchorPreset = AnchorPresets.HorizontalStretchMiddle, AnchorPreset = AnchorPresets.HorizontalStretchMiddle,
WatermarkText = "Search...",
Parent = topPanel, Parent = topPanel,
Bounds = new Rectangle(optionsButton.Right + 2.0f, 2, topPanel.Width - 4.0f - optionsButton.Width, 18.0f), Bounds = new Rectangle(optionsButton.Right + 2.0f, 2, topPanel.Width - 4.0f - optionsButton.Width, 18.0f),
}; };