stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-23 12:22:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Texture browser: filtering for a texture name now automatically selects the best matching texture name. Addresses #483.

Browse source
This commit is contained in:
biwa 2020-10-23 23:30:07 +02:00
parent 09e40d2bae
commit ee6aad4150
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Source/Core/Controls/ImageBrowserControl.cs
View file

@ -428,8 +428,16 @@ namespace CodeImp.DoomBuilder.Controls
// Not when selecting is prevented
if(preventselection) return;
// Select first
if(list.Items.Count > 0) list.SetSelectedItem(list.Items[0]);
// Select first texture
if (list.Items.Count > 0)
{
foreach (ImageBrowserItem item in list.Items)
if (item.ItemType == ImageBrowserItemType.IMAGE)
{
list.SetSelectedItem(item);
break;
}
}
}
// This begins adding items
@ -493,13 +501,6 @@ namespace CodeImp.DoomBuilder.Controls
{
visibleitems = new List<ImageBrowserItem>();
//mxd. Store info about currently selected item
string selectedname = string.Empty;
if(!selectfirst && keepselected == -1 && list.SelectedItems.Count > 0)
{
selectedname = list.SelectedItems[0].Icon.Name;
}
// Clear list first
list.Clear();
list.Title = (usedtexturesfirst.Checked ? usedfirstgroup : availgroup);
@ -562,23 +563,26 @@ namespace CodeImp.DoomBuilder.Controls
SelectFirstItem();
}
//mxd. Try reselecting the same/next closest item
else if(!string.IsNullOrEmpty(selectedname))
else if(!string.IsNullOrEmpty(objectname.Text))
{
ImageBrowserItem bestmatch = null;
int charsmatched = 1;
foreach(ImageBrowserItem item in list.Items)
{
if(item.ItemType == ImageBrowserItemType.IMAGE && item.Icon.Name[0] == selectedname[0])
if(item.ItemType == ImageBrowserItemType.IMAGE && item.Icon.Name[0] == objectname.Text[0])
{
if(item.Icon.Name == selectedname)
if (bestmatch == null)
bestmatch = item;
if(item.Icon.Name == objectname.Text)
{
bestmatch = item;
break;
}
for(int i = 1; i < Math.Min(item.Icon.Name.Length, selectedname.Length); i++)
for(int i = 1; i < Math.Min(item.Icon.Name.Length, objectname.Text.Length); i++)
{
if(item.Icon.Name[i] != selectedname[i])
if(item.Icon.Name[i] == objectname.Text[i])
{
if(i > charsmatched)
{
@ -592,7 +596,7 @@ namespace CodeImp.DoomBuilder.Controls
}
// Select found item
if(bestmatch != null)
if (bestmatch != null)
{
list.SetSelectedItem(bestmatch);
}