From d8978b860d950e3ccde3c8beecf8b88bdd4a34a8 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 30 Jan 2017 20:47:11 -0500 Subject: Skinning fixes Title buttons were being covered by the title corners, and panel buttons were appearing as regular controls to the control manager. --- ShiftOS.WinForms/WinformsDesktop.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ShiftOS.WinForms/WinformsDesktop.cs') diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs index 1dd2dd7..c9287ff 100644 --- a/ShiftOS.WinForms/WinformsDesktop.cs +++ b/ShiftOS.WinForms/WinformsDesktop.cs @@ -126,6 +126,7 @@ namespace ShiftOS.WinForms { var pnlbtn = new Panel(); pnlbtn.Margin = new Padding(2, LoadedSkin.PanelButtonFromTop, 0, 0); + pnlbtn.BackColor = LoadedSkin.PanelButtonColor; pnlbtn.BackgroundImage = GetImage("panelbutton"); pnlbtn.BackgroundImageLayout = GetImageLayout("panelbutton"); @@ -135,6 +136,7 @@ namespace ShiftOS.WinForms pnlbtntext.Location = LoadedSkin.PanelButtonFromLeft; pnlbtntext.ForeColor = LoadedSkin.PanelButtonTextColor; pnlbtntext.Font = LoadedSkin.PanelButtonFont; + pnlbtntext.BackColor = Color.Transparent; pnlbtn.BackColor = LoadedSkin.PanelButtonColor; if (pnlbtn.BackgroundImage != null) @@ -142,10 +144,10 @@ namespace ShiftOS.WinForms pnlbtntext.BackColor = Color.Transparent; } pnlbtn.Size = LoadedSkin.PanelButtonSize; - + pnlbtn.Tag = "keepbg"; + pnlbtntext.Tag = "keepbg"; pnlbtn.Controls.Add(pnlbtntext); this.panelbuttonholder.Controls.Add(pnlbtn); - ControlManager.SetupControls(pnlbtn); pnlbtn.Show(); pnlbtntext.Show(); } -- cgit v1.2.3