Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit 5327c5a

Browse files
committed
fixed OB refreshing when opening a file in search mode
1 parent 46b440c commit 5327c5a

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

UI/MainWindow/MainWindow.xaml.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,11 @@ public bool TryLoadSourceFile(string filePath, out EditorElement outEditor, bool
363363
BlendOverEffect.Begin();
364364
}
365365

366-
RefreshObjectBrowser();
366+
if (!SearchMode)
367+
{
368+
RefreshObjectBrowser();
369+
}
370+
367371
return true;
368372
}
369373

UI/MainWindow/MainWindowObjectBrowser.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public partial class MainWindow
2323
private readonly DispatcherTimer SearchCooldownTimer;
2424
private readonly List<TreeViewItem> ExpandedItems = new();
2525
private List<TreeViewItem> ExpandedItemsBuffer = new();
26-
private bool VisualsShown = false;
26+
private bool SearchMode = false;
2727
private bool OBExpanded = false;
2828

2929
public readonly Dictionary<string, string> FileIcons = new()
@@ -186,7 +186,7 @@ private void ListViewOBItem_SelectFile(object sender, RoutedEventArgs e)
186186
{
187187
return;
188188
}
189-
if (VisualsShown)
189+
if (SearchMode)
190190
{
191191
OBSearch.Clear();
192192
HideSearchVisuals();
@@ -208,7 +208,7 @@ private void ListViewOBItem_SelectConfig(object sender, RoutedEventArgs e)
208208
{
209209
return;
210210
}
211-
if (VisualsShown)
211+
if (SearchMode)
212212
{
213213
OBSearch.Clear();
214214
HideSearchVisuals();
@@ -226,7 +226,7 @@ private void ListViewOBItem_SelectConfig(object sender, RoutedEventArgs e)
226226
private void OBDirList_SelectionChanged(object sender, SelectionChangedEventArgs e)
227227
{
228228
OBSearch.Clear();
229-
if (VisualsShown)
229+
if (SearchMode)
230230
{
231231
HideSearchVisuals();
232232
}
@@ -245,7 +245,7 @@ private void OBSearch_PreviewKeyDown(object sender, KeyEventArgs e)
245245
ChangeObjectBrowserToDirectory(CurrentObjectBrowserDirectory);
246246
break;
247247
case Key.Enter:
248-
if (VisualsShown)
248+
if (SearchMode)
249249
{
250250
Search(OBSearch.Text);
251251
}
@@ -400,31 +400,31 @@ private List<TreeViewItem> GetFiles(List<string> dirs, string filter)
400400
/// </summary>
401401
private void ShowSearchVisuals()
402402
{
403-
if (VisualsShown)
403+
if (SearchMode)
404404
{
405405
return;
406406
}
407407
var objMargin = ObjectBrowser.Margin;
408408
objMargin.Top += 30;
409409
ObjectBrowser.Margin = objMargin;
410410
TxtSearchResults.Visibility = Visibility.Visible;
411-
VisualsShown = true;
411+
SearchMode = true;
412412
}
413413

414414
/// <summary>
415415
/// Hides 'Search Results' title from the Object Browser and restores TreeView height.
416416
/// </summary>
417417
private void HideSearchVisuals()
418418
{
419-
if (!VisualsShown)
419+
if (!SearchMode)
420420
{
421421
return;
422422
}
423423
var objMargin = ObjectBrowser.Margin;
424424
objMargin.Top -= 30;
425425
ObjectBrowser.Margin = objMargin;
426426
TxtSearchResults.Visibility = Visibility.Hidden;
427-
VisualsShown = false;
427+
SearchMode = false;
428428
}
429429

430430
/// <summary>

0 commit comments

Comments
 (0)