Changed: simplified tile container, removed group label

Windows/Forms/Tile/AddListTileForm.cs

@@ -14,7 +14,7 @@ namespace AppLauncher.Windows.Forms
 
         private System.Windows.Forms.Label label1;
         private TButton button1;
-        private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator1;
+        private RyzStudio.Windows.Forms.THorizontalSeparator horizontalSeparator1;
         private TTextBox textBox1;
         protected TileLayoutPanel parentPanel = null;
 
@@ -39,7 +39,7 @@ namespace AppLauncher.Windows.Forms
             this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox();
             this.label1 = new System.Windows.Forms.Label();
             this.button1 = new RyzStudio.Windows.ThemedForms.TButton();
-            this.horizontalSeparator1 = new RyzStudio.Windows.Forms.HorizontalSeparator();
+            this.horizontalSeparator1 = new RyzStudio.Windows.Forms.THorizontalSeparator();
             ((System.ComponentModel.ISupportInitialize)(this.imgbxClose)).BeginInit();
             this.SuspendLayout();
             //

Windows/Forms/Tile/AddTileForm.cs

@@ -29,8 +29,8 @@ namespace AppLauncher.Windows.Forms
         private TButton button1;
         private TPickerBox pickerBox1;
         private TPickerBox pickerBox2;
-        private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator1;
-        private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator2;
+        private RyzStudio.Windows.Forms.THorizontalSeparator horizontalSeparator1;
+        private RyzStudio.Windows.Forms.THorizontalSeparator horizontalSeparator2;
         private TTextBox textBox1;
         protected TileLayoutPanel parentPanel = null;
 
@@ -67,8 +67,8 @@ namespace AppLauncher.Windows.Forms
             this.button1 = new RyzStudio.Windows.ThemedForms.TButton();
             this.pickerBox1 = new RyzStudio.Windows.ThemedForms.TPickerBox();
             this.pickerBox2 = new RyzStudio.Windows.ThemedForms.TPickerBox();
-            this.horizontalSeparator1 = new RyzStudio.Windows.Forms.HorizontalSeparator();
-            this.horizontalSeparator2 = new RyzStudio.Windows.Forms.HorizontalSeparator();
+            this.horizontalSeparator1 = new RyzStudio.Windows.Forms.THorizontalSeparator();
+            this.horizontalSeparator2 = new RyzStudio.Windows.Forms.THorizontalSeparator();
             ((System.ComponentModel.ISupportInitialize)(this.imgbxClose)).BeginInit();
             this.SuspendLayout();
             //

Windows/Forms/Tile/EditListTileForm.cs

@@ -14,7 +14,7 @@ namespace AppLauncher.Windows.Forms
 
         private System.Windows.Forms.Label label1;
         private TButton button1;
-        private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator2;
+        private RyzStudio.Windows.Forms.THorizontalSeparator horizontalSeparator2;
         private TTextBox textBox1;
         private TListBox tListBox1;
         private System.Windows.Forms.Label label2;
@@ -57,7 +57,7 @@ namespace AppLauncher.Windows.Forms
             this.textBox1 = new RyzStudio.Windows.ThemedForms.TTextBox();
             this.label1 = new System.Windows.Forms.Label();
             this.button1 = new RyzStudio.Windows.ThemedForms.TButton();
-            this.horizontalSeparator2 = new RyzStudio.Windows.Forms.HorizontalSeparator();
+            this.horizontalSeparator2 = new RyzStudio.Windows.Forms.THorizontalSeparator();
             this.tListBox1 = new RyzStudio.Windows.ThemedForms.TListBox();
             this.label2 = new System.Windows.Forms.Label();
             this.tButton1 = new RyzStudio.Windows.ThemedForms.TButton();

Windows/Forms/Tile/EditTileForm.cs

@@ -25,8 +25,8 @@ namespace AppLauncher.Windows.Forms
         private TButton button1;
         private TPickerBox pickerBox1;
         private TPickerBox pickerBox2;
-        private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator1;
-        private RyzStudio.Windows.Forms.HorizontalSeparator horizontalSeparator2;
+        private RyzStudio.Windows.Forms.THorizontalSeparator horizontalSeparator1;
+        private RyzStudio.Windows.Forms.THorizontalSeparator horizontalSeparator2;
         private TTextBox textBox1;
         protected TilePanel parentPanel = null;
 
