epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Improves filter text field in asset browser."

Browse Source 
This reverts commit 4fcf73921f.
This commit is contained in:
deniz1a
2015-08-02 16:17:48 +03:00
parent 4b6c37f90f
commit 37ac08ecfe
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
View File

@@ -108,29 +108,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
panel.Get<ColorBlockWidget>("COLORBLOCK").GetColor = () => Game.Settings.Player.Color.RGB; panel.Get<ColorBlockWidget>("COLORBLOCK").GetColor = () => Game.Settings.Player.Color.RGB;
} }
Action closeAssetBrowser = () =>
{
if (isVideoLoaded)
player.Stop();
Ui.CloseWindow();
onExit();
};
filenameInput = panel.Get<TextFieldWidget>("FILENAME_INPUT"); filenameInput = panel.Get<TextFieldWidget>("FILENAME_INPUT");
filenameInput.TakeKeyboardFocus();
filenameInput.OnTextEdited = () => ApplyFilter(filenameInput.Text); filenameInput.OnTextEdited = () => ApplyFilter(filenameInput.Text);
filenameInput.OnEscKey = () => filenameInput.OnEscKey = filenameInput.YieldKeyboardFocus;
{
if (filenameInput.Text.Length == 0)
closeAssetBrowser();
else
{
filenameInput.Text = "";
filenameInput.OnTextEdited();
}
return true;
};
var frameContainer = panel.GetOrNull("FRAME_SELECTOR"); var frameContainer = panel.GetOrNull("FRAME_SELECTOR");
if (frameContainer != null) if (frameContainer != null)
@@ -238,7 +218,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var closeButton = panel.GetOrNull<ButtonWidget>("CLOSE_BUTTON"); var closeButton = panel.GetOrNull<ButtonWidget>("CLOSE_BUTTON");
if (closeButton != null) if (closeButton != null)
closeButton.OnClick = closeAssetBrowser; closeButton.OnClick = () =>
{
if (isVideoLoaded)
player.Stop();
Ui.CloseWindow();
onExit();
};
} }
void SelectNextFrame() void SelectNextFrame()