mirror of
https://github.com/ckaczor/wpf-notifyicon.git
synced 2026-02-16 18:49:54 -05:00
CHG Reformatted code and updated copyright notice.
NTFY-20 git-svn-id: https://svn.evolvesoftware.ch/repos/evolve.net/WPF/NotifyIcon@201 9f600761-6f11-4665-b6dc-0185e9171623
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
// hardcodet.net NotifyIcon for WPF
|
// hardcodet.net NotifyIcon for WPF
|
||||||
// Copyright (c) 2009 Philipp Sumi
|
// Copyright (c) 2009 - 2013 Philipp Sumi
|
||||||
// Contact and Information: http://www.hardcodet.net
|
// Contact and Information: http://www.hardcodet.net
|
||||||
//
|
//
|
||||||
// This library is free software; you can redistribute it and/or
|
// This library is free software; you can redistribute it and/or
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// hardcodet.net NotifyIcon for WPF
|
// hardcodet.net NotifyIcon for WPF
|
||||||
// Copyright (c) 2009 Philipp Sumi
|
// Copyright (c) 2009 - 2013 Philipp Sumi
|
||||||
// Contact and Information: http://www.hardcodet.net
|
// Contact and Information: http://www.hardcodet.net
|
||||||
//
|
//
|
||||||
// This library is free software; you can redistribute it and/or
|
// This library is free software; you can redistribute it and/or
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// hardcodet.net NotifyIcon for WPF
|
// hardcodet.net NotifyIcon for WPF
|
||||||
// Copyright (c) 2009 Philipp Sumi
|
// Copyright (c) 2009 - 2013 Philipp Sumi
|
||||||
// Contact and Information: http://www.hardcodet.net
|
// Contact and Information: http://www.hardcodet.net
|
||||||
//
|
//
|
||||||
// This library is free software; you can redistribute it and/or
|
// This library is free software; you can redistribute it and/or
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.Reflection;
|
using System;
|
||||||
|
using System.Reflection;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Markup;
|
using System.Windows.Markup;
|
||||||
@@ -36,7 +37,6 @@ using System.Windows.Markup;
|
|||||||
|
|
||||||
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
|
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
|
||||||
|
|
||||||
|
|
||||||
[assembly: ThemeInfo(
|
[assembly: ThemeInfo(
|
||||||
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
|
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
|
||||||
//(used if a resource is not found in the page,
|
//(used if a resource is not found in the page,
|
||||||
@@ -58,5 +58,5 @@ using System.Windows.Markup;
|
|||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
|
|
||||||
[assembly: AssemblyVersion("1.1.0.0")]
|
[assembly: AssemblyVersion("1.0.5.0")]
|
||||||
[assembly: AssemblyFileVersion("1.1.0.0")]
|
[assembly: AssemblyFileVersion("1.0.5.0")]
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
// hardcodet.net NotifyIcon for WPF
|
// hardcodet.net NotifyIcon for WPF
|
||||||
// Copyright (c) 2009 Philipp Sumi
|
// Copyright (c) 2009 - 2013 Philipp Sumi
|
||||||
// Contact and Information: http://www.hardcodet.net
|
// Contact and Information: http://www.hardcodet.net
|
||||||
//
|
//
|
||||||
// This library is free software; you can redistribute it and/or
|
// 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
|
//remove the taskbar icon reference from the previously used element
|
||||||
SetParentTaskbarIcon((DependencyObject) e.OldValue, null);
|
SetParentTaskbarIcon((DependencyObject) e.OldValue, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (e.NewValue != null)
|
if (e.NewValue != null)
|
||||||
{
|
{
|
||||||
//set this taskbar icon as a reference to the new tooltip element
|
//set this taskbar icon as a reference to the new tooltip element
|
||||||
SetParentTaskbarIcon((DependencyObject) e.NewValue, this);
|
SetParentTaskbarIcon((DependencyObject) e.NewValue, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
//update tooltip settings - needed to make sure a string is set, even
|
//update tooltip settings - needed to make sure a string is set, even
|
||||||
//if the ToolTipText property is not set. Otherwise, the event that
|
//if the ToolTipText property is not set. Otherwise, the event that
|
||||||
//triggers tooltip display is never fired.
|
//triggers tooltip display is never fired.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// hardcodet.net NotifyIcon for WPF
|
// hardcodet.net NotifyIcon for WPF
|
||||||
// Copyright (c) 2009 Philipp Sumi
|
// Copyright (c) 2009 - 2013 Philipp Sumi
|
||||||
// Contact and Information: http://www.hardcodet.net
|
// Contact and Information: http://www.hardcodet.net
|
||||||
//
|
//
|
||||||
// This library is free software; you can redistribute it and/or
|
// This library is free software; you can redistribute it and/or
|
||||||
@@ -194,7 +194,7 @@ namespace Hardcodet.Wpf.TaskbarNotification
|
|||||||
popup.PopupAnimation = animation;
|
popup.PopupAnimation = animation;
|
||||||
|
|
||||||
//in case the balloon is cleaned up through routed events, the
|
//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
|
//if was closed the last time - just make sure it doesn't have
|
||||||
//a parent that is a popup
|
//a parent that is a popup
|
||||||
var parent = LogicalTreeHelper.GetParent(balloon) as Popup;
|
var parent = LogicalTreeHelper.GetParent(balloon) as Popup;
|
||||||
@@ -445,10 +445,11 @@ namespace Hardcodet.Wpf.TaskbarNotification
|
|||||||
if (me == MouseEvent.IconLeftMouseUp && !isLeftClickCommandInvoked)
|
if (me == MouseEvent.IconLeftMouseUp && !isLeftClickCommandInvoked)
|
||||||
{
|
{
|
||||||
//show context menu once we are sure it's not a double click
|
//show context menu once we are sure it's not a double click
|
||||||
singleClickTimerAction = () =>
|
singleClickTimerAction =
|
||||||
{
|
() =>
|
||||||
LeftClickCommand.ExecuteIfEnabled(LeftClickCommandParameter, LeftClickCommandTarget ?? this);
|
{
|
||||||
};
|
LeftClickCommand.ExecuteIfEnabled(LeftClickCommandParameter, LeftClickCommandTarget ?? this);
|
||||||
|
};
|
||||||
singleClickTimer.Change(WinApi.GetDoubleClickTime(), Timeout.Infinite);
|
singleClickTimer.Change(WinApi.GetDoubleClickTime(), Timeout.Infinite);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -717,7 +718,7 @@ namespace Hardcodet.Wpf.TaskbarNotification
|
|||||||
ContextMenu.IsOpen = true;
|
ContextMenu.IsOpen = true;
|
||||||
|
|
||||||
IntPtr handle = IntPtr.Zero;
|
IntPtr handle = IntPtr.Zero;
|
||||||
|
|
||||||
//try to get a handle on the context itself
|
//try to get a handle on the context itself
|
||||||
HwndSource source = (HwndSource) PresentationSource.FromVisual(ContextMenu);
|
HwndSource source = (HwndSource) PresentationSource.FromVisual(ContextMenu);
|
||||||
if (source != null)
|
if (source != null)
|
||||||
@@ -977,7 +978,7 @@ namespace Hardcodet.Wpf.TaskbarNotification
|
|||||||
}
|
}
|
||||||
|
|
||||||
//on standard DPI settings, just return the point
|
//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)};
|
return new Point() {X = (int) (point.X*scalingFactor), Y = (int) (point.Y*scalingFactor)};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// hardcodet.net NotifyIcon for WPF
|
// hardcodet.net NotifyIcon for WPF
|
||||||
// Copyright (c) 2009 Philipp Sumi
|
// Copyright (c) 2009 - 2013 Philipp Sumi
|
||||||
// Contact and Information: http://www.hardcodet.net
|
// Contact and Information: http://www.hardcodet.net
|
||||||
//
|
//
|
||||||
// This library is free software; you can redistribute it and/or
|
// This library is free software; you can redistribute it and/or
|
||||||
|
|||||||
Reference in New Issue
Block a user