ckaczor/wpf-notifyicon
1
0
Fork 0
mirror of https://github.com/ckaczor/wpf-notifyicon.git synced 2026-02-17 02:51:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

FIX ToolTipText changes update an existing wrapper ToolTip, if there is already one.

Browse Source 
NTFY-23

git-svn-id: https://svn.evolvesoftware.ch/repos/evolve.net/WPF/NotifyIcon@195 9f600761-6f11-4665-b6dc-0185e9171623
This commit is contained in:
Philipp Sumi
2013-11-22 23:03:56 +00:00
parent 4a656bb24e
commit cb3721ce48
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -298,10 +298,20 @@ namespace Hardcodet.Wpf.TaskbarNotification
/// <param name="e">Provides information about the updated property.</param> /// <param name="e">Provides information about the updated property.</param>
private void OnToolTipTextPropertyChanged(DependencyPropertyChangedEventArgs e) private void OnToolTipTextPropertyChanged(DependencyPropertyChangedEventArgs e)
{ {
//only recreate tooltip if we're not using a custom control //do not touch tooltips if we have a custom tooltip element
if (TrayToolTipResolved == null || TrayToolTipResolved.Content is string) if (TrayToolTip == null)
{ {
CreateCustomToolTip(); ToolTip currentToolTip = TrayToolTipResolved;
if (currentToolTip == null)
{
//if we don't have a wrapper tooltip for the tooltip text, create it now
CreateCustomToolTip();
}
else
{
//if we have a wrapper tooltip that shows the old tooltip text, just update content
currentToolTip.Content = e.NewValue;
}
} }
WriteToolTipSettings(); WriteToolTipSettings();

4
Source/NotifyIconWpf/TaskbarIcon.cs
View File

@@ -522,7 +522,7 @@ namespace Hardcodet.Wpf.TaskbarNotification
if (tt == null && TrayToolTip != null) if (tt == null && TrayToolTip != null)
{ {
//create an invisible tooltip that hosts the UIElement //create an invisible wrapper tooltip that hosts the UIElement
tt = new ToolTip(); tt = new ToolTip();
tt.Placement = PlacementMode.Mouse; tt.Placement = PlacementMode.Mouse;
@@ -542,7 +542,7 @@ namespace Hardcodet.Wpf.TaskbarNotification
} }
else if (tt == null && !String.IsNullOrEmpty(ToolTipText)) else if (tt == null && !String.IsNullOrEmpty(ToolTipText))
{ {
//create a simple tooltip for the string //create a simple tooltip for the ToolTipText string
tt = new ToolTip(); tt = new ToolTip();
tt.Content = ToolTipText; tt.Content = ToolTipText;
} }