diff options
| author | lempamo <[email protected]> | 2017-02-26 11:45:51 -0500 |
|---|---|---|
| committer | lempamo <[email protected]> | 2017-02-26 11:45:51 -0500 |
| commit | e816cabaf72e3e827f00694e5ef21e30a67293c2 (patch) | |
| tree | aa81410979e0fddc2e87dd06d6e2e5ad482b89d0 | |
| parent | 8d9be8e1674540e425dcaea24ba32193c19a963a (diff) | |
| parent | 83542a4b81ffeed01510886c7f89f2bda14eb5c5 (diff) | |
| download | shiftos_thereturn-e816cabaf72e3e827f00694e5ef21e30a67293c2.tar.gz shiftos_thereturn-e816cabaf72e3e827f00694e5ef21e30a67293c2.tar.bz2 shiftos_thereturn-e816cabaf72e3e827f00694e5ef21e30a67293c2.zip | |
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
| -rw-r--r-- | ShiftOS.WinForms/WinformsDesktop.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs index 73ad1bd..899eb0d 100644 --- a/ShiftOS.WinForms/WinformsDesktop.cs +++ b/ShiftOS.WinForms/WinformsDesktop.cs @@ -269,6 +269,7 @@ namespace ShiftOS.WinForms this.BackgroundImage = img; })); this.BackgroundImageLayout = GetImageLayout("desktopbackground"); + desktoppanel.BackColor = LoadedSkin.DesktopPanelColor; var pnlimg = GetImage("desktoppanel"); if (pnlimg != null) @@ -306,7 +307,6 @@ namespace ShiftOS.WinForms sysmenuholder.Size = LoadedSkin.AppLauncherHolderSize; apps.Size = sysmenuholder.Size; menuStrip1.Renderer = new ShiftOSMenuRenderer(new AppLauncherColorTable()); - desktoppanel.BackColor = LoadedSkin.DesktopPanelColor; desktoppanel.BackgroundImageLayout = GetImageLayout("desktoppanel"); desktoppanel.Height = LoadedSkin.DesktopPanelHeight; if (LoadedSkin.DesktopPanelPosition == 1) |