shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-23 02:12:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
lempamo 2017-02-26 11:33:01 -05:00
commit 8d9be8e167
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ShiftOS.WinForms/WinformsDesktop.Designer.cs generated
View file

@ -76,6 +76,7 @@ namespace ShiftOS.WinForms
this.desktoppanel.Name = "desktoppanel";
this.desktoppanel.Size = new System.Drawing.Size(1296, 24);
this.desktoppanel.TabIndex = 0;
this.desktoppanel.Paint += new System.Windows.Forms.PaintEventHandler(this.desktoppanel_Paint);
//
// btnnotifications
//

27
ShiftOS.WinForms/WinformsDesktop.cs
View file

@ -269,14 +269,28 @@ namespace ShiftOS.WinForms
this.BackgroundImage = img;
}));
this.BackgroundImageLayout = GetImageLayout("desktopbackground");
desktoppanel.BackgroundImage = ((Bitmap)GetImage("desktoppanel"));
var pnlimg = GetImage("desktoppanel");
if (pnlimg != null)
{
var bmp = new Bitmap(pnlimg);
bmp.MakeTransparent(Color.FromArgb(1, 0, 1));
pnlimg = bmp;
}
desktoppanel.BackgroundImage = pnlimg;
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));
var appimg = GetImage("applauncher");
if (appimg != null)
{
var bmp = new Bitmap(appimg);
bmp.MakeTransparent(Color.FromArgb(1, 0, 1));
appimg = bmp;
}
menuStrip1.BackgroundImage = appimg;
lbtime.ForeColor = LoadedSkin.DesktopPanelClockColor;
lbtime.Font = LoadedSkin.DesktopPanelClockFont;
if (desktoppanel.BackgroundImage == null)
@ -557,6 +571,11 @@ namespace ShiftOS.WinForms
{
AppearanceManager.SetupWindow(new Applications.Notifications());
}
private void desktoppanel_Paint(object sender, PaintEventArgs e)
{
e.Graphics.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
}
}
[ShiftOS.Engine.Scripting.Exposed("desktop")]