diff --git a/Source/NotifyIconWpf/BalloonIcon.cs b/Source/NotifyIconWpf/BalloonIcon.cs index 8f1cb70..e8e630a 100644 --- a/Source/NotifyIconWpf/BalloonIcon.cs +++ b/Source/NotifyIconWpf/BalloonIcon.cs @@ -1,5 +1,5 @@ // hardcodet.net NotifyIcon for WPF -// Copyright (c) 2009 Philipp Sumi +// Copyright (c) 2009 - 2013 Philipp Sumi // Contact and Information: http://www.hardcodet.net // // This library is free software; you can redistribute it and/or diff --git a/Source/NotifyIconWpf/Interop/WindowMessageSink.cs b/Source/NotifyIconWpf/Interop/WindowMessageSink.cs index 2c36c5f..b134f88 100644 --- a/Source/NotifyIconWpf/Interop/WindowMessageSink.cs +++ b/Source/NotifyIconWpf/Interop/WindowMessageSink.cs @@ -1,5 +1,5 @@ // hardcodet.net NotifyIcon for WPF -// Copyright (c) 2009 Philipp Sumi +// Copyright (c) 2009 - 2013 Philipp Sumi // Contact and Information: http://www.hardcodet.net // // This library is free software; you can redistribute it and/or diff --git a/Source/NotifyIconWpf/PopupActivationMode.cs b/Source/NotifyIconWpf/PopupActivationMode.cs index 0197347..227fb0a 100644 --- a/Source/NotifyIconWpf/PopupActivationMode.cs +++ b/Source/NotifyIconWpf/PopupActivationMode.cs @@ -1,5 +1,5 @@ // hardcodet.net NotifyIcon for WPF -// Copyright (c) 2009 Philipp Sumi +// Copyright (c) 2009 - 2013 Philipp Sumi // Contact and Information: http://www.hardcodet.net // // This library is free software; you can redistribute it and/or diff --git a/Source/NotifyIconWpf/Properties/AssemblyInfo.cs b/Source/NotifyIconWpf/Properties/AssemblyInfo.cs index 88453b3..7d49957 100644 --- a/Source/NotifyIconWpf/Properties/AssemblyInfo.cs +++ b/Source/NotifyIconWpf/Properties/AssemblyInfo.cs @@ -1,4 +1,5 @@ -using System.Reflection; +using System; +using System.Reflection; using System.Runtime.InteropServices; using System.Windows; using System.Windows.Markup; @@ -36,7 +37,6 @@ using System.Windows.Markup; //[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located //(used if a resource is not found in the page, @@ -58,5 +58,5 @@ using System.Windows.Markup; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.0.0")] -[assembly: AssemblyFileVersion("1.1.0.0")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.5.0")] +[assembly: AssemblyFileVersion("1.0.5.0")] \ No newline at end of file diff --git a/Source/NotifyIconWpf/TaskbarIcon.Declarations.cs b/Source/NotifyIconWpf/TaskbarIcon.Declarations.cs index 56bd376..3e60352 100644 --- a/Source/NotifyIconWpf/TaskbarIcon.Declarations.cs +++ b/Source/NotifyIconWpf/TaskbarIcon.Declarations.cs @@ -1,5 +1,5 @@ // hardcodet.net NotifyIcon for WPF -// Copyright (c) 2009 Philipp Sumi +// Copyright (c) 2009 - 2013 Philipp Sumi // Contact and Information: http://www.hardcodet.net // // This library is free software; you can redistribute it and/or @@ -380,13 +380,13 @@ namespace Hardcodet.Wpf.TaskbarNotification //remove the taskbar icon reference from the previously used element SetParentTaskbarIcon((DependencyObject) e.OldValue, null); } - + if (e.NewValue != null) { //set this taskbar icon as a reference to the new tooltip element SetParentTaskbarIcon((DependencyObject) e.NewValue, this); } - + //update tooltip settings - needed to make sure a string is set, even //if the ToolTipText property is not set. Otherwise, the event that //triggers tooltip display is never fired. diff --git a/Source/NotifyIconWpf/TaskbarIcon.cs b/Source/NotifyIconWpf/TaskbarIcon.cs index f9bb617..a205e0f 100644 --- a/Source/NotifyIconWpf/TaskbarIcon.cs +++ b/Source/NotifyIconWpf/TaskbarIcon.cs @@ -1,5 +1,5 @@ // hardcodet.net NotifyIcon for WPF -// Copyright (c) 2009 Philipp Sumi +// Copyright (c) 2009 - 2013 Philipp Sumi // Contact and Information: http://www.hardcodet.net // // This library is free software; you can redistribute it and/or @@ -194,7 +194,7 @@ namespace Hardcodet.Wpf.TaskbarNotification popup.PopupAnimation = animation; //in case the balloon is cleaned up through routed events, the - //control didn't removed the balloon from its parent popup when + //control didn't remove the balloon from its parent popup when //if was closed the last time - just make sure it doesn't have //a parent that is a popup var parent = LogicalTreeHelper.GetParent(balloon) as Popup; @@ -445,10 +445,11 @@ namespace Hardcodet.Wpf.TaskbarNotification if (me == MouseEvent.IconLeftMouseUp && !isLeftClickCommandInvoked) { //show context menu once we are sure it's not a double click - singleClickTimerAction = () => - { - LeftClickCommand.ExecuteIfEnabled(LeftClickCommandParameter, LeftClickCommandTarget ?? this); - }; + singleClickTimerAction = + () => + { + LeftClickCommand.ExecuteIfEnabled(LeftClickCommandParameter, LeftClickCommandTarget ?? this); + }; singleClickTimer.Change(WinApi.GetDoubleClickTime(), Timeout.Infinite); } } @@ -717,7 +718,7 @@ namespace Hardcodet.Wpf.TaskbarNotification ContextMenu.IsOpen = true; IntPtr handle = IntPtr.Zero; - + //try to get a handle on the context itself HwndSource source = (HwndSource) PresentationSource.FromVisual(ContextMenu); if (source != null) @@ -977,7 +978,7 @@ namespace Hardcodet.Wpf.TaskbarNotification } //on standard DPI settings, just return the point - if(scalingFactor == 1.0) return point; + if (scalingFactor == 1.0) return point; return new Point() {X = (int) (point.X*scalingFactor), Y = (int) (point.Y*scalingFactor)}; } diff --git a/Source/NotifyIconWpf/Util.cs b/Source/NotifyIconWpf/Util.cs index 6c3f171..1ea47c0 100644 --- a/Source/NotifyIconWpf/Util.cs +++ b/Source/NotifyIconWpf/Util.cs @@ -1,5 +1,5 @@ // hardcodet.net NotifyIcon for WPF -// Copyright (c) 2009 Philipp Sumi +// Copyright (c) 2009 - 2013 Philipp Sumi // Contact and Information: http://www.hardcodet.net // // This library is free software; you can redistribute it and/or