diff --git a/ShiftOS.WinForms/Applications/Skin Loader.Designer.cs b/ShiftOS.WinForms/Applications/Skin Loader.Designer.cs index ef5be7e..4a4e669 100644 --- a/ShiftOS.WinForms/Applications/Skin Loader.Designer.cs +++ b/ShiftOS.WinForms/Applications/Skin Loader.Designer.cs @@ -53,46 +53,46 @@ namespace ShiftOS.WinForms.Applications private void InitializeComponent() { this.pnldesktop = new System.Windows.Forms.Panel(); - this.pnlborder = new System.Windows.Forms.Panel(); - this.flbuttons = new System.Windows.Forms.FlowLayoutPanel(); - this.btnclose = new System.Windows.Forms.Button(); - this.btnloaddefault = new System.Windows.Forms.Button(); - this.btnexport = new System.Windows.Forms.Button(); - this.btnimport = new System.Windows.Forms.Button(); - this.btnapply = new System.Windows.Forms.Button(); this.desktoppanel = new System.Windows.Forms.Panel(); this.sysmenuholder = new System.Windows.Forms.Panel(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.apps = new System.Windows.Forms.ToolStripMenuItem(); - this.lbtime = new System.Windows.Forms.Label(); this.item1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.item2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.item3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.item4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.item4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.lbtime = new System.Windows.Forms.Label(); + this.pnlborder = new System.Windows.Forms.Panel(); this.pnlcontents = new System.Windows.Forms.Panel(); - this.pnltitle = new System.Windows.Forms.Panel(); - this.pnlminimize = new System.Windows.Forms.Panel(); - this.pnlmaximize = new System.Windows.Forms.Panel(); - this.pnlclose = new System.Windows.Forms.Panel(); - this.lbtitletext = new System.Windows.Forms.Label(); this.pnlbottom = new System.Windows.Forms.Panel(); this.pnlbottomr = new System.Windows.Forms.Panel(); this.pnlbottoml = new System.Windows.Forms.Panel(); this.pnlright = new System.Windows.Forms.Panel(); this.pnlleft = new System.Windows.Forms.Panel(); this.pnltitlemaster = new System.Windows.Forms.Panel(); + this.pnltitle = new System.Windows.Forms.Panel(); + this.pnlminimize = new System.Windows.Forms.Panel(); + this.pnlmaximize = new System.Windows.Forms.Panel(); + this.pnlclose = new System.Windows.Forms.Panel(); + this.lbtitletext = new System.Windows.Forms.Label(); this.pnltitleright = new System.Windows.Forms.Panel(); this.pnltitleleft = new System.Windows.Forms.Panel(); + this.flbuttons = new System.Windows.Forms.FlowLayoutPanel(); + this.btnclose = new System.Windows.Forms.Button(); + this.btnloaddefault = new System.Windows.Forms.Button(); + this.btnexport = new System.Windows.Forms.Button(); + this.btnimport = new System.Windows.Forms.Button(); + this.btnapply = new System.Windows.Forms.Button(); this.pnldesktop.SuspendLayout(); - this.pnlborder.SuspendLayout(); - this.flbuttons.SuspendLayout(); this.desktoppanel.SuspendLayout(); this.sysmenuholder.SuspendLayout(); this.menuStrip1.SuspendLayout(); - this.pnltitle.SuspendLayout(); + this.pnlborder.SuspendLayout(); this.pnlbottom.SuspendLayout(); this.pnltitlemaster.SuspendLayout(); + this.pnltitle.SuspendLayout(); + this.flbuttons.SuspendLayout(); this.SuspendLayout(); // // pnldesktop @@ -104,6 +104,93 @@ namespace ShiftOS.WinForms.Applications this.pnldesktop.Size = new System.Drawing.Size(522, 251); this.pnldesktop.TabIndex = 0; // + // desktoppanel + // + this.desktoppanel.BackColor = System.Drawing.Color.Green; + this.desktoppanel.Controls.Add(this.sysmenuholder); + this.desktoppanel.Controls.Add(this.lbtime); + this.desktoppanel.Dock = System.Windows.Forms.DockStyle.Top; + this.desktoppanel.Location = new System.Drawing.Point(0, 0); + this.desktoppanel.Name = "desktoppanel"; + this.desktoppanel.Size = new System.Drawing.Size(522, 24); + this.desktoppanel.TabIndex = 1; + // + // sysmenuholder + // + this.sysmenuholder.Controls.Add(this.menuStrip1); + this.sysmenuholder.Location = new System.Drawing.Point(12, 5); + this.sysmenuholder.Name = "sysmenuholder"; + this.sysmenuholder.Size = new System.Drawing.Size(68, 24); + this.sysmenuholder.TabIndex = 1; + // + // menuStrip1 + // + this.menuStrip1.Dock = System.Windows.Forms.DockStyle.Fill; + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.apps}); + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Padding = new System.Windows.Forms.Padding(0); + this.menuStrip1.Size = new System.Drawing.Size(68, 24); + this.menuStrip1.TabIndex = 0; + this.menuStrip1.Text = "menuStrip1"; + // + // apps + // + this.apps.AutoSize = false; + this.apps.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.item1ToolStripMenuItem, + this.item2ToolStripMenuItem, + this.item3ToolStripMenuItem, + this.toolStripSeparator1, + this.item4ToolStripMenuItem}); + this.apps.Name = "apps"; + this.apps.Padding = new System.Windows.Forms.Padding(0); + this.apps.Size = new System.Drawing.Size(58, 20); + this.apps.Tag = "applauncherbutton"; + this.apps.Text = "ShiftOS"; + // + // item1ToolStripMenuItem + // + this.item1ToolStripMenuItem.Name = "item1ToolStripMenuItem"; + this.item1ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.item1ToolStripMenuItem.Text = "Item 1"; + // + // item2ToolStripMenuItem + // + this.item2ToolStripMenuItem.Name = "item2ToolStripMenuItem"; + this.item2ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.item2ToolStripMenuItem.Text = "Item 2"; + // + // item3ToolStripMenuItem + // + this.item3ToolStripMenuItem.Name = "item3ToolStripMenuItem"; + this.item3ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.item3ToolStripMenuItem.Text = "Item 3"; + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6); + // + // item4ToolStripMenuItem + // + this.item4ToolStripMenuItem.Name = "item4ToolStripMenuItem"; + this.item4ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.item4ToolStripMenuItem.Text = "Item 4"; + // + // lbtime + // + this.lbtime.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.lbtime.AutoSize = true; + this.lbtime.Location = new System.Drawing.Point(445, 5); + this.lbtime.Name = "lbtime"; + this.lbtime.Size = new System.Drawing.Size(35, 13); + this.lbtime.TabIndex = 0; + this.lbtime.Text = "label1"; + this.lbtime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // pnlborder // this.pnlborder.BackColor = System.Drawing.Color.Black; @@ -117,6 +204,144 @@ namespace ShiftOS.WinForms.Applications this.pnlborder.Size = new System.Drawing.Size(522, 251); this.pnlborder.TabIndex = 1; // + // pnlcontents + // + this.pnlcontents.BackColor = System.Drawing.Color.Black; + this.pnlcontents.Dock = System.Windows.Forms.DockStyle.Fill; + this.pnlcontents.ForeColor = System.Drawing.Color.White; + this.pnlcontents.Location = new System.Drawing.Point(2, 30); + this.pnlcontents.Name = "pnlcontents"; + this.pnlcontents.Size = new System.Drawing.Size(518, 219); + this.pnlcontents.TabIndex = 9; + // + // pnlbottom + // + this.pnlbottom.BackColor = System.Drawing.Color.Black; + this.pnlbottom.Controls.Add(this.pnlbottomr); + this.pnlbottom.Controls.Add(this.pnlbottoml); + this.pnlbottom.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pnlbottom.Location = new System.Drawing.Point(2, 249); + this.pnlbottom.Name = "pnlbottom"; + this.pnlbottom.Size = new System.Drawing.Size(518, 2); + this.pnlbottom.TabIndex = 6; + // + // pnlbottomr + // + this.pnlbottomr.Dock = System.Windows.Forms.DockStyle.Right; + this.pnlbottomr.Location = new System.Drawing.Point(516, 0); + this.pnlbottomr.Name = "pnlbottomr"; + this.pnlbottomr.Size = new System.Drawing.Size(2, 2); + this.pnlbottomr.TabIndex = 3; + // + // pnlbottoml + // + this.pnlbottoml.Dock = System.Windows.Forms.DockStyle.Left; + this.pnlbottoml.Location = new System.Drawing.Point(0, 0); + this.pnlbottoml.Name = "pnlbottoml"; + this.pnlbottoml.Size = new System.Drawing.Size(2, 2); + this.pnlbottoml.TabIndex = 2; + // + // pnlright + // + this.pnlright.BackColor = System.Drawing.Color.Black; + this.pnlright.Dock = System.Windows.Forms.DockStyle.Right; + this.pnlright.Location = new System.Drawing.Point(520, 30); + this.pnlright.Name = "pnlright"; + this.pnlright.Size = new System.Drawing.Size(2, 221); + this.pnlright.TabIndex = 8; + // + // pnlleft + // + this.pnlleft.BackColor = System.Drawing.Color.Black; + this.pnlleft.Dock = System.Windows.Forms.DockStyle.Left; + this.pnlleft.Location = new System.Drawing.Point(0, 30); + this.pnlleft.Name = "pnlleft"; + this.pnlleft.Size = new System.Drawing.Size(2, 221); + this.pnlleft.TabIndex = 7; + // + // pnltitlemaster + // + this.pnltitlemaster.Controls.Add(this.pnltitle); + this.pnltitlemaster.Controls.Add(this.pnltitleright); + this.pnltitlemaster.Controls.Add(this.pnltitleleft); + this.pnltitlemaster.Dock = System.Windows.Forms.DockStyle.Top; + this.pnltitlemaster.Location = new System.Drawing.Point(0, 0); + this.pnltitlemaster.Name = "pnltitlemaster"; + this.pnltitlemaster.Size = new System.Drawing.Size(522, 30); + this.pnltitlemaster.TabIndex = 5; + // + // pnltitle + // + this.pnltitle.BackColor = System.Drawing.Color.Black; + this.pnltitle.Controls.Add(this.pnlminimize); + this.pnltitle.Controls.Add(this.pnlmaximize); + this.pnltitle.Controls.Add(this.pnlclose); + this.pnltitle.Controls.Add(this.lbtitletext); + this.pnltitle.Dock = System.Windows.Forms.DockStyle.Fill; + this.pnltitle.Location = new System.Drawing.Point(2, 0); + this.pnltitle.Name = "pnltitle"; + this.pnltitle.Size = new System.Drawing.Size(518, 30); + this.pnltitle.TabIndex = 0; + // + // pnlminimize + // + this.pnlminimize.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.pnlminimize.BackColor = System.Drawing.Color.Green; + this.pnlminimize.Location = new System.Drawing.Point(437, 3); + this.pnlminimize.Name = "pnlminimize"; + this.pnlminimize.Size = new System.Drawing.Size(24, 24); + this.pnlminimize.TabIndex = 3; + // + // pnlmaximize + // + this.pnlmaximize.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.pnlmaximize.BackColor = System.Drawing.Color.Yellow; + this.pnlmaximize.Location = new System.Drawing.Point(464, 3); + this.pnlmaximize.Name = "pnlmaximize"; + this.pnlmaximize.Size = new System.Drawing.Size(24, 24); + this.pnlmaximize.TabIndex = 2; + // + // pnlclose + // + this.pnlclose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.pnlclose.BackColor = System.Drawing.Color.Red; + this.pnlclose.Location = new System.Drawing.Point(491, 3); + this.pnlclose.Name = "pnlclose"; + this.pnlclose.Size = new System.Drawing.Size(24, 24); + this.pnlclose.TabIndex = 1; + // + // lbtitletext + // + this.lbtitletext.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.lbtitletext.AutoSize = true; + this.lbtitletext.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Bold); + this.lbtitletext.ForeColor = System.Drawing.Color.White; + this.lbtitletext.Location = new System.Drawing.Point(4, 0); + this.lbtitletext.Name = "lbtitletext"; + this.lbtitletext.Size = new System.Drawing.Size(77, 14); + this.lbtitletext.TabIndex = 0; + this.lbtitletext.Text = "Title text"; + this.lbtitletext.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.lbtitletext.UseMnemonic = false; + // + // pnltitleright + // + this.pnltitleright.Dock = System.Windows.Forms.DockStyle.Right; + this.pnltitleright.Location = new System.Drawing.Point(520, 0); + this.pnltitleright.Name = "pnltitleright"; + this.pnltitleright.Size = new System.Drawing.Size(2, 30); + this.pnltitleright.TabIndex = 5; + // + // pnltitleleft + // + this.pnltitleleft.Dock = System.Windows.Forms.DockStyle.Left; + this.pnltitleleft.Location = new System.Drawing.Point(0, 0); + this.pnltitleleft.Name = "pnltitleleft"; + this.pnltitleleft.Size = new System.Drawing.Size(2, 30); + this.pnltitleleft.TabIndex = 4; + // // flbuttons // this.flbuttons.AutoSize = true; @@ -193,254 +418,29 @@ namespace ShiftOS.WinForms.Applications this.btnapply.UseVisualStyleBackColor = true; this.btnapply.Click += new System.EventHandler(this.btnapply_Click); // - // desktoppanel - // - this.desktoppanel.BackColor = System.Drawing.Color.Green; - this.desktoppanel.Controls.Add(this.sysmenuholder); - this.desktoppanel.Controls.Add(this.lbtime); - this.desktoppanel.Dock = System.Windows.Forms.DockStyle.Top; - this.desktoppanel.Location = new System.Drawing.Point(0, 0); - this.desktoppanel.Name = "desktoppanel"; - this.desktoppanel.Size = new System.Drawing.Size(522, 24); - this.desktoppanel.TabIndex = 1; - // - // sysmenuholder - // - this.sysmenuholder.Controls.Add(this.menuStrip1); - this.sysmenuholder.Location = new System.Drawing.Point(12, 5); - this.sysmenuholder.Name = "sysmenuholder"; - this.sysmenuholder.Size = new System.Drawing.Size(68, 24); - this.sysmenuholder.TabIndex = 1; - // - // menuStrip1 - // - this.menuStrip1.Dock = System.Windows.Forms.DockStyle.Fill; - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.apps}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Padding = new System.Windows.Forms.Padding(0); - this.menuStrip1.Size = new System.Drawing.Size(68, 24); - this.menuStrip1.TabIndex = 0; - this.menuStrip1.Text = "menuStrip1"; - // - // apps - // - this.apps.AutoSize = false; - this.apps.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.item1ToolStripMenuItem, - this.item2ToolStripMenuItem, - this.item3ToolStripMenuItem, - this.toolStripSeparator1, - this.item4ToolStripMenuItem}); - this.apps.Name = "apps"; - this.apps.Padding = new System.Windows.Forms.Padding(0); - this.apps.Size = new System.Drawing.Size(58, 20); - this.apps.Text = "ShiftOS"; - // - // lbtime - // - this.lbtime.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); - this.lbtime.AutoSize = true; - this.lbtime.Location = new System.Drawing.Point(445, 5); - this.lbtime.Name = "lbtime"; - this.lbtime.Size = new System.Drawing.Size(35, 13); - this.lbtime.TabIndex = 0; - this.lbtime.Text = "label1"; - this.lbtime.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // item1ToolStripMenuItem - // - this.item1ToolStripMenuItem.Name = "item1ToolStripMenuItem"; - this.item1ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.item1ToolStripMenuItem.Text = "Item 1"; - // - // item2ToolStripMenuItem - // - this.item2ToolStripMenuItem.Name = "item2ToolStripMenuItem"; - this.item2ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.item2ToolStripMenuItem.Text = "Item 2"; - // - // item3ToolStripMenuItem - // - this.item3ToolStripMenuItem.Name = "item3ToolStripMenuItem"; - this.item3ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.item3ToolStripMenuItem.Text = "Item 3"; - // - // item4ToolStripMenuItem - // - this.item4ToolStripMenuItem.Name = "item4ToolStripMenuItem"; - this.item4ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.item4ToolStripMenuItem.Text = "Item 4"; - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6); - // - // pnlcontents - // - this.pnlcontents.BackColor = System.Drawing.Color.Black; - this.pnlcontents.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnlcontents.ForeColor = System.Drawing.Color.White; - this.pnlcontents.Location = new System.Drawing.Point(2, 30); - this.pnlcontents.Name = "pnlcontents"; - this.pnlcontents.Size = new System.Drawing.Size(518, 219); - this.pnlcontents.TabIndex = 9; - // - // pnltitle - // - this.pnltitle.BackColor = System.Drawing.Color.Black; - this.pnltitle.Controls.Add(this.pnlminimize); - this.pnltitle.Controls.Add(this.pnlmaximize); - this.pnltitle.Controls.Add(this.pnlclose); - this.pnltitle.Controls.Add(this.lbtitletext); - this.pnltitle.Dock = System.Windows.Forms.DockStyle.Fill; - this.pnltitle.Location = new System.Drawing.Point(2, 0); - this.pnltitle.Name = "pnltitle"; - this.pnltitle.Size = new System.Drawing.Size(518, 30); - this.pnltitle.TabIndex = 0; - // - // pnlminimize - // - this.pnlminimize.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.pnlminimize.BackColor = System.Drawing.Color.Green; - this.pnlminimize.Location = new System.Drawing.Point(437, 3); - this.pnlminimize.Name = "pnlminimize"; - this.pnlminimize.Size = new System.Drawing.Size(24, 24); - this.pnlminimize.TabIndex = 3; - // - // pnlmaximize - // - this.pnlmaximize.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.pnlmaximize.BackColor = System.Drawing.Color.Yellow; - this.pnlmaximize.Location = new System.Drawing.Point(464, 3); - this.pnlmaximize.Name = "pnlmaximize"; - this.pnlmaximize.Size = new System.Drawing.Size(24, 24); - this.pnlmaximize.TabIndex = 2; - // - // pnlclose - // - this.pnlclose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.pnlclose.BackColor = System.Drawing.Color.Red; - this.pnlclose.Location = new System.Drawing.Point(491, 3); - this.pnlclose.Name = "pnlclose"; - this.pnlclose.Size = new System.Drawing.Size(24, 24); - this.pnlclose.TabIndex = 1; - // - // lbtitletext - // - this.lbtitletext.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.lbtitletext.AutoSize = true; - this.lbtitletext.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Bold); - this.lbtitletext.ForeColor = System.Drawing.Color.White; - this.lbtitletext.Location = new System.Drawing.Point(4, 0); - this.lbtitletext.Name = "lbtitletext"; - this.lbtitletext.Size = new System.Drawing.Size(77, 14); - this.lbtitletext.TabIndex = 0; - this.lbtitletext.Text = "Title text"; - this.lbtitletext.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.lbtitletext.UseMnemonic = false; - // - // pnlbottom - // - this.pnlbottom.BackColor = System.Drawing.Color.Black; - this.pnlbottom.Controls.Add(this.pnlbottomr); - this.pnlbottom.Controls.Add(this.pnlbottoml); - this.pnlbottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pnlbottom.Location = new System.Drawing.Point(2, 249); - this.pnlbottom.Name = "pnlbottom"; - this.pnlbottom.Size = new System.Drawing.Size(518, 2); - this.pnlbottom.TabIndex = 6; - // - // pnlbottomr - // - this.pnlbottomr.Dock = System.Windows.Forms.DockStyle.Right; - this.pnlbottomr.Location = new System.Drawing.Point(516, 0); - this.pnlbottomr.Name = "pnlbottomr"; - this.pnlbottomr.Size = new System.Drawing.Size(2, 2); - this.pnlbottomr.TabIndex = 3; - // - // pnlbottoml - // - this.pnlbottoml.Dock = System.Windows.Forms.DockStyle.Left; - this.pnlbottoml.Location = new System.Drawing.Point(0, 0); - this.pnlbottoml.Name = "pnlbottoml"; - this.pnlbottoml.Size = new System.Drawing.Size(2, 2); - this.pnlbottoml.TabIndex = 2; - // - // pnlright - // - this.pnlright.BackColor = System.Drawing.Color.Black; - this.pnlright.Dock = System.Windows.Forms.DockStyle.Right; - this.pnlright.Location = new System.Drawing.Point(520, 30); - this.pnlright.Name = "pnlright"; - this.pnlright.Size = new System.Drawing.Size(2, 221); - this.pnlright.TabIndex = 8; - // - // pnlleft - // - this.pnlleft.BackColor = System.Drawing.Color.Black; - this.pnlleft.Dock = System.Windows.Forms.DockStyle.Left; - this.pnlleft.Location = new System.Drawing.Point(0, 30); - this.pnlleft.Name = "pnlleft"; - this.pnlleft.Size = new System.Drawing.Size(2, 221); - this.pnlleft.TabIndex = 7; - // - // pnltitlemaster - // - this.pnltitlemaster.Controls.Add(this.pnltitle); - this.pnltitlemaster.Controls.Add(this.pnltitleright); - this.pnltitlemaster.Controls.Add(this.pnltitleleft); - this.pnltitlemaster.Dock = System.Windows.Forms.DockStyle.Top; - this.pnltitlemaster.Location = new System.Drawing.Point(0, 0); - this.pnltitlemaster.Name = "pnltitlemaster"; - this.pnltitlemaster.Size = new System.Drawing.Size(522, 30); - this.pnltitlemaster.TabIndex = 5; - // - // pnltitleright - // - this.pnltitleright.Dock = System.Windows.Forms.DockStyle.Right; - this.pnltitleright.Location = new System.Drawing.Point(520, 0); - this.pnltitleright.Name = "pnltitleright"; - this.pnltitleright.Size = new System.Drawing.Size(2, 30); - this.pnltitleright.TabIndex = 5; - // - // pnltitleleft - // - this.pnltitleleft.Dock = System.Windows.Forms.DockStyle.Left; - this.pnltitleleft.Location = new System.Drawing.Point(0, 0); - this.pnltitleleft.Name = "pnltitleleft"; - this.pnltitleleft.Size = new System.Drawing.Size(2, 30); - this.pnltitleleft.TabIndex = 4; - // // Skin_Loader // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(547, 658); this.Controls.Add(this.flbuttons); this.Controls.Add(this.pnlborder); this.Controls.Add(this.pnldesktop); this.Name = "Skin_Loader"; - this.Text = "{SKIN_LOADER_NAME}"; + this.Size = new System.Drawing.Size(547, 658); this.pnldesktop.ResumeLayout(false); - this.pnlborder.ResumeLayout(false); - this.flbuttons.ResumeLayout(false); - this.flbuttons.PerformLayout(); this.desktoppanel.ResumeLayout(false); this.desktoppanel.PerformLayout(); this.sysmenuholder.ResumeLayout(false); this.sysmenuholder.PerformLayout(); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); - this.pnltitle.ResumeLayout(false); - this.pnltitle.PerformLayout(); + this.pnlborder.ResumeLayout(false); this.pnlbottom.ResumeLayout(false); this.pnltitlemaster.ResumeLayout(false); + this.pnltitle.ResumeLayout(false); + this.pnltitle.PerformLayout(); + this.flbuttons.ResumeLayout(false); + this.flbuttons.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/ShiftOS.WinForms/Applications/Skin Loader.resx b/ShiftOS.WinForms/Applications/Skin Loader.resx index b77504b..d5494e3 100644 --- a/ShiftOS.WinForms/Applications/Skin Loader.resx +++ b/ShiftOS.WinForms/Applications/Skin Loader.resx @@ -120,7 +120,4 @@ 17, 17 - - 17, 17 - \ No newline at end of file diff --git a/ShiftOS.WinForms/Tools/ControlManager.cs b/ShiftOS.WinForms/Tools/ControlManager.cs index c5b073f..f9fb799 100644 --- a/ShiftOS.WinForms/Tools/ControlManager.cs +++ b/ShiftOS.WinForms/Tools/ControlManager.cs @@ -26,6 +26,7 @@ using System; using System.Collections.Generic; using System.Drawing; using System.Linq; +using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; @@ -37,6 +38,22 @@ namespace ShiftOS.WinForms.Tools { public static class ControlManager { + [DllImport("user32.dll")] + public static extern int SendMessage(IntPtr hWnd, Int32 wMsg, bool wParam, Int32 lParam); + + private const int WM_SETREDRAW = 11; + + public static void SuspendDrawing(Control parent) + { + SendMessage(parent.Handle, WM_SETREDRAW, false, 0); + } + + public static void ResumeDrawing(Control parent) + { + SendMessage(parent.Handle, WM_SETREDRAW, true, 0); + parent.Refresh(); + } + public static void Close(this UserControl ctrl) { for (int i = 0; i < AppearanceManager.OpenForms.Count; i++) @@ -157,6 +174,7 @@ namespace ShiftOS.WinForms.Tools public static void SetupControl(Control ctrl) { + SuspendDrawing(ctrl); SetCursor(ctrl); if (!(ctrl is MenuStrip) && !(ctrl is ToolStrip) && !(ctrl is StatusStrip) && !(ctrl is ContextMenuStrip)) { @@ -225,6 +243,7 @@ namespace ShiftOS.WinForms.Tools } MakeDoubleBuffered(ctrl); + ResumeDrawing(ctrl); } public static void MakeDoubleBuffered(Control c)