Merge remote-tracking branch 'refs/remotes/shiftos-game/master'

This commit is contained in:
lempamo 2017-02-25 15:40:02 -05:00
commit 420a5e0a4b
2 changed files with 8 additions and 0 deletions

View file

@ -68,6 +68,12 @@ namespace ShiftOS.WinForms
};
NotificationDaemon.NotificationRead += (note) =>
{
btnnotifications.Text = "Notifications (" + NotificationDaemon.GetUnreadCount().ToString() + ")";
};
this.LocationChanged += (o, a) =>
{
if (this.Left != 0)

View file

@ -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()