mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
Merge branch 'dev' into PrimaryMonitor
This commit is contained in:
commit
a5dcccdb2d
1 changed files with 4 additions and 4 deletions
|
|
@ -25,6 +25,8 @@ using System.Windows.Data;
|
||||||
using ModernWpf.Controls;
|
using ModernWpf.Controls;
|
||||||
using Key = System.Windows.Input.Key;
|
using Key = System.Windows.Input.Key;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
using System.Media;
|
||||||
|
|
||||||
|
|
||||||
namespace Flow.Launcher
|
namespace Flow.Launcher
|
||||||
{
|
{
|
||||||
|
|
@ -38,8 +40,8 @@ namespace Flow.Launcher
|
||||||
private NotifyIcon _notifyIcon;
|
private NotifyIcon _notifyIcon;
|
||||||
private ContextMenu contextMenu;
|
private ContextMenu contextMenu;
|
||||||
private MainViewModel _viewModel;
|
private MainViewModel _viewModel;
|
||||||
private readonly MediaPlayer animationSound = new();
|
|
||||||
private bool _animating;
|
private bool _animating;
|
||||||
|
SoundPlayer animationSound = new SoundPlayer(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav");
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
@ -51,7 +53,6 @@ namespace Flow.Launcher
|
||||||
|
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
InitializePosition();
|
InitializePosition();
|
||||||
animationSound.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public MainWindow()
|
public MainWindow()
|
||||||
|
|
@ -115,7 +116,6 @@ namespace Flow.Launcher
|
||||||
{
|
{
|
||||||
if (_settings.UseSound)
|
if (_settings.UseSound)
|
||||||
{
|
{
|
||||||
animationSound.Position = TimeSpan.Zero;
|
|
||||||
animationSound.Play();
|
animationSound.Play();
|
||||||
}
|
}
|
||||||
UpdatePosition();
|
UpdatePosition();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue