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

1 files changed, 10 insertions, 0 deletions

diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs
index 2bb2715..ded68ba 100644
--- a/ShiftOS.WinForms/WinformsDesktop.cs
+++ b/ShiftOS.WinForms/WinformsDesktop.cs
@@ -119,6 +119,9 @@ namespace ShiftOS.WinForms
                         lbtime.Top = LoadedSkin.DesktopPanelClockFromRight.Y;
                     }
                 }
+
+                btnnotifications.Left = lbtime.Left - btnnotifications.Width - 2;
+                btnnotifications.Top = (desktoppanel.Height - btnnotifications.Height) / 2;
             };
             time.Start();
 
@@ -229,6 +232,8 @@ namespace ShiftOS.WinForms
                     desktoppanel.Visible = Shiftorium.UpgradeInstalled("desktop");
                     lbtime.Visible = Shiftorium.UpgradeInstalled("desktop_clock_widget");
 
+                    btnnotifications.Visible = Shiftorium.UpgradeInstalled("panel_notifications");
+
                     //skinning
                     lbtime.ForeColor = LoadedSkin.DesktopPanelClockColor;
 
@@ -529,6 +534,11 @@ namespace ShiftOS.WinForms
         {
             return this.Size;
         }
+
+        private void btnnotifications_Click(object sender, EventArgs e)
+        {
+            AppearanceManager.SetupWindow(new Applications.Notifications());
+        }
     }
 
     [ShiftOS.Engine.Scripting.Exposed("desktop")]