diff options
| author | lempamo <[email protected]> | 2017-02-25 14:39:26 -0500 |
|---|---|---|
| committer | lempamo <[email protected]> | 2017-02-25 14:39:26 -0500 |
| commit | 4c9640dcb26e110aac0b8be85db6aed9aeb246a6 (patch) | |
| tree | e470887b3886d72b51147ffca3d205ff1393cf34 | |
| parent | 4d769d43e3282e3576faf0a53cb0736d546b1883 (diff) | |
| parent | 569ad6fd7a3944b970fd08e715c8107a14ae117b (diff) | |
| download | shiftos_thereturn-4c9640dcb26e110aac0b8be85db6aed9aeb246a6.tar.gz shiftos_thereturn-4c9640dcb26e110aac0b8be85db6aed9aeb246a6.tar.bz2 shiftos_thereturn-4c9640dcb26e110aac0b8be85db6aed9aeb246a6.zip | |
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
| -rw-r--r-- | ShiftOS.WinForms/Applications/Notifications.cs | 7 | ||||
| -rw-r--r-- | ShiftOS.WinForms/WinformsDesktop.cs | 7 | ||||
| -rw-r--r-- | ShiftOS_TheReturn/NotificationDaemon.cs | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/ShiftOS.WinForms/Applications/Notifications.cs b/ShiftOS.WinForms/Applications/Notifications.cs index 6fb659d..540d2b5 100644 --- a/ShiftOS.WinForms/Applications/Notifications.cs +++ b/ShiftOS.WinForms/Applications/Notifications.cs @@ -23,9 +23,14 @@ namespace ShiftOS.WinForms.Applications { SetupUI(); }; + onRead += () => + { + SetupUI(); + }; } Action<Notification> onMade = null; + Action onRead = null; public void SetupUI() { @@ -227,6 +232,7 @@ namespace ShiftOS.WinForms.Applications { SetupUI(); NotificationDaemon.NotificationMade += onMade; + NotificationDaemon.NotificationRead += onRead; } public void OnSkinLoad() @@ -236,6 +242,7 @@ namespace ShiftOS.WinForms.Applications public bool OnUnload() { NotificationDaemon.NotificationMade -= onMade; + NotificationDaemon.NotificationRead -= onRead; return true; } diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs index 957c793..bcb853f 100644 --- a/ShiftOS.WinForms/WinformsDesktop.cs +++ b/ShiftOS.WinForms/WinformsDesktop.cs @@ -68,6 +68,13 @@ namespace ShiftOS.WinForms }; + NotificationDaemon.NotificationRead += () => + { + //Soon this will pop a balloon 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 3ea8a54..c6ba90a 100644 --- a/ShiftOS_TheReturn/NotificationDaemon.cs +++ b/ShiftOS_TheReturn/NotificationDaemon.cs @@ -35,6 +35,7 @@ namespace ShiftOS.Engine NotificationMade?.Invoke(lst[lst.Count - 1]); } + public static event Action NotificationRead; public static void MarkRead(int note) { @@ -44,6 +45,7 @@ namespace ShiftOS.Engine notes[note].Read = true; WriteNotes(notes); + NotificationRead?.Invoke(); } public static int GetUnreadCount() |