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

WPF NotifyIcon

Browse Source 
--------------
FIX   Dispose only deregisters OnExit event listenter if there is actually an
      application (not the case in WinForms environments).
CHG   Added dispose to WinForms sample which closes the NotifyIcon.

git-svn-id: https://svn.evolvesoftware.ch/repos/evolve.net/WPF/NotifyIcon@121 9f600761-6f11-4665-b6dc-0185e9171623
This commit is contained in:
Philipp Sumi
2009-09-22 07:48:22 +00:00
parent ac2eed0a25
commit 2a4cf8de7e
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Changelog.txt
View File

@@ -12,8 +12,10 @@ FIX If a popup is opened, its window handle is now being set as the foreground
This fixes an issue with certain controls being disabled on popups. This fixes an issue with certain controls being disabled on popups.
(thanks Andrew Smith for pointing me in the right direction!). (thanks Andrew Smith for pointing me in the right direction!).
FIX Changed dispatcher access in order to work in WinForms scenarios, too. FIX Changed dispatcher access in order to work in WinForms scenarios, too.
FIX Corrected typo in WindowMessageSink.BalloonToolTipChanged event. Used internally FIX Corrected typo in WindowMessageSink.BalloonToolTipChanged event (thanks Mertsch).
(although event is public), so users should be fine. Used internally (although event is public), so this shouldn't be a breaking change.
FIX Dispose only deregisters OnExit event listenter if there is actually an
application (not the case in WinForms environments).
---------------------------------------------------------------------------- ----------------------------------------------------------------------------

5
Source/NotifyIconWpf/TaskbarIcon.cs
View File

@@ -994,7 +994,10 @@ namespace Hardcodet.Wpf.TaskbarNotification
IsDisposed = true; IsDisposed = true;
//deregister application event listener //deregister application event listener
Application.Current.Exit -= OnExit; if (Application.Current != null)
{
Application.Current.Exit -= OnExit;
}
//stop timers //stop timers
singleClickTimer.Dispose(); singleClickTimer.Dispose();

19
Source/WindowsFormsSample/Form1.cs
View File

@@ -15,6 +15,8 @@ namespace WindowsFormsSample
{ {
public partial class Form1 : Form public partial class Form1 : Form
{ {
private TaskbarIcon notifyIcon;
public Form1() public Form1()
{ {
InitializeComponent(); InitializeComponent();
@@ -23,11 +25,20 @@ namespace WindowsFormsSample
protected override void OnLoad(EventArgs e) protected override void OnLoad(EventArgs e)
{ {
base.OnLoad(e); base.OnLoad(e);
TaskbarIcon tb = new TaskbarIcon(); notifyIcon = new TaskbarIcon();
tb.Icon = Resources.Led; notifyIcon.Icon = Resources.Led;
tb.Visibility = Visibility.Visible; notifyIcon.ToolTipText = "Left-click to open popup";
notifyIcon.Visibility = Visibility.Visible;
tb.TrayPopup = new FancyPopup(); notifyIcon.TrayPopup = new FancyPopup();
}
protected override void OnClosed(EventArgs e)
{
base.OnClosed(e);
//close the notify icon
notifyIcon.Dispose();
} }
} }
} }