Icon backend :D

1 files changed, 20 insertions, 1 deletions

diff --git a/ShiftOS.WinForms/WindowBorder.cs b/ShiftOS.WinForms/WindowBorder.cs
index 46dd76a..6e5d271 100644
--- a/ShiftOS.WinForms/WindowBorder.cs
+++ b/ShiftOS.WinForms/WindowBorder.cs
@@ -87,6 +87,11 @@ namespace ShiftOS.WinForms
             }
         }
 
+        internal void SetTitle(string title)
+        {
+            lbtitletext.Text = title;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ShiftOS.WinForms.WindowBorder"/> class.
         /// </summary>
@@ -305,13 +310,27 @@ namespace ShiftOS.WinForms
             switch (LoadedSkin.TitleTextCentered)
             {
                 case false:
-                    lbtitletext.Location = LoadedSkin.TitleTextLeft;
+                    lbtitletext.Location = new Point(16 + LoadedSkin.TitlebarIconFromSide.X + LoadedSkin.TitleTextLeft.X,
+                            LoadedSkin.TitleTextLeft.Y);
                     break;
                 default:
                     lbtitletext.Left = (pnltitle.Width - lbtitletext.Width) / 2;
                     lbtitletext.Top = LoadedSkin.TitleTextLeft.Y;
                     break;
             }
+
+            if (Shiftorium.UpgradeInstalled("app_icons"))
+            {
+                pnlicon.Show();
+                pnlicon.Size = new Size(16, 16);
+                pnlicon.BackgroundImage = GetIcon(this.ParentWindow.GetType().Name);
+                pnlicon.BackgroundImageLayout = ImageLayout.Stretch;
+                pnlicon.Location = LoadedSkin.TitlebarIconFromSide;
+            }
+            else
+            {
+                pnlicon.Hide();
+            }
         }
 
         /// <summary>