From 13e66c6356b1b935f661cfd631b86c2e2365b70c Mon Sep 17 00:00:00 2001 From: Darth Affe Date: Thu, 3 Aug 2017 19:37:33 +0200 Subject: [PATCH] Improved trayIcon handling --- KeyboardAudioVisualizer/App.xaml.cs | 1 + KeyboardAudioVisualizer/Controls/BlurredDecorationWindow.cs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/KeyboardAudioVisualizer/App.xaml.cs b/KeyboardAudioVisualizer/App.xaml.cs index b154184..c78f041 100644 --- a/KeyboardAudioVisualizer/App.xaml.cs +++ b/KeyboardAudioVisualizer/App.xaml.cs @@ -33,6 +33,7 @@ namespace KeyboardAudioVisualizer try { _taskbarIcon = (TaskbarIcon)FindResource("TaskbarIcon"); + _taskbarIcon.DoubleClickCommand = ApplicationManager.Instance.OpenConfigurationCommand; Settings settings = SerializationHelper.LoadObjectFromFile(PATH_SETTINGS); if (settings == null) diff --git a/KeyboardAudioVisualizer/Controls/BlurredDecorationWindow.cs b/KeyboardAudioVisualizer/Controls/BlurredDecorationWindow.cs index 649ccac..78916cb 100644 --- a/KeyboardAudioVisualizer/Controls/BlurredDecorationWindow.cs +++ b/KeyboardAudioVisualizer/Controls/BlurredDecorationWindow.cs @@ -10,7 +10,7 @@ namespace KeyboardAudioVisualizer.Controls [TemplatePart(Name = "PART_CloseButton", Type = typeof(Button))] [TemplatePart(Name = "PART_MinimizeButton", Type = typeof(Button))] [TemplatePart(Name = "PART_IconButton", Type = typeof(Button))] - public class BlurredDecorationWindow : System.Windows.Window + public class BlurredDecorationWindow : Window { #region DependencyProperties // ReSharper disable InconsistentNaming @@ -79,7 +79,7 @@ namespace KeyboardAudioVisualizer.Controls Button minimizeButton = GetTemplateChild("PART_MinimizeButton") as Button; if (minimizeButton != null) - minimizeButton.Click += (sender, args) => Application.Current.MainWindow.WindowState = WindowState.Minimized; + minimizeButton.Click += (sender, args) => Hide(); Button iconButton = GetTemplateChild("PART_IconButton") as Button; if (iconButton != null)