mirror of
https://github.com/colhountech/DarkUI.Net5.git
synced 2025-07-02 07:09:27 +03:00
Content now has current and default areas.
This commit is contained in:
parent
a0ded1a34d
commit
f9a67a31ad
@ -2,6 +2,7 @@
|
||||
{
|
||||
public enum DarkDockArea
|
||||
{
|
||||
None,
|
||||
Document,
|
||||
Left,
|
||||
Right,
|
||||
|
@ -54,9 +54,9 @@ namespace DarkUI.Docking
|
||||
}
|
||||
|
||||
[Category("Layout")]
|
||||
[Description("Determines which area of the dock panel this content will dock to.")]
|
||||
[Description("Determines the default area of the dock panel this content will be added to.")]
|
||||
[DefaultValue(DarkDockArea.Document)]
|
||||
public DarkDockArea DockArea { get; set; }
|
||||
public DarkDockArea DefaultDockArea { get; set; }
|
||||
|
||||
[Category("Behavior")]
|
||||
[Description("Determines the key used by this content in the dock serialization.")]
|
||||
@ -74,6 +74,10 @@ namespace DarkUI.Docking
|
||||
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
|
||||
public DarkDockGroup DockGroup { get; internal set; }
|
||||
|
||||
[Browsable(false)]
|
||||
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
|
||||
public DarkDockArea DockArea { get; set; }
|
||||
|
||||
#endregion
|
||||
|
||||
#region Constructor Region
|
||||
|
@ -125,12 +125,12 @@ namespace DarkUI.Docking
|
||||
if (_contents.Contains(dockContent))
|
||||
RemoveContent(dockContent);
|
||||
|
||||
if (dockGroup != null && dockContent.DockArea != dockGroup.DockArea)
|
||||
throw new Exception($"Attempting to add '{dockContent.DockArea}' content to '{dockGroup.DockArea}' group.");
|
||||
|
||||
dockContent.DockPanel = this;
|
||||
_contents.Add(dockContent);
|
||||
|
||||
if (dockContent.DockArea == DarkDockArea.None)
|
||||
dockContent.DockArea = dockContent.DefaultDockArea;
|
||||
|
||||
var region = _regions[dockContent.DockArea];
|
||||
region.AddContent(dockContent, dockGroup);
|
||||
|
||||
|
@ -10,9 +10,9 @@ namespace DarkUI.Docking
|
||||
|
||||
[Browsable(false)]
|
||||
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
|
||||
public new DarkDockArea DockArea
|
||||
public new DarkDockArea DefaultDockArea
|
||||
{
|
||||
get { return base.DockArea; }
|
||||
get { return base.DefaultDockArea; }
|
||||
}
|
||||
|
||||
#endregion
|
||||
@ -22,7 +22,7 @@ namespace DarkUI.Docking
|
||||
public DarkDocument()
|
||||
{
|
||||
BackColor = Colors.GreyBackground;
|
||||
base.DockArea = DarkDockArea.Document;
|
||||
base.DefaultDockArea = DarkDockArea.Document;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
2
Example/Forms/Docking/DockConsole.Designer.cs
generated
2
Example/Forms/Docking/DockConsole.Designer.cs
generated
@ -49,7 +49,7 @@ namespace Example
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.Controls.Add(this.lstConsole);
|
||||
this.DockArea = DarkUI.Docking.DarkDockArea.Bottom;
|
||||
this.DefaultDockArea = DarkUI.Docking.DarkDockArea.Bottom;
|
||||
this.DockText = "Console";
|
||||
this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.Icon = global::Example.Icons.Console;
|
||||
|
2
Example/Forms/Docking/DockHistory.Designer.cs
generated
2
Example/Forms/Docking/DockHistory.Designer.cs
generated
@ -49,7 +49,7 @@ namespace Example
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.Controls.Add(this.lstHistory);
|
||||
this.DockArea = DarkUI.Docking.DarkDockArea.Right;
|
||||
this.DefaultDockArea = DarkUI.Docking.DarkDockArea.Right;
|
||||
this.DockText = "History";
|
||||
this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.Icon = global::Example.Icons.RefactoringLog_12810;
|
||||
|
2
Example/Forms/Docking/DockLayers.Designer.cs
generated
2
Example/Forms/Docking/DockLayers.Designer.cs
generated
@ -48,7 +48,7 @@ namespace Example
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.Controls.Add(this.lstLayers);
|
||||
this.DockArea = DarkUI.Docking.DarkDockArea.Right;
|
||||
this.DefaultDockArea = DarkUI.Docking.DarkDockArea.Right;
|
||||
this.DockText = "Layers";
|
||||
this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.Icon = global::Example.Icons.Collection_16xLG;
|
||||
|
2
Example/Forms/Docking/DockProject.Designer.cs
generated
2
Example/Forms/Docking/DockProject.Designer.cs
generated
@ -53,7 +53,7 @@ namespace Example
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.Controls.Add(this.treeProject);
|
||||
this.DockArea = DarkUI.Docking.DarkDockArea.Left;
|
||||
this.DefaultDockArea = DarkUI.Docking.DarkDockArea.Left;
|
||||
this.DockText = "Project Explorer";
|
||||
this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.Icon = global::Example.Icons.application_16x;
|
||||
|
2
Example/Forms/Docking/DockProperties.Designer.cs
generated
2
Example/Forms/Docking/DockProperties.Designer.cs
generated
@ -177,7 +177,7 @@ namespace Example
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.Controls.Add(this.pnlMain);
|
||||
this.DockArea = DarkUI.Docking.DarkDockArea.Right;
|
||||
this.DefaultDockArea = DarkUI.Docking.DarkDockArea.Right;
|
||||
this.DockText = "Properties";
|
||||
this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.Icon = global::Example.Icons.properties_16xLG;
|
||||
|
112
Example/Forms/MainForm.Designer.cs
generated
112
Example/Forms/MainForm.Designer.cs
generated
@ -40,6 +40,11 @@ namespace Example
|
||||
this.mnuView = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.mnuDialog = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.mnuTools = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.checkableToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.checkableWithIconToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.checkedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.checkedWithIconToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.mnuWindow = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.mnuProject = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.mnuProperties = new System.Windows.Forms.ToolStripMenuItem();
|
||||
@ -56,11 +61,6 @@ namespace Example
|
||||
this.toolStripStatusLabel5 = new System.Windows.Forms.ToolStripStatusLabel();
|
||||
this.DockPanel = new DarkUI.Docking.DarkDockPanel();
|
||||
this.darkSeparator1 = new DarkUI.Controls.DarkSeparator();
|
||||
this.checkableToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.checkableWithIconToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.checkedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.checkedWithIconToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.mnuMain.SuspendLayout();
|
||||
this.toolMain.SuspendLayout();
|
||||
this.stripMain.SuspendLayout();
|
||||
@ -79,7 +79,7 @@ namespace Example
|
||||
this.mnuMain.Location = new System.Drawing.Point(0, 0);
|
||||
this.mnuMain.Name = "mnuMain";
|
||||
this.mnuMain.Padding = new System.Windows.Forms.Padding(3, 2, 0, 2);
|
||||
this.mnuMain.Size = new System.Drawing.Size(784, 24);
|
||||
this.mnuMain.Size = new System.Drawing.Size(944, 24);
|
||||
this.mnuMain.TabIndex = 0;
|
||||
this.mnuMain.Text = "darkMenuStrip1";
|
||||
//
|
||||
@ -149,6 +149,49 @@ namespace Example
|
||||
this.mnuTools.Size = new System.Drawing.Size(48, 20);
|
||||
this.mnuTools.Text = "&Tools";
|
||||
//
|
||||
// checkableToolStripMenuItem
|
||||
//
|
||||
this.checkableToolStripMenuItem.CheckOnClick = true;
|
||||
this.checkableToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||
this.checkableToolStripMenuItem.Name = "checkableToolStripMenuItem";
|
||||
this.checkableToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
|
||||
this.checkableToolStripMenuItem.Text = "Checkable";
|
||||
//
|
||||
// checkableWithIconToolStripMenuItem
|
||||
//
|
||||
this.checkableWithIconToolStripMenuItem.CheckOnClick = true;
|
||||
this.checkableWithIconToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||
this.checkableWithIconToolStripMenuItem.Image = global::Example.Icons.properties_16xLG;
|
||||
this.checkableWithIconToolStripMenuItem.Name = "checkableWithIconToolStripMenuItem";
|
||||
this.checkableWithIconToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
|
||||
this.checkableWithIconToolStripMenuItem.Text = "Checkable with icon";
|
||||
//
|
||||
// toolStripSeparator2
|
||||
//
|
||||
this.toolStripSeparator2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||
this.toolStripSeparator2.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
|
||||
this.toolStripSeparator2.Name = "toolStripSeparator2";
|
||||
this.toolStripSeparator2.Size = new System.Drawing.Size(178, 6);
|
||||
//
|
||||
// checkedToolStripMenuItem
|
||||
//
|
||||
this.checkedToolStripMenuItem.Checked = true;
|
||||
this.checkedToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.checkedToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||
this.checkedToolStripMenuItem.Name = "checkedToolStripMenuItem";
|
||||
this.checkedToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
|
||||
this.checkedToolStripMenuItem.Text = "Checked";
|
||||
//
|
||||
// checkedWithIconToolStripMenuItem
|
||||
//
|
||||
this.checkedWithIconToolStripMenuItem.Checked = true;
|
||||
this.checkedWithIconToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.checkedWithIconToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||
this.checkedWithIconToolStripMenuItem.Image = global::Example.Icons.properties_16xLG;
|
||||
this.checkedWithIconToolStripMenuItem.Name = "checkedWithIconToolStripMenuItem";
|
||||
this.checkedWithIconToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
|
||||
this.checkedWithIconToolStripMenuItem.Text = "Checked with icon";
|
||||
//
|
||||
// mnuWindow
|
||||
//
|
||||
this.mnuWindow.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
@ -230,7 +273,7 @@ namespace Example
|
||||
this.toolMain.Location = new System.Drawing.Point(0, 26);
|
||||
this.toolMain.Name = "toolMain";
|
||||
this.toolMain.Padding = new System.Windows.Forms.Padding(5, 0, 1, 0);
|
||||
this.toolMain.Size = new System.Drawing.Size(784, 28);
|
||||
this.toolMain.Size = new System.Drawing.Size(944, 28);
|
||||
this.toolMain.TabIndex = 1;
|
||||
this.toolMain.Text = "darkToolStrip1";
|
||||
//
|
||||
@ -254,10 +297,10 @@ namespace Example
|
||||
this.toolStripStatusLabel1,
|
||||
this.toolStripStatusLabel6,
|
||||
this.toolStripStatusLabel5});
|
||||
this.stripMain.Location = new System.Drawing.Point(0, 538);
|
||||
this.stripMain.Location = new System.Drawing.Point(0, 618);
|
||||
this.stripMain.Name = "stripMain";
|
||||
this.stripMain.Padding = new System.Windows.Forms.Padding(0, 5, 0, 3);
|
||||
this.stripMain.Size = new System.Drawing.Size(784, 24);
|
||||
this.stripMain.Size = new System.Drawing.Size(944, 24);
|
||||
this.stripMain.SizingGrip = false;
|
||||
this.stripMain.TabIndex = 2;
|
||||
this.stripMain.Text = "darkStatusStrip1";
|
||||
@ -275,7 +318,7 @@ namespace Example
|
||||
//
|
||||
this.toolStripStatusLabel6.Margin = new System.Windows.Forms.Padding(0, 0, 50, 2);
|
||||
this.toolStripStatusLabel6.Name = "toolStripStatusLabel6";
|
||||
this.toolStripStatusLabel6.Size = new System.Drawing.Size(597, 14);
|
||||
this.toolStripStatusLabel6.Size = new System.Drawing.Size(757, 14);
|
||||
this.toolStripStatusLabel6.Spring = true;
|
||||
this.toolStripStatusLabel6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
//
|
||||
@ -293,7 +336,7 @@ namespace Example
|
||||
this.DockPanel.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.DockPanel.Location = new System.Drawing.Point(0, 54);
|
||||
this.DockPanel.Name = "DockPanel";
|
||||
this.DockPanel.Size = new System.Drawing.Size(784, 484);
|
||||
this.DockPanel.Size = new System.Drawing.Size(944, 564);
|
||||
this.DockPanel.TabIndex = 3;
|
||||
//
|
||||
// darkSeparator1
|
||||
@ -301,58 +344,15 @@ namespace Example
|
||||
this.darkSeparator1.Dock = System.Windows.Forms.DockStyle.Top;
|
||||
this.darkSeparator1.Location = new System.Drawing.Point(0, 24);
|
||||
this.darkSeparator1.Name = "darkSeparator1";
|
||||
this.darkSeparator1.Size = new System.Drawing.Size(784, 2);
|
||||
this.darkSeparator1.Size = new System.Drawing.Size(944, 2);
|
||||
this.darkSeparator1.TabIndex = 4;
|
||||
this.darkSeparator1.Text = "darkSeparator1";
|
||||
//
|
||||
// checkableToolStripMenuItem
|
||||
//
|
||||
this.checkableToolStripMenuItem.CheckOnClick = true;
|
||||
this.checkableToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||
this.checkableToolStripMenuItem.Name = "checkableToolStripMenuItem";
|
||||
this.checkableToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
|
||||
this.checkableToolStripMenuItem.Text = "Checkable";
|
||||
//
|
||||
// checkableWithIconToolStripMenuItem
|
||||
//
|
||||
this.checkableWithIconToolStripMenuItem.CheckOnClick = true;
|
||||
this.checkableWithIconToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||
this.checkableWithIconToolStripMenuItem.Image = global::Example.Icons.properties_16xLG;
|
||||
this.checkableWithIconToolStripMenuItem.Name = "checkableWithIconToolStripMenuItem";
|
||||
this.checkableWithIconToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
|
||||
this.checkableWithIconToolStripMenuItem.Text = "Checkable with icon";
|
||||
//
|
||||
// toolStripSeparator2
|
||||
//
|
||||
this.toolStripSeparator2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||
this.toolStripSeparator2.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
|
||||
this.toolStripSeparator2.Name = "toolStripSeparator2";
|
||||
this.toolStripSeparator2.Size = new System.Drawing.Size(178, 6);
|
||||
//
|
||||
// checkedToolStripMenuItem
|
||||
//
|
||||
this.checkedToolStripMenuItem.Checked = true;
|
||||
this.checkedToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.checkedToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||
this.checkedToolStripMenuItem.Name = "checkedToolStripMenuItem";
|
||||
this.checkedToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
|
||||
this.checkedToolStripMenuItem.Text = "Checked";
|
||||
//
|
||||
// checkedWithIconToolStripMenuItem
|
||||
//
|
||||
this.checkedWithIconToolStripMenuItem.Checked = true;
|
||||
this.checkedWithIconToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.checkedWithIconToolStripMenuItem.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
|
||||
this.checkedWithIconToolStripMenuItem.Image = global::Example.Icons.properties_16xLG;
|
||||
this.checkedWithIconToolStripMenuItem.Name = "checkedWithIconToolStripMenuItem";
|
||||
this.checkedWithIconToolStripMenuItem.Size = new System.Drawing.Size(181, 22);
|
||||
this.checkedWithIconToolStripMenuItem.Text = "Checked with icon";
|
||||
//
|
||||
// MainForm
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(784, 562);
|
||||
this.ClientSize = new System.Drawing.Size(944, 642);
|
||||
this.Controls.Add(this.DockPanel);
|
||||
this.Controls.Add(this.stripMain);
|
||||
this.Controls.Add(this.toolMain);
|
||||
|
@ -124,7 +124,7 @@
|
||||
<data name="mnuHistory.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1
|
||||
MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAADsIAAA7CARUoSoAAADnsaVRYdFhNTDpjb20uYWRvYmUu
|
||||
MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAADsEAAA7BAbiRa+0AADnsaVRYdFhNTDpjb20uYWRvYmUu
|
||||
eG1wAAAAAAA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/
|
||||
Pgo8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29y
|
||||
ZSA1LjYtYzAxNCA3OS4xNTY3OTcsIDIwMTQvMDgvMjAtMDk6NTM6MDIgICAgICAgICI+CiAgIDxyZGY6
|
||||
|
Loading…
x
Reference in New Issue
Block a user