stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-17 09:32:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

A couple of fixes to ScriptDocumentTab.FindPrevious() logic.

Browse source
This commit is contained in:
MaxED 2014-12-10 14:22:54 +00:00
parent 2f981476e0
commit 979244a163
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Source/Core/Controls/ScriptDocumentTab.cs
View file

@ -300,17 +300,20 @@ namespace CodeImp.DoomBuilder.Controls
// Find previous result (mxd)
public bool FindPrevious(FindReplaceOptions options)
{
bool wrapped = false;
byte[] data = editor.GetText();
string text = Encoding.GetEncoding(config.CodePage).GetString(data);
StringComparison mode = options.CaseSensitive ? StringComparison.CurrentCulture : StringComparison.CurrentCultureIgnoreCase;
int endpos = Math.Min(editor.SelectionStart, editor.SelectionEnd);
int initialendpos = endpos;
int searchlength = endpos;
bool wrapped = false;
int endpos = Math.Min(editor.SelectionStart, editor.SelectionEnd) - 1;
if(endpos < 0)
{
endpos = text.Length - 1;
wrapped = true;
}
while(true)
{
int result = text.LastIndexOf(options.FindText, endpos, searchlength, mode);
int result = text.LastIndexOf(options.FindText, endpos, mode);
if(result > -1)
{
// Check to see if it is the whole word
@ -321,7 +324,6 @@ namespace CodeImp.DoomBuilder.Controls
if(foundword.Length != options.FindText.Length)
{
endpos = result - 1;
searchlength = endpos;
result = -1;
}
}
@ -341,8 +343,7 @@ namespace CodeImp.DoomBuilder.Controls
// If we haven't tried from the end, try from the end now
if(!wrapped)
{
endpos = text.Length - 1;
searchlength = endpos - initialendpos;
endpos = Math.Max(0, text.Length - 2);
wrapped = true;
}
else

2
Source/Core/Controls/ScriptEditorPanel.cs
View file

@ -906,7 +906,7 @@ namespace CodeImp.DoomBuilder.Controls
private void searchbox_TextChanged(object sender, EventArgs e)
{
bool success = ActiveTab.FindNext(GetQuickSearchOptions(), true);
bool success = (searchbox.Text.Length > 0 && ActiveTab.FindNext(GetQuickSearchOptions(), true));
searchbox.BackColor = ((success || searchbox.Text.Length == 0) ? SystemColors.Window : Color.MistyRose);
searchnext.Enabled = success;
searchprev.Enabled = success;