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

Merge pull request #8888 from deniz1a/fix-assetbrowser

Browse Source 
Revert "Improves filter text field in asset browser."
This commit is contained in:
Oliver Brakmann
2015-08-02 16:12:21 +02:00
parent 1a83304f28 37ac08ecfe
commit 43a3717659
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;
}
Action closeAssetBrowser = () =>
{
if (isVideoLoaded)
player.Stop();
Ui.CloseWindow();
onExit();
};
filenameInput = panel.Get<TextFieldWidget>("FILENAME_INPUT");
filenameInput.TakeKeyboardFocus();
filenameInput.OnTextEdited = () => ApplyFilter(filenameInput.Text);
filenameInput.OnEscKey = () =>
{
if (filenameInput.Text.Length == 0)
closeAssetBrowser();
else
{
filenameInput.Text = "";
filenameInput.OnTextEdited();
}
return true;
};
filenameInput.OnEscKey = filenameInput.YieldKeyboardFocus;
var frameContainer = panel.GetOrNull("FRAME_SELECTOR");
if (frameContainer != null)
@@ -238,7 +218,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var closeButton = panel.GetOrNull<ButtonWidget>("CLOSE_BUTTON");
if (closeButton != null)
closeButton.OnClick = closeAssetBrowser;
closeButton.OnClick = () =>
{
if (isVideoLoaded)
player.Stop();
Ui.CloseWindow();
onExit();
};
}
void SelectNextFrame()