Skip to content

Commit 892a9ae

Browse files
committed
Revert "Fix window flickering when entering some context menus"
This reverts commit 6477dea.
1 parent 6477dea commit 892a9ae

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

Flow.Launcher/ViewModel/MainViewModel.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,10 +649,14 @@ public ResultsViewModel SelectedResults
649649
get => _selectedResults;
650650
private set
651651
{
652+
var isReturningFromQueryResults = QueryResultsSelected();
652653
var isReturningFromContextMenu = ContextMenuSelected();
653654
_selectedResults = value;
654655
if (QueryResultsSelected())
655656
{
657+
_results.Visibility = Visibility.Visible;
658+
_contextMenu.Visibility = Visibility.Collapsed;
659+
656660
// QueryText setter (used in ChangeQueryText) runs the query again, resetting the selected
657661
// result from the one that was selected before going into the context menu to the first result.
658662
// The code below correctly restores QueryText and puts the text caret at the end without
@@ -673,6 +677,8 @@ private set
673677
}
674678
else
675679
{
680+
_results.Visibility = Visibility.Collapsed;
681+
_contextMenu.Visibility = Visibility.Visible;
676682
_queryTextBeforeLeaveResults = QueryText;
677683

678684
// Because of Fody's optimization
@@ -1104,7 +1110,8 @@ private async Task QueryResultsAsync(bool searchDelay, bool isReQuery = false, b
11041110
{
11051111
App.API.LogDebug(ClassName, $"Clear query results");
11061112

1107-
// Clear results again because running query may show and add some results
1113+
// Hide and clear results again because running query may show and add some results
1114+
_results.Visibility = Visibility.Collapsed;
11081115
_results.Clear();
11091116

11101117
// Reset plugin icon

0 commit comments

Comments
 (0)