@@ -63,8 +63,8 @@ namespace AppLauncher.Windows.Forms
             this.button1 = new RyzStudio.Windows.ThemedForms.TButton();
             this.pickerBox1 = new RyzStudio.Windows.ThemedForms.TPickerBox();
             this.pickerBox2 = new RyzStudio.Windows.ThemedForms.TPickerBox();
-            this.horizontalSeparator1 = new RyzStudio.Windows.Forms.HorizontalSeparator();
-            this.horizontalSeparator2 = new RyzStudio.Windows.Forms.HorizontalSeparator();
+            this.horizontalSeparator1 = new RyzStudio.Windows.Forms.THorizontalSeparator();
+            this.horizontalSeparator2 = new RyzStudio.Windows.Forms.THorizontalSeparator();
             ((System.ComponentModel.ISupportInitialize)(this.imgbxClose)).BeginInit();
             this.SuspendLayout();
             //

Windows/Forms/Tile/TileLayoutContainer.Designer.cs

@@ -29,28 +29,26 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.label1 = new AppLauncher.Windows.Forms.TileGroupLabel();
             this.panel1 = new AppLauncher.Windows.Forms.TileLayoutPanel();
             this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.addToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.addListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem();
+            this.topToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.upToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.downToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.bottomToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
             this.contextMenuStrip1.SuspendLayout();
+            this.contextMenuStrip2.SuspendLayout();
             this.SuspendLayout();
             // 
-            // label1
-            // 
-            this.label1.AutoScrollMargin = new System.Drawing.Size(0, 0);
-            this.label1.AutoScrollMinSize = new System.Drawing.Size(0, 0);
-            this.label1.Checked = false;
-            this.label1.Location = new System.Drawing.Point(0, 0);
-            this.label1.Margin = new System.Windows.Forms.Padding(0, 0, 0, 3);
-            this.label1.MinimumSize = new System.Drawing.Size(100, 20);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(223, 20);
-            this.label1.TabIndex = 11;
-            this.label1.TileGroupPanel = null;
-            this.label1.TitleText = "Featured";
-            // 
             // panel1
             // 
             this.panel1.AllowDrop = true;
@@ -69,42 +67,142 @@
             this.addToolStripMenuItem,
             this.addListToolStripMenuItem});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(181, 70);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(139, 48);
             // 
             // addToolStripMenuItem
             // 
             this.addToolStripMenuItem.Name = "addToolStripMenuItem";
-            this.addToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.addToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
             this.addToolStripMenuItem.Text = "&Add Tile";
             this.addToolStripMenuItem.Click += new System.EventHandler(this.addTileMenuItem_Click);
             // 
             // addListToolStripMenuItem
             // 
             this.addListToolStripMenuItem.Name = "addListToolStripMenuItem";
-            this.addListToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.addListToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
             this.addListToolStripMenuItem.Text = "Add &List Tile";
             this.addListToolStripMenuItem.Click += new System.EventHandler(this.addListTileMenuItem_Click);
             // 
