mirror of
https://github.com/ckaczor/wpf-notifyicon.git
synced 2026-01-14 01:25:45 -05:00
Merged in event-listener-bug (pull request #5)
FIX Fixed potential event propagation before event listeners where registered.
This commit is contained in:
@@ -25,7 +25,6 @@
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.Diagnostics;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace Hardcodet.Wpf.TaskbarNotification.Interop
|
||||
{
|
||||
@@ -119,7 +118,6 @@ namespace Hardcodet.Wpf.TaskbarNotification.Interop
|
||||
public WindowMessageSink(NotifyIconVersion version)
|
||||
{
|
||||
Version = version;
|
||||
CreateMessageWindow();
|
||||
}
|
||||
|
||||
|
||||
@@ -127,6 +125,10 @@ namespace Hardcodet.Wpf.TaskbarNotification.Interop
|
||||
{
|
||||
}
|
||||
|
||||
internal void Listen()
|
||||
{
|
||||
CreateMessageWindow();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Creates a dummy instance that provides an empty
|
||||
@@ -154,7 +156,7 @@ namespace Hardcodet.Wpf.TaskbarNotification.Interop
|
||||
private void CreateMessageWindow()
|
||||
{
|
||||
//generate a unique ID for the window
|
||||
WindowId = "WPFTaskbarIcon_" + DateTime.Now.Ticks;
|
||||
WindowId = "WPFTaskbarIcon_" + Guid.NewGuid();
|
||||
|
||||
//register window message handler
|
||||
messageHandler = OnWindowMessageReceived;
|
||||
|
||||
@@ -142,6 +142,9 @@ namespace Hardcodet.Wpf.TaskbarNotification
|
||||
messageSink.ChangeToolTipStateRequest += OnToolTipChange;
|
||||
messageSink.BalloonToolTipChanged += OnBalloonToolTipChanged;
|
||||
|
||||
//start listening once we registered to events
|
||||
if(!Util.IsDesignMode) messageSink.Listen();
|
||||
|
||||
//init single click / balloon timers
|
||||
singleClickTimer = new Timer(DoSingleClickAction);
|
||||
balloonCloseTimer = new Timer(CloseBalloonCallback);
|
||||
|
||||
Reference in New Issue
Block a user