diff options
| author | lempamo <[email protected]> | 2017-02-25 15:40:02 -0500 |
|---|---|---|
| committer | lempamo <[email protected]> | 2017-02-25 15:40:02 -0500 |
| commit | 420a5e0a4bf92bb194c816a048f7f5b212778fe8 (patch) | |
| tree | 3f41a959e43917c9238251dfd347b9c033eda62d | |
| parent | 202572ae2d4261f21019f387c30114fca4f1e39c (diff) | |
| parent | 5afced5136dab902e97eab02e25c2add3e2652d1 (diff) | |
| download | shiftos_thereturn-420a5e0a4bf92bb194c816a048f7f5b212778fe8.tar.gz shiftos_thereturn-420a5e0a4bf92bb194c816a048f7f5b212778fe8.tar.bz2 shiftos_thereturn-420a5e0a4bf92bb194c816a048f7f5b212778fe8.zip | |
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
| -rw-r--r-- | ShiftOS.WinForms/WinformsDesktop.cs | 6 | ||||
| -rw-r--r-- | ShiftOS_TheReturn/NotificationDaemon.cs | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs index 957c793..fdb249a 100644 --- a/ShiftOS.WinForms/WinformsDesktop.cs +++ b/ShiftOS.WinForms/WinformsDesktop.cs @@ -68,6 +68,12 @@ namespace ShiftOS.WinForms }; + NotificationDaemon.NotificationRead += (note) => + { + btnnotifications.Text = "Notifications (" + NotificationDaemon.GetUnreadCount().ToString() + ")"; + + }; + this.LocationChanged += (o, a) => { if (this.Left != 0) diff --git a/ShiftOS_TheReturn/NotificationDaemon.cs b/ShiftOS_TheReturn/NotificationDaemon.cs index 5adc026..1737be3 100644 --- a/ShiftOS_TheReturn/NotificationDaemon.cs +++ b/ShiftOS_TheReturn/NotificationDaemon.cs @@ -45,12 +45,14 @@ namespace ShiftOS.Engine public static void MarkRead(int note) { + var lst = new List<Notification>(GetAllFromFile()); var notes = GetAllFromFile(); if (note >= notes.Length || note < 0) throw new ArgumentOutOfRangeException("note", new Exception("You cannot mark a notification that does not exist as read.")); notes[note].Read = true; WriteNotes(notes); + NotificationMade?.Invoke(lst[lst.Count - 1]); } public static int GetUnreadCount() |