Skip to content

Commit 3c1a480

Browse files
committed
Fix: Run command animation
1 parent d72abc5 commit 3c1a480

File tree

2 files changed

+6
-26
lines changed

2 files changed

+6
-26
lines changed

Source/NETworkManager/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
<mah:FlyoutsControl>
238238
<mah:Flyout IsKeyboardFocusWithinChanged="FlyoutRunCommand_IsKeyboardFocusWithinChanged"
239239
IsOpen="{Binding FlyoutRunCommandIsOpen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
240-
AreAnimationsEnabled="{Binding FlyoutRunCommandAreAnimationsEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
240+
AreAnimationsEnabled="False"
241241
Visibility="{Binding FlyoutRunCommandIsOpen, Converter={StaticResource BooleanToVisibilityConverter}}"
242242
Position="Top"
243243
TitleVisibility="Collapsed"

Source/NETworkManager/MainWindow.xaml.cs

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -329,21 +329,6 @@ public bool FlyoutRunCommandIsOpen
329329
}
330330
}
331331

332-
private bool _flyoutRunCommandAreAnimationsEnabled;
333-
334-
public bool FlyoutRunCommandAreAnimationsEnabled
335-
{
336-
get => _flyoutRunCommandAreAnimationsEnabled;
337-
set
338-
{
339-
if (value == _flyoutRunCommandAreAnimationsEnabled)
340-
return;
341-
342-
_flyoutRunCommandAreAnimationsEnabled = value;
343-
OnPropertyChanged();
344-
}
345-
}
346-
347332
private bool _isRestartRequired;
348333

349334
public bool IsRestartRequired
@@ -1244,7 +1229,6 @@ private void OpenRunAction()
12441229
{
12451230
ConfigurationManager.OnDialogOpen();
12461231

1247-
FlyoutRunCommandAreAnimationsEnabled = true;
12481232
FlyoutRunCommandIsOpen = true;
12491233
}
12501234

@@ -1259,7 +1243,7 @@ private void RunCommandDoAction()
12591243

12601244
private void RunCommandCloseAction()
12611245
{
1262-
RunCommandFlyoutClose().ConfigureAwait(false);
1246+
RunCommandFlyoutClose();
12631247
}
12641248

12651249
#endregion
@@ -1321,28 +1305,24 @@ private void RunCommandDo()
13211305
}
13221306

13231307
// Close the flyout
1324-
RunCommandFlyoutClose(true).ConfigureAwait(false);
1308+
RunCommandFlyoutClose(true);
13251309
}
13261310

13271311
/// <summary>
13281312
/// Close the run command flyout and clear the search.
13291313
/// </summary>
1330-
private async Task RunCommandFlyoutClose(bool clearSearch = false)
1314+
private void RunCommandFlyoutClose(bool clearSearch = false)
13311315
{
13321316
if (!FlyoutRunCommandIsOpen)
13331317
return;
1334-
1335-
FlyoutRunCommandAreAnimationsEnabled = false;
1318+
13361319
FlyoutRunCommandIsOpen = false;
13371320

13381321
ConfigurationManager.OnDialogClose();
13391322

13401323
// Clear the search
13411324
if (clearSearch)
1342-
{
1343-
await Task.Delay(500); // Wait for the animation to finish
13441325
RunCommandSearch = string.Empty;
1345-
}
13461326
}
13471327

13481328
#endregion
@@ -1360,7 +1340,7 @@ private void FlyoutRunCommand_IsKeyboardFocusWithinChanged(object sender, Depend
13601340
if (e.NewValue is not false)
13611341
return;
13621342

1363-
RunCommandFlyoutClose().ConfigureAwait(false);
1343+
RunCommandFlyoutClose();
13641344
}
13651345

13661346
#endregion

0 commit comments

Comments
 (0)