ckaczor/wpf-notifyicon
1
0
Fork 0
mirror of https://github.com/ckaczor/wpf-notifyicon.git synced 2026-01-26 10:55:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

WPF NotifyIcon 1.0.2

Browse Source 
--------------------
FIX   DataContext was not properly updated on ContextMenus (and probably ToolTips, Popups, and Balloons) if the DC was previously null.

git-svn-id: https://svn.evolvesoftware.ch/repos/evolve.net/WPF/NotifyIcon@110 9f600761-6f11-4665-b6dc-0185e9171623
This commit is contained in:
Philipp Sumi
2009-05-18 17:37:34 +00:00
parent aa4e7d00b3
commit d6fe6cbf76
6 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/NotifyIconWpf/Properties/AssemblyInfo.cs
View File

@@ -53,5 +53,5 @@ using System.Windows.Markup;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.1.0")]
[assembly: AssemblyFileVersion("1.0.1.0")]
[assembly: AssemblyVersion("1.0.2.0")]
[assembly: AssemblyFileVersion("1.0.2.0")]

8
Source/NotifyIconWpf/TaskbarIcon.Declarations.cs
View File

@@ -568,7 +568,13 @@ namespace Hardcodet.Wpf.TaskbarNotification
/// </summary>
private void UpdateDataContext(FrameworkElement target, object oldDataContextValue, object newDataContextValue)
{
if (target != null && !target.IsDataContextDataBound() && Equals(oldDataContextValue, target.DataContext))
//if there is no target or it's data context is determined through a binding
//of its own, keep it
if (target == null || target.IsDataContextDataBound()) return;
//if the target's data context is the NotifyIcon's old DataContext or the NotifyIcon itself,
//update it
if (ReferenceEquals(this, target.DataContext) || Equals(oldDataContextValue, target.DataContext))
{
//assign own data context, if available. If there is no data
//context at all, assign NotifyIcon itself.