From 17efb8ea4cbcde79368a9b2dceab5197ca686f05 Mon Sep 17 00:00:00 2001 From: Taiizor Date: Mon, 12 Apr 2021 17:00:29 +0300 Subject: [PATCH] 53X Again 23! --- src/Taskbar/Taskbar.cs | 108 ++++++++++++++++++++++++++++- src/Taskbar/Taskbar.csproj | 4 +- src/Taskbar_CR/Main.Designer.cs | 80 +++++++++++++++++---- src/Taskbar_CR/Main.cs | 115 +++++++++++++++++++------------ src/Taskbar_CR/Main.resx | 9 +++ src/Taskbar_CR/Taskbar_CR.csproj | 4 +- 6 files changed, 255 insertions(+), 65 deletions(-) diff --git a/src/Taskbar/Taskbar.cs b/src/Taskbar/Taskbar.cs index 50a0a75..882c938 100644 --- a/src/Taskbar/Taskbar.cs +++ b/src/Taskbar/Taskbar.cs @@ -140,6 +140,101 @@ public static Point Location(Screen Screen, Enums.EdgeLocationType Edge, int Wid /// public class Simple { + /// + /// Gets taskbar size. + /// + /// + public static Size Size(Screen Screen) + { + try + { + int Width = Screen.Bounds.Width - Screen.WorkingArea.Width; + int Height = Screen.Bounds.Height - Screen.WorkingArea.Height; + + return Detect(Screen) switch + { + Enums.LocationType.Left => new(Width == 0 ? 2 : Width, Screen.Bounds.Height), + Enums.LocationType.Top => new(Screen.Bounds.Width, Height == 0 ? 2 : Height), + Enums.LocationType.Right => new(Width == 0 ? 2 : Width, Screen.Bounds.Height), + _ => new(Screen.Bounds.Width, Height == 0 ? 2 : Height), + }; + } + catch + { + throw new Exception(Values.Exception); + } + } + + /// + /// Gets taskbar size. + /// + /// + public static Size SingleSize + { + get + { + try + { + return Size(Screen.PrimaryScreen); + } + catch + { + throw new Exception(Values.Exception); + } + } + } + + /// + /// Gets detect multiple screen taskbar size list value. + /// + public static List MultiSizeList + { + get + { + try + { + List Result = new(); + + foreach (Screen Screen in Screen.AllScreens) + { + Result.Add(Size(Screen)); + } + + return Result; + } + catch + { + throw new Exception(Values.Exception); + } + } + } + + /// + /// Gets detect multiple screen taskbar size dictionary value. + /// + public static Dictionary MultiSizeDictionary + { + get + { + try + { + Dictionary Result = new(); + int Count = 0; + + foreach (Screen Screen in Screen.AllScreens) + { + Result.Add(Count++, Size(Screen)); + } + + return Result; + } + catch + { + throw new Exception(Values.Exception); + } + } + } + /// /// Gets detect screen taskbar location. /// @@ -581,9 +676,16 @@ public static Size Size { try { - //Detecting position - //width - height - return new(0, 0); + int Width = Data.Rect.Right - Data.Rect.Left; + int Height = Data.Rect.Bot - Data.Rect.Top; + + return Position switch + { + Enums.LocationType.Left => new(AutoHide ? 2 : Data.Rect.Right, Data.Rect.Bot), + Enums.LocationType.Top => new(Data.Rect.Right, AutoHide ? 2 : Data.Rect.Bot), + Enums.LocationType.Right => new(AutoHide ? 2 : Width, Data.Rect.Bot), + _ => new(Data.Rect.Right, AutoHide ? 2 : Height), + }; } catch { diff --git a/src/Taskbar/Taskbar.csproj b/src/Taskbar/Taskbar.csproj index ed639fd..d4fda9c 100644 --- a/src/Taskbar/Taskbar.csproj +++ b/src/Taskbar/Taskbar.csproj @@ -1,10 +1,10 @@ - net48 + - + net40;net45;net451;net452;net46;net461;net462;net47;net471;net472;net48;netcoreapp3.0-windows;netcoreapp3.1-windows;net5.0-windows;net6.0-windows true Resources\ICO.ico 1.0.0.4 diff --git a/src/Taskbar_CR/Main.Designer.cs b/src/Taskbar_CR/Main.Designer.cs index d5267de..2dcd94c 100644 --- a/src/Taskbar_CR/Main.Designer.cs +++ b/src/Taskbar_CR/Main.Designer.cs @@ -47,6 +47,9 @@ private void InitializeComponent() this.button16 = new System.Windows.Forms.Button(); this.button17 = new System.Windows.Forms.Button(); this.button18 = new System.Windows.Forms.Button(); + this.button19 = new System.Windows.Forms.Button(); + this.button20 = new System.Windows.Forms.Button(); + this.button21 = new System.Windows.Forms.Button(); this.SuspendLayout(); // // button1 @@ -73,7 +76,8 @@ private void InitializeComponent() // // button3 // - this.button3.Location = new System.Drawing.Point(12, 176); + this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button3.Location = new System.Drawing.Point(12, 247); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(150, 64); this.button3.TabIndex = 2; @@ -84,7 +88,8 @@ private void InitializeComponent() // // button4 // - this.button4.Location = new System.Drawing.Point(168, 176); + this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button4.Location = new System.Drawing.Point(168, 247); this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(150, 64); this.button4.TabIndex = 3; @@ -95,7 +100,8 @@ private void InitializeComponent() // // button5 // - this.button5.Location = new System.Drawing.Point(324, 176); + this.button5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button5.Location = new System.Drawing.Point(324, 247); this.button5.Name = "button5"; this.button5.Size = new System.Drawing.Size(150, 64); this.button5.TabIndex = 4; @@ -106,7 +112,8 @@ private void InitializeComponent() // // button6 // - this.button6.Location = new System.Drawing.Point(12, 246); + this.button6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button6.Location = new System.Drawing.Point(12, 317); this.button6.Name = "button6"; this.button6.Size = new System.Drawing.Size(150, 64); this.button6.TabIndex = 5; @@ -117,7 +124,8 @@ private void InitializeComponent() // // button7 // - this.button7.Location = new System.Drawing.Point(168, 246); + this.button7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button7.Location = new System.Drawing.Point(168, 317); this.button7.Name = "button7"; this.button7.Size = new System.Drawing.Size(150, 64); this.button7.TabIndex = 6; @@ -139,7 +147,8 @@ private void InitializeComponent() // // button9 // - this.button9.Location = new System.Drawing.Point(168, 316); + this.button9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button9.Location = new System.Drawing.Point(168, 387); this.button9.Name = "button9"; this.button9.Size = new System.Drawing.Size(150, 64); this.button9.TabIndex = 8; @@ -150,7 +159,8 @@ private void InitializeComponent() // // button10 // - this.button10.Location = new System.Drawing.Point(324, 316); + this.button10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button10.Location = new System.Drawing.Point(324, 387); this.button10.Name = "button10"; this.button10.Size = new System.Drawing.Size(150, 64); this.button10.TabIndex = 9; @@ -161,7 +171,8 @@ private void InitializeComponent() // // button11 // - this.button11.Location = new System.Drawing.Point(12, 386); + this.button11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button11.Location = new System.Drawing.Point(12, 457); this.button11.Name = "button11"; this.button11.Size = new System.Drawing.Size(150, 64); this.button11.TabIndex = 10; @@ -172,7 +183,8 @@ private void InitializeComponent() // // button12 // - this.button12.Location = new System.Drawing.Point(324, 386); + this.button12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button12.Location = new System.Drawing.Point(324, 457); this.button12.Name = "button12"; this.button12.Size = new System.Drawing.Size(150, 64); this.button12.TabIndex = 11; @@ -183,7 +195,8 @@ private void InitializeComponent() // // button13 // - this.button13.Location = new System.Drawing.Point(168, 386); + this.button13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button13.Location = new System.Drawing.Point(168, 457); this.button13.Name = "button13"; this.button13.Size = new System.Drawing.Size(150, 64); this.button13.TabIndex = 12; @@ -227,7 +240,8 @@ private void InitializeComponent() // // button17 // - this.button17.Location = new System.Drawing.Point(12, 316); + this.button17.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button17.Location = new System.Drawing.Point(12, 387); this.button17.Name = "button17"; this.button17.Size = new System.Drawing.Size(150, 64); this.button17.TabIndex = 16; @@ -238,7 +252,8 @@ private void InitializeComponent() // // button18 // - this.button18.Location = new System.Drawing.Point(324, 246); + this.button18.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.button18.Location = new System.Drawing.Point(324, 317); this.button18.Name = "button18"; this.button18.Size = new System.Drawing.Size(150, 64); this.button18.TabIndex = 17; @@ -247,11 +262,47 @@ private void InitializeComponent() this.button18.UseVisualStyleBackColor = true; this.button18.Click += new System.EventHandler(this.Button18_Click); // + // button19 + // + this.button19.Location = new System.Drawing.Point(12, 152); + this.button19.Name = "button19"; + this.button19.Size = new System.Drawing.Size(150, 64); + this.button19.TabIndex = 18; + this.button19.TabStop = false; + this.button19.Text = "Simple\r\nSingle Size"; + this.button19.UseVisualStyleBackColor = true; + this.button19.Click += new System.EventHandler(this.Button19_Click); + // + // button20 + // + this.button20.Location = new System.Drawing.Point(168, 152); + this.button20.Name = "button20"; + this.button20.Size = new System.Drawing.Size(150, 64); + this.button20.TabIndex = 19; + this.button20.TabStop = false; + this.button20.Text = "Simple\r\nMulti Size List"; + this.button20.UseVisualStyleBackColor = true; + this.button20.Click += new System.EventHandler(this.Button20_Click); + // + // button21 + // + this.button21.Location = new System.Drawing.Point(324, 152); + this.button21.Name = "button21"; + this.button21.Size = new System.Drawing.Size(150, 64); + this.button21.TabIndex = 20; + this.button21.TabStop = false; + this.button21.Text = "Simple\r\nMulti Size Dictionary"; + this.button21.UseVisualStyleBackColor = true; + this.button21.Click += new System.EventHandler(this.Button21_Click); + // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.ClientSize = new System.Drawing.Size(486, 462); + this.ClientSize = new System.Drawing.Size(486, 533); + this.Controls.Add(this.button21); + this.Controls.Add(this.button20); + this.Controls.Add(this.button19); this.Controls.Add(this.button18); this.Controls.Add(this.button17); this.Controls.Add(this.button16); @@ -302,5 +353,8 @@ private void InitializeComponent() private System.Windows.Forms.Button button16; private System.Windows.Forms.Button button17; private System.Windows.Forms.Button button18; + private System.Windows.Forms.Button button19; + private System.Windows.Forms.Button button20; + private System.Windows.Forms.Button button21; } } \ No newline at end of file diff --git a/src/Taskbar_CR/Main.cs b/src/Taskbar_CR/Main.cs index 969e432..16ac3c6 100644 --- a/src/Taskbar_CR/Main.cs +++ b/src/Taskbar_CR/Main.cs @@ -5,7 +5,7 @@ using System.Drawing; using System.Threading; using System.Windows.Forms; -using Taskbar.Enum; +using static Taskbar.Enum.Enums; using static Taskbar.Taskbar; #endregion @@ -26,9 +26,9 @@ private void Button1_Click(object sender, EventArgs e) private void Button8_Click(object sender, EventArgs e) { - List Screen = Simple.MultiDetectList; + List Screen = Simple.MultiDetectList; - foreach (Enums.LocationType Var in Screen) + foreach (LocationType Var in Screen) { MessageBox.Show(Var.ToString()); } @@ -36,9 +36,9 @@ private void Button8_Click(object sender, EventArgs e) private void Button2_Click(object sender, EventArgs e) { - Dictionary Screen = Simple.MultiDetectDictionary; + Dictionary Screen = Simple.MultiDetectDictionary; - foreach (KeyValuePair Var in Screen) + foreach (KeyValuePair Var in Screen) { MessageBox.Show("Screen " + Var.Key + " => " + Var.Value); } @@ -46,30 +46,30 @@ private void Button2_Click(object sender, EventArgs e) private void Button14_Click(object sender, EventArgs e) { - Location = Simple.SingleLocation(Enums.EdgeLocationType.TopLeft, Width, Height, 32); + Location = Simple.SingleLocation(EdgeLocationType.TopLeft, Width, Height, 32); Thread.Sleep(750); - Location = Simple.SingleLocation(Enums.EdgeLocationType.TopCenter, Width, Height, 32); + Location = Simple.SingleLocation(EdgeLocationType.TopCenter, Width, Height, 32); Thread.Sleep(750); - Location = Simple.SingleLocation(Enums.EdgeLocationType.TopRight, Width, Height, 32); + Location = Simple.SingleLocation(EdgeLocationType.TopRight, Width, Height, 32); Thread.Sleep(750); - Location = Simple.SingleLocation(Enums.EdgeLocationType.BotLeft, Width, Height, 32); + Location = Simple.SingleLocation(EdgeLocationType.BotLeft, Width, Height, 32); Thread.Sleep(750); - Location = Simple.SingleLocation(Enums.EdgeLocationType.BotCenter, Width, Height, 32); + Location = Simple.SingleLocation(EdgeLocationType.BotCenter, Width, Height, 32); Thread.Sleep(750); - Location = Simple.SingleLocation(Enums.EdgeLocationType.BotRight, Width, Height, 32); + Location = Simple.SingleLocation(EdgeLocationType.BotRight, Width, Height, 32); Thread.Sleep(750); - Location = Simple.SingleLocation(Enums.EdgeLocationType.LeftCenter, Width, Height, 32); + Location = Simple.SingleLocation(EdgeLocationType.LeftCenter, Width, Height, 32); Thread.Sleep(750); - Location = Simple.SingleLocation(Enums.EdgeLocationType.RightCenter, Width, Height, 32); + Location = Simple.SingleLocation(EdgeLocationType.RightCenter, Width, Height, 32); Thread.Sleep(750); - Location = Simple.SingleLocation(Enums.EdgeLocationType.CalcCenter, Width, Height); + Location = Simple.SingleLocation(EdgeLocationType.CalcCenter, Width, Height); Thread.Sleep(750); - Location = Simple.SingleLocation(Enums.EdgeLocationType.FullCenter, Width, Height); + Location = Simple.SingleLocation(EdgeLocationType.FullCenter, Width, Height); } private void Button15_Click(object sender, EventArgs e) { - List Location = Simple.MultiLocationList(Enums.EdgeLocationType.TopLeft, Width, Height, 32); + List Location = Simple.MultiLocationList(EdgeLocationType.TopLeft, Width, Height, 32); foreach (Point Var in Location) { @@ -77,7 +77,7 @@ private void Button15_Click(object sender, EventArgs e) MessageBox.Show("X: " + Var.X + "\nY: " + Var.Y); } - Location = Simple.MultiLocationList(Enums.EdgeLocationType.TopCenter, Width, Height, 32); + Location = Simple.MultiLocationList(EdgeLocationType.TopCenter, Width, Height, 32); foreach (Point Var in Location) { @@ -85,7 +85,7 @@ private void Button15_Click(object sender, EventArgs e) MessageBox.Show("X: " + Var.X + "\nY: " + Var.Y); } - Location = Simple.MultiLocationList(Enums.EdgeLocationType.TopRight, Width, Height, 32); + Location = Simple.MultiLocationList(EdgeLocationType.TopRight, Width, Height, 32); foreach (Point Var in Location) { @@ -93,7 +93,7 @@ private void Button15_Click(object sender, EventArgs e) MessageBox.Show("X: " + Var.X + "\nY: " + Var.Y); } - Location = Simple.MultiLocationList(Enums.EdgeLocationType.BotLeft, Width, Height, 32); + Location = Simple.MultiLocationList(EdgeLocationType.BotLeft, Width, Height, 32); foreach (Point Var in Location) { @@ -101,7 +101,7 @@ private void Button15_Click(object sender, EventArgs e) MessageBox.Show("X: " + Var.X + "\nY: " + Var.Y); } - Location = Simple.MultiLocationList(Enums.EdgeLocationType.BotCenter, Width, Height, 32); + Location = Simple.MultiLocationList(EdgeLocationType.BotCenter, Width, Height, 32); foreach (Point Var in Location) { @@ -109,7 +109,7 @@ private void Button15_Click(object sender, EventArgs e) MessageBox.Show("X: " + Var.X + "\nY: " + Var.Y); } - Location = Simple.MultiLocationList(Enums.EdgeLocationType.BotRight, Width, Height, 32); + Location = Simple.MultiLocationList(EdgeLocationType.BotRight, Width, Height, 32); foreach (Point Var in Location) { @@ -117,7 +117,7 @@ private void Button15_Click(object sender, EventArgs e) MessageBox.Show("X: " + Var.X + "\nY: " + Var.Y); } - Location = Simple.MultiLocationList(Enums.EdgeLocationType.LeftCenter, Width, Height, 32); + Location = Simple.MultiLocationList(EdgeLocationType.LeftCenter, Width, Height, 32); foreach (Point Var in Location) { @@ -125,7 +125,7 @@ private void Button15_Click(object sender, EventArgs e) MessageBox.Show("X: " + Var.X + "\nY: " + Var.Y); } - Location = Simple.MultiLocationList(Enums.EdgeLocationType.RightCenter, Width, Height, 32); + Location = Simple.MultiLocationList(EdgeLocationType.RightCenter, Width, Height, 32); foreach (Point Var in Location) { @@ -133,7 +133,7 @@ private void Button15_Click(object sender, EventArgs e) MessageBox.Show("X: " + Var.X + "\nY: " + Var.Y); } - Location = Simple.MultiLocationList(Enums.EdgeLocationType.CalcCenter, Width, Height); + Location = Simple.MultiLocationList(EdgeLocationType.CalcCenter, Width, Height); foreach (Point Var in Location) { @@ -141,7 +141,7 @@ private void Button15_Click(object sender, EventArgs e) MessageBox.Show("X: " + Var.X + "\nY: " + Var.Y); } - Location = Simple.MultiLocationList(Enums.EdgeLocationType.FullCenter, Width, Height); + Location = Simple.MultiLocationList(EdgeLocationType.FullCenter, Width, Height); foreach (Point Var in Location) { @@ -152,7 +152,7 @@ private void Button15_Click(object sender, EventArgs e) private void Button16_Click(object sender, EventArgs e) { - Dictionary Location = Simple.MultiLocationDictionary(Enums.EdgeLocationType.TopLeft, Width, Height, 32); + Dictionary Location = Simple.MultiLocationDictionary(EdgeLocationType.TopLeft, Width, Height, 32); foreach (KeyValuePair Var in Location) { @@ -160,7 +160,7 @@ private void Button16_Click(object sender, EventArgs e) MessageBox.Show("Screen " + Var.Key + " =>\n" + "\tX: " + Var.Value.X + "\n\tY: " + Var.Value.Y); } - Location = Simple.MultiLocationDictionary(Enums.EdgeLocationType.TopCenter, Width, Height, 32); + Location = Simple.MultiLocationDictionary(EdgeLocationType.TopCenter, Width, Height, 32); foreach (KeyValuePair Var in Location) { @@ -168,7 +168,7 @@ private void Button16_Click(object sender, EventArgs e) MessageBox.Show("Screen " + Var.Key + " =>\n" + "\tX: " + Var.Value.X + "\n\tY: " + Var.Value.Y); } - Location = Simple.MultiLocationDictionary(Enums.EdgeLocationType.TopRight, Width, Height, 32); + Location = Simple.MultiLocationDictionary(EdgeLocationType.TopRight, Width, Height, 32); foreach (KeyValuePair Var in Location) { @@ -176,7 +176,7 @@ private void Button16_Click(object sender, EventArgs e) MessageBox.Show("Screen " + Var.Key + " =>\n" + "\tX: " + Var.Value.X + "\n\tY: " + Var.Value.Y); } - Location = Simple.MultiLocationDictionary(Enums.EdgeLocationType.BotLeft, Width, Height, 32); + Location = Simple.MultiLocationDictionary(EdgeLocationType.BotLeft, Width, Height, 32); foreach (KeyValuePair Var in Location) { @@ -184,7 +184,7 @@ private void Button16_Click(object sender, EventArgs e) MessageBox.Show("Screen " + Var.Key + " =>\n" + "\tX: " + Var.Value.X + "\n\tY: " + Var.Value.Y); } - Location = Simple.MultiLocationDictionary(Enums.EdgeLocationType.BotCenter, Width, Height, 32); + Location = Simple.MultiLocationDictionary(EdgeLocationType.BotCenter, Width, Height, 32); foreach (KeyValuePair Var in Location) { @@ -192,7 +192,7 @@ private void Button16_Click(object sender, EventArgs e) MessageBox.Show("Screen " + Var.Key + " =>\n" + "\tX: " + Var.Value.X + "\n\tY: " + Var.Value.Y); } - Location = Simple.MultiLocationDictionary(Enums.EdgeLocationType.BotRight, Width, Height, 32); + Location = Simple.MultiLocationDictionary(EdgeLocationType.BotRight, Width, Height, 32); foreach (KeyValuePair Var in Location) { @@ -200,7 +200,7 @@ private void Button16_Click(object sender, EventArgs e) MessageBox.Show("Screen " + Var.Key + " =>\n" + "\tX: " + Var.Value.X + "\n\tY: " + Var.Value.Y); } - Location = Simple.MultiLocationDictionary(Enums.EdgeLocationType.LeftCenter, Width, Height, 32); + Location = Simple.MultiLocationDictionary(EdgeLocationType.LeftCenter, Width, Height, 32); foreach (KeyValuePair Var in Location) { @@ -208,7 +208,7 @@ private void Button16_Click(object sender, EventArgs e) MessageBox.Show("Screen " + Var.Key + " =>\n" + "\tX: " + Var.Value.X + "\n\tY: " + Var.Value.Y); } - Location = Simple.MultiLocationDictionary(Enums.EdgeLocationType.RightCenter, Width, Height, 32); + Location = Simple.MultiLocationDictionary(EdgeLocationType.RightCenter, Width, Height, 32); foreach (KeyValuePair Var in Location) { @@ -216,7 +216,7 @@ private void Button16_Click(object sender, EventArgs e) MessageBox.Show("Screen " + Var.Key + " =>\n" + "\tX: " + Var.Value.X + "\n\tY: " + Var.Value.Y); } - Location = Simple.MultiLocationDictionary(Enums.EdgeLocationType.CalcCenter, Width, Height); + Location = Simple.MultiLocationDictionary(EdgeLocationType.CalcCenter, Width, Height); foreach (KeyValuePair Var in Location) { @@ -224,7 +224,7 @@ private void Button16_Click(object sender, EventArgs e) MessageBox.Show("Screen " + Var.Key + " =>\n" + "\tX: " + Var.Value.X + "\n\tY: " + Var.Value.Y); } - Location = Simple.MultiLocationDictionary(Enums.EdgeLocationType.FullCenter, Width, Height); + Location = Simple.MultiLocationDictionary(EdgeLocationType.FullCenter, Width, Height); foreach (KeyValuePair Var in Location) { @@ -233,6 +233,31 @@ private void Button16_Click(object sender, EventArgs e) } } + private void Button19_Click(object sender, EventArgs e) + { + MessageBox.Show("Width: " + Simple.SingleSize.Width + "\nHeight: " + Simple.SingleSize.Height); + } + + private void Button20_Click(object sender, EventArgs e) + { + List Size = Simple.MultiSizeList; + + foreach (Size Var in Size) + { + MessageBox.Show("Width: " + Var.Width + "\nHeight: " + Var.Height); + } + } + + private void Button21_Click(object sender, EventArgs e) + { + Dictionary Size = Simple.MultiSizeDictionary; + + foreach (KeyValuePair Var in Size) + { + MessageBox.Show("Screen " + Var.Key + " =>\n" + "\tWidth: " + Var.Value.Width + "\n\tHeight: " + Var.Value.Height); + } + } + private void Button3_Click(object sender, EventArgs e) { MessageBox.Show(Advanced.AlwaysOnTop.ToString()); @@ -265,25 +290,25 @@ private void Button18_Click(object sender, EventArgs e) private void Button17_Click(object sender, EventArgs e) { - Location = Advanced.SingleLocation(Enums.EdgeLocationType.TopLeft, Width, Height, 32); + Location = Advanced.SingleLocation(EdgeLocationType.TopLeft, Width, Height, 32); Thread.Sleep(750); - Location = Advanced.SingleLocation(Enums.EdgeLocationType.TopCenter, Width, Height, 32); + Location = Advanced.SingleLocation(EdgeLocationType.TopCenter, Width, Height, 32); Thread.Sleep(750); - Location = Advanced.SingleLocation(Enums.EdgeLocationType.TopRight, Width, Height, 32); + Location = Advanced.SingleLocation(EdgeLocationType.TopRight, Width, Height, 32); Thread.Sleep(750); - Location = Advanced.SingleLocation(Enums.EdgeLocationType.BotLeft, Width, Height, 32); + Location = Advanced.SingleLocation(EdgeLocationType.BotLeft, Width, Height, 32); Thread.Sleep(750); - Location = Advanced.SingleLocation(Enums.EdgeLocationType.BotCenter, Width, Height, 32); + Location = Advanced.SingleLocation(EdgeLocationType.BotCenter, Width, Height, 32); Thread.Sleep(750); - Location = Advanced.SingleLocation(Enums.EdgeLocationType.BotRight, Width, Height, 32); + Location = Advanced.SingleLocation(EdgeLocationType.BotRight, Width, Height, 32); Thread.Sleep(750); - Location = Advanced.SingleLocation(Enums.EdgeLocationType.LeftCenter, Width, Height, 32); + Location = Advanced.SingleLocation(EdgeLocationType.LeftCenter, Width, Height, 32); Thread.Sleep(750); - Location = Advanced.SingleLocation(Enums.EdgeLocationType.RightCenter, Width, Height, 32); + Location = Advanced.SingleLocation(EdgeLocationType.RightCenter, Width, Height, 32); Thread.Sleep(750); - Location = Advanced.SingleLocation(Enums.EdgeLocationType.CalcCenter, Width, Height); + Location = Advanced.SingleLocation(EdgeLocationType.CalcCenter, Width, Height); Thread.Sleep(750); - Location = Advanced.SingleLocation(Enums.EdgeLocationType.FullCenter, Width, Height); + Location = Advanced.SingleLocation(EdgeLocationType.FullCenter, Width, Height); } private void Button9_Click(object sender, EventArgs e) diff --git a/src/Taskbar_CR/Main.resx b/src/Taskbar_CR/Main.resx index 33c7bef..43d668d 100644 --- a/src/Taskbar_CR/Main.resx +++ b/src/Taskbar_CR/Main.resx @@ -171,6 +171,15 @@ True + + True + + + True + + + True + True diff --git a/src/Taskbar_CR/Taskbar_CR.csproj b/src/Taskbar_CR/Taskbar_CR.csproj index fd9eb1e..83db1ea 100644 --- a/src/Taskbar_CR/Taskbar_CR.csproj +++ b/src/Taskbar_CR/Taskbar_CR.csproj @@ -1,8 +1,8 @@  - net48 + - + net48;netcoreapp3.0-windows;netcoreapp3.1-windows;net5.0-windows;net6.0-windows WinExe false true