Skip to content

fix calling mainwindow animation after loaded #908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjw24 merged 5 commits into from
Dec 20, 2021
Merged

fix calling mainwindow animation after loaded #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
739bf20
Delay Hotkey register & use safe way calling mainwindow animation
taooceros Dec 16, 2021
04c92b0
Delay till assign to Current.MainWindow
taooceros Dec 16, 2021
b487b6b
Update Flow.Launcher/ViewModel/MainViewModel.cs
taooceros Dec 19, 2021
6510671
Refacotr code
taooceros Dec 19, 2021
58317b7
rename showSound to animationSound
jjw24 Dec 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Flow.Launcher/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
PluginManager.LoadPlugins(_settings.PluginSettings);
_mainVM = new MainViewModel(_settings);

HotKeyMapper.Initialize(_mainVM);

API = new PublicAPIInstance(_settingsVM, _mainVM, _alphabet);

Http.API = API;
Expand All @@ -83,6 +81,8 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>

Current.MainWindow = window;
Current.MainWindow.Title = Constant.FlowLauncher;

HotKeyMapper.Initialize(_mainVM);

// happlebao todo temp fix for instance code logic
// load plugin before change language, because plugin language also needs be changed
Expand Down
12 changes: 12 additions & 0 deletions Flow.Launcher/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
using NotifyIcon = System.Windows.Forms.NotifyIcon;
using Flow.Launcher.Infrastructure;
using System.Windows.Media;

namespace Flow.Launcher
{
Expand All @@ -30,6 +31,7 @@ public partial class MainWindow
private NotifyIcon _notifyIcon;
private ContextMenu contextMenu;
private MainViewModel _viewModel;
private readonly MediaPlayer animationSound = new();
private bool _animating;

#endregion
Expand All @@ -41,6 +43,7 @@ public MainWindow(Settings settings, MainViewModel mainVM)
_settings = settings;
InitializeComponent();
InitializePosition();
animationSound.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
}

public MainWindow()
Expand Down Expand Up @@ -84,6 +87,12 @@ private void OnLoaded(object sender, RoutedEventArgs _)
{
if (_viewModel.MainWindowVisibilityStatus)
{
if (_settings.UseSound)
{
animationSound.Position = TimeSpan.Zero;
animationSound.Play();
}

UpdatePosition();
Activate();
QueryTextBox.Focus();
Expand All @@ -99,6 +108,9 @@ private void OnLoaded(object sender, RoutedEventArgs _)
_progressBarStoryboard.Begin(ProgressBar, true);
isProgressBarStoryboardPaused = false;
}

if(_settings.UseAnimation)
WindowAnimator();
}
else if (!isProgressBarStoryboardPaused)
{
Expand Down
14 changes: 1 addition & 13 deletions Flow.Launcher/ViewModel/MainViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
using System.Windows.Input;
using Flow.Launcher.Core.Plugin;
using Flow.Launcher.Core.Resource;
Expand All @@ -14,7 +13,6 @@
using Flow.Launcher.Infrastructure.Storage;
using Flow.Launcher.Infrastructure.UserSettings;
using Flow.Launcher.Plugin;
using Flow.Launcher.Plugin.SharedCommands;
using Flow.Launcher.Storage;
using Flow.Launcher.Infrastructure.Logger;
using Microsoft.VisualStudio.Threading;
Expand Down Expand Up @@ -734,20 +732,10 @@ public void ToggleFlowLauncher()

public void Show()
{
if (_settings.UseSound)
{
MediaPlayer media = new MediaPlayer();
media.Open(new Uri(AppDomain.CurrentDomain.BaseDirectory + "Resources\\open.wav"));
media.Play();
}

MainWindowVisibility = Visibility.Visible;

MainWindowVisibilityStatus = true;

if(_settings.UseAnimation)
((MainWindow)Application.Current.MainWindow).WindowAnimator();


MainWindowOpacity = 1;
}

Expand Down