aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms/WinformsDesktop.cs
diff options
context:
space:
mode:
authorMichael VanOverbeek <[email protected]>2017-02-26 08:37:06 -0500
committerGitHub <[email protected]>2017-02-26 08:37:06 -0500
commite1e0d142dc6a1c1f1b21d7ae2b7d7e699963d268 (patch)
treee670f4d26dbd03f218275550aa12640f729e12b5 /ShiftOS.WinForms/WinformsDesktop.cs
parentab8c5c6f467b9ae61c27cdfb1a68c2812cb7d78f (diff)
parent3a46014d655a9d36e51fec5a6ddddde9937647e1 (diff)
downloadshiftos_thereturn-e1e0d142dc6a1c1f1b21d7ae2b7d7e699963d268.tar.gz
shiftos_thereturn-e1e0d142dc6a1c1f1b21d7ae2b7d7e699963d268.tar.bz2
shiftos_thereturn-e1e0d142dc6a1c1f1b21d7ae2b7d7e699963d268.zip
Merge branch 'master' into master
Diffstat (limited to 'ShiftOS.WinForms/WinformsDesktop.cs')
-rw-r--r--ShiftOS.WinForms/WinformsDesktop.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs
index ac5198a..45730c4 100644
--- a/ShiftOS.WinForms/WinformsDesktop.cs
+++ b/ShiftOS.WinForms/WinformsDesktop.cs
@@ -275,7 +275,11 @@ namespace ShiftOS.WinForms
}));
this.BackgroundImageLayout = GetImageLayout("desktopbackground");
desktoppanel.BackgroundImage = ((Bitmap)GetImage("desktoppanel"));
- if (desktoppanel.BackgroundImage != null) ((Bitmap)desktoppanel.BackgroundImage).MakeTransparent(Color.FromArgb(1, 0, 1));
+ if (desktoppanel.BackgroundImage != null)
+ {
+ ((Bitmap)desktoppanel.BackgroundImage).MakeTransparent(Color.FromArgb(1, 0, 1));
+ desktoppanel.BackColor = Color.Transparent;
+ }
menuStrip1.BackgroundImage = GetImage("applauncher");
if (menuStrip1.BackgroundImage != null) ((Bitmap)menuStrip1.BackgroundImage).MakeTransparent(Color.FromArgb(1, 0, 1));
lbtime.ForeColor = LoadedSkin.DesktopPanelClockColor;