Merge branch 'dev' into PrimaryMonitor

This commit is contained in:
DB P 2023-03-13 12:43:45 +09:00 committed by GitHub
commit a5dcccdb2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -25,6 +25,8 @@ using System.Windows.Data;
using ModernWpf.Controls;
using Key = System.Windows.Input.Key;
using System.Threading;
using System.Media;
namespace Flow.Launcher
{
@ -38,8 +40,8 @@ namespace Flow.Launcher
private NotifyIcon _notifyIcon;
private ContextMenu contextMenu;
private MainViewModel _viewModel;
private readonly MediaPlayer animationSound = new();
private bool _animating;
SoundPlayer animationSound = new SoundPlayer(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav");
#endregion
@ -50,8 +52,7 @@ namespace Flow.Launcher
_settings = settings;
InitializeComponent();
InitializePosition();
animationSound.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
InitializePosition();
}
public MainWindow()
@ -115,7 +116,6 @@ namespace Flow.Launcher
{
if (_settings.UseSound)
{
animationSound.Position = TimeSpan.Zero;
animationSound.Play();
}
UpdatePosition();