From 78a5a4281cde2105e59164890caa949ef7617510 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 26 Feb 2017 10:24:27 -0500 Subject: more beta 1.2 stuff --- ShiftOS.WinForms/WinformsDesktop.cs | 5 ----- 1 file changed, 5 deletions(-) (limited to 'ShiftOS.WinForms/WinformsDesktop.cs') diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs index 45730c4..81079e4 100644 --- a/ShiftOS.WinForms/WinformsDesktop.cs +++ b/ShiftOS.WinForms/WinformsDesktop.cs @@ -48,11 +48,6 @@ namespace ShiftOS.WinForms /// public partial class WinformsDesktop : Form, IDesktop { - /// - /// Occurs when window added. - /// - private static event Action windowAdded; - /// /// Initializes a new instance of the class. /// -- cgit v1.2.3 From de6a5ee4ac78f0680c5a5bff8a18caace983d09d Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 26 Feb 2017 11:17:30 -0500 Subject: attempt transparency fix --- ShiftOS.WinForms/WinformsDesktop.Designer.cs | 1 + ShiftOS.WinForms/WinformsDesktop.cs | 27 +++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) (limited to 'ShiftOS.WinForms/WinformsDesktop.cs') diff --git a/ShiftOS.WinForms/WinformsDesktop.Designer.cs b/ShiftOS.WinForms/WinformsDesktop.Designer.cs index 0585199..aef7296 100644 --- a/ShiftOS.WinForms/WinformsDesktop.Designer.cs +++ b/ShiftOS.WinForms/WinformsDesktop.Designer.cs @@ -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 // diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs index 81079e4..73ad1bd 100644 --- a/ShiftOS.WinForms/WinformsDesktop.cs +++ b/ShiftOS.WinForms/WinformsDesktop.cs @@ -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")] -- cgit v1.2.3 From 83542a4b81ffeed01510886c7f89f2bda14eb5c5 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 26 Feb 2017 11:43:26 -0500 Subject: Desktop panel RGB 1,0,1 transparency. Finally. After **YEARS** of research and development by both me and Philip Adams, and other ShiftOS devs, I was the one who finally implemented it. --- ShiftOS.WinForms/WinformsDesktop.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ShiftOS.WinForms/WinformsDesktop.cs') 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) -- cgit v1.2.3