+            // contextMenuStrip2
+            // 
+            this.contextMenuStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripMenuItem2,
+            this.toolStripMenuItem5,
+            this.toolStripMenuItem1,
+            this.toolStripSeparator2,
+            this.toolStripMenuItem4,
+            this.toolStripSeparator1,
+            this.toolStripMenuItem3});
+            this.contextMenuStrip2.Name = "contextMenuStrip1";
+            this.contextMenuStrip2.Size = new System.Drawing.Size(133, 126);
+            // 
+            // toolStripMenuItem2
+            // 
+            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(132, 22);
+            this.toolStripMenuItem2.Text = "&Add Group";
+            this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
+            // 
+            // toolStripMenuItem5
+            // 
+            this.toolStripMenuItem5.Name = "toolStripMenuItem5";
+            this.toolStripMenuItem5.Size = new System.Drawing.Size(132, 22);
+            this.toolStripMenuItem5.Text = "Add &Row";
+            this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
+            // 
+            // toolStripMenuItem1
+            // 
+            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(132, 22);
+            this.toolStripMenuItem1.Text = "&Edit";
+            this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
+            // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(129, 6);
+            // 
+            // toolStripMenuItem4
+            // 
+            this.toolStripMenuItem4.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.topToolStripMenuItem,
+            this.upToolStripMenuItem,
+            this.downToolStripMenuItem,
+            this.bottomToolStripMenuItem});
+            this.toolStripMenuItem4.Name = "toolStripMenuItem4";
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(132, 22);
+            this.toolStripMenuItem4.Text = "&Move";
+            // 
+            // topToolStripMenuItem
+            // 
+            this.topToolStripMenuItem.Name = "topToolStripMenuItem";
+            this.topToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
+            this.topToolStripMenuItem.Text = "&Top";
+            this.topToolStripMenuItem.Click += new System.EventHandler(this.topToolStripMenuItem_Click);
+            // 
+            // upToolStripMenuItem
+            // 
+            this.upToolStripMenuItem.Name = "upToolStripMenuItem";
+            this.upToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
+            this.upToolStripMenuItem.Text = "&Up";
+            this.upToolStripMenuItem.Click += new System.EventHandler(this.upToolStripMenuItem_Click);
+            // 
+            // downToolStripMenuItem
+            // 
+            this.downToolStripMenuItem.Name = "downToolStripMenuItem";
+            this.downToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
+            this.downToolStripMenuItem.Text = "&Down";
+            this.downToolStripMenuItem.Click += new System.EventHandler(this.downToolStripMenuItem_Click);
+            // 
+            // bottomToolStripMenuItem
+            // 
+            this.bottomToolStripMenuItem.Name = "bottomToolStripMenuItem";
+            this.bottomToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
+            this.bottomToolStripMenuItem.Text = "&Bottom";
+            this.bottomToolStripMenuItem.Click += new System.EventHandler(this.bottomToolStripMenuItem_Click);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(129, 6);
+            // 
+            // toolStripMenuItem3
+            // 
+            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(132, 22);
+            this.toolStripMenuItem3.Text = "&Remove";
+            this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
+            // 
             // TileLayoutContainer
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Transparent;
             this.Controls.Add(this.panel1);
-            this.Controls.Add(this.label1);
             this.Name = "TileLayoutContainer";
             this.Size = new System.Drawing.Size(370, 150);
             this.contextMenuStrip1.ResumeLayout(false);
+            this.contextMenuStrip2.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
 
         #endregion
-
-        private TileGroupLabel label1;
         private TileLayoutPanel panel1;
         private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
         private System.Windows.Forms.ToolStripMenuItem addToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem addListToolStripMenuItem;
+        private System.Windows.Forms.ContextMenuStrip contextMenuStrip2;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem5;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem4;
+        private System.Windows.Forms.ToolStripMenuItem topToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem upToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem downToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem bottomToolStripMenuItem;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
     }
 }

Windows/Forms/Tile/TileLayoutContainer.cs

@@ -1,6 +1,7 @@
 using AppLauncher.Models;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Drawing;
 using System.Threading;
 using System.Threading.Tasks;
@@ -10,19 +11,19 @@ namespace AppLauncher.Windows.Forms
 {
     public partial class TileLayoutContainer : AUserControl
     {
-        protected int collapseIncrement = 6;
-        protected int expandIncrement = 8;
         protected TileGroupModel groupInfo = null;
+
+        protected readonly int labelHeight = 20;
+        protected readonly int collapseIncrement = 6;
+        protected readonly int expandIncrement = 8;
+
         protected bool isAnimating = false;
+        protected bool isChecked = true;
 
         public TileLayoutContainer(TileGroupModel model) : base()
         {
             InitializeComponent();
 
-            this.ContextMenuStrip = contextMenuStrip1;
-
-            label1.TileGroupPanel = this;
-
             this.LoadModel(model);
 
             panel1.Resize += panel1_Resize;
@@ -32,9 +33,7 @@ namespace AppLauncher.Windows.Forms
         {
             base.OnLoad(e);
 
-            label1.Width = panel1.Width;
-
-            this.Margin = new Padding(0, 0, 0, 0);
+            this.Margin = new Padding(0);
             this.Padding = new Padding(0, 0, 0, 10);
             //this.MaximumSize = new Size(panel1.Width, ExpandedHeight);
             //this.MinimumSize = new Size(panel1.Width, label1.Height);
@@ -42,16 +41,23 @@ namespace AppLauncher.Windows.Forms
             this.Size = new Size(panel1.Width, this.ExpandedHeight);
         }
 
-        private async void panel1_Resize(object sender, EventArgs e)
+        protected override void OnPaint(PaintEventArgs e)
         {
-            await this.InvalidateContainer();
+            base.OnPaint(e);
+
+            Graphics g = e.Graphics;
+
+            g.DrawImageUnscaled((isChecked ? Properties.Resources.toggle_right_ea_16 : Properties.Resources.toggle_left_ea_16), 2, 2);
+
+            TextRenderer.DrawText(g, groupInfo?.Title, new Font(this.Font.FontFamily, 8.25F), new Point(25, 4), Color.FromArgb(99, 105, 119));
+
         }
 
-        public int CollapseHeight => label1.Height + panel1.CollapseHeight;
+        private async void panel1_Resize(object sender, EventArgs e) => await this.InvalidateContainer();
 
-        public int ExpandedHeight => label1.Height + panel1.ExpandedHeight + this.Padding.Top + this.Padding.Bottom;
+        public int CollapseHeight => labelHeight + panel1.CollapseHeight;
 
-        public bool IsAnimating => isAnimating;
+        public int ExpandedHeight => labelHeight + panel1.ExpandedHeight + this.Padding.Top + this.Padding.Bottom;
 
         public TileGroupModel Model
         {
@@ -59,9 +65,9 @@ namespace AppLauncher.Windows.Forms
             {
                 TileGroupModel rs = new TileGroupModel()
                 {
-                    Title = label1.TitleText,
+                    Title = groupInfo.Title,
                     GridSize = new Size(panel1.GridSize.X, panel1.GridSize.Y),
-                    IsExpanded = label1.Checked,
+                    IsExpanded = isChecked,
                     IsExclusive = groupInfo.IsExclusive,
                     Items = panel1.Tiles
                 };
@@ -171,12 +177,12 @@ namespace AppLauncher.Windows.Forms
 
         public async Task InvalidateContainer(bool animate = true)
         {
-            if (this.IsAnimating)
+            if (isAnimating)
             {
                 return;
             }
 
-            if (label1.Checked)
+            if (isChecked)
             {
                 await this.Expand();
             }
@@ -222,16 +228,17 @@ namespace AppLauncher.Windows.Forms
         {
             groupInfo = model;
 
-            label1.TitleText = groupInfo.Title;
             panel1.SetGridSize(groupInfo.GridSize.Width, groupInfo.GridSize.Height);
             this.Width = panel1.Width;
 
-            label1.Checked = groupInfo.IsExpanded;
+            isChecked = groupInfo.IsExpanded;
 
             if (loadTiles)
             {
                 panel1.LoadTiles(model.Items);
             }
+
+            this.Invalidate();
         }
 
         public void MoveTop()
@@ -300,5 +307,56 @@ namespace AppLauncher.Windows.Forms
 
         private void addListTileMenuItem_Click(object sender, EventArgs e) => AddListTileForm.ShowDialog(panel1);
 
+        protected override async void OnMouseClick(MouseEventArgs e)
+        {
+            base.OnMouseClick(e);
+
+            bool isLabel = ((e.Location.X >= 0) && (e.Location.X <= this.Width) && (e.Location.Y >= 0) && (e.Location.Y <= 20));
+
+            if (e.Button == MouseButtons.Left)
+            {
+                if (isLabel)
+                {
+                    isChecked = !isChecked;
+
+                    this.Invalidate();
+                    await this.InvalidateContainer();
+                }
+                else
+                {
+
+                }
+            }
+            else if (e.Button == MouseButtons.Right)
+            {
+                if (isLabel)
+                {
+                    contextMenuStrip2.Show(this, e.Location);
+                }
+                else
+                {
+                    contextMenuStrip1.Show(this, e.Location);
+                }
+            }
+        }
+
+        protected override void OnMouseDoubleClick(MouseEventArgs e) => base.OnMouseClick(e);
+
+        private void toolStripMenuItem2_Click(object sender, EventArgs e) => this.AddGroup();
+
+        private void toolStripMenuItem5_Click(object sender, EventArgs e) => this.AddRow();
+
+        private void toolStripMenuItem1_Click(object sender, EventArgs e) => this.EditGroup();
+
+        private void topToolStripMenuItem_Click(object sender, EventArgs e) => this.MoveTop();
+
+        private void upToolStripMenuItem_Click(object sender, EventArgs e) => this.MoveUp();
+
+        private void downToolStripMenuItem_Click(object sender, EventArgs e) => this.MoveDown();
+
+        private void bottomToolStripMenuItem_Click(object sender, EventArgs e) => this.MoveBottom();
+
+        private void toolStripMenuItem3_Click(object sender, EventArgs e) => this.Remove();
+
     }
 }

Windows/Forms/Tile/TileLayoutContainer.resx

@@ -120,4 +120,7 @@
   <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="contextMenuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>172, 17</value>
+  </metadata>
 </root>