Make better use of space when help is toggled off

This commit is contained in:
baldurk
2014-09-28 14:10:28 +01:00
parent a0d6d771f2
commit 6af5130d00
3 changed files with 136 additions and 121 deletions
+114 -114
View File
@@ -28,119 +28,118 @@
/// </summary>
private void InitializeComponent()
{
System.Windows.Forms.GroupBox groupBox1;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BufferFormatSpecifier));
this.formatText = new System.Windows.Forms.TextBox();
this.helpText = new System.Windows.Forms.Label();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.errors = new System.Windows.Forms.Label();
this.apply = new System.Windows.Forms.Button();
this.hideHelp = new System.Windows.Forms.Button();
groupBox1 = new System.Windows.Forms.GroupBox();
groupBox1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
// groupBox1
//
groupBox1.Controls.Add(this.formatText);
groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
groupBox1.Location = new System.Drawing.Point(3, 195);
groupBox1.Name = "groupBox1";
groupBox1.Size = new System.Drawing.Size(556, 227);
groupBox1.TabIndex = 0;
groupBox1.TabStop = false;
groupBox1.Text = "Format";
//
// formatText
//
this.formatText.Dock = System.Windows.Forms.DockStyle.Fill;
this.formatText.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.formatText.Location = new System.Drawing.Point(3, 16);
this.formatText.Multiline = true;
this.formatText.Name = "formatText";
this.formatText.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.formatText.Size = new System.Drawing.Size(550, 208);
this.formatText.TabIndex = 0;
this.formatText.Text = "float4 asd; // blah blah\r\nfloat3 bar;";
this.formatText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.formatText_KeyDown);
//
// helpText
//
this.helpText.AutoSize = true;
this.helpText.Location = new System.Drawing.Point(8, 8);
this.helpText.Margin = new System.Windows.Forms.Padding(8);
this.helpText.Name = "helpText";
this.helpText.Size = new System.Drawing.Size(517, 130);
this.helpText.TabIndex = 1;
this.helpText.Text = resources.GetString("helpText.Text");
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 2;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.Controls.Add(groupBox1, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.helpText, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.errors, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.apply, 1, 2);
this.tableLayoutPanel1.Controls.Add(this.hideHelp, 1, 0);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 3;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(643, 425);
this.tableLayoutPanel1.TabIndex = 0;
//
// errors
//
this.tableLayoutPanel1.SetColumnSpan(this.errors, 2);
this.errors.Dock = System.Windows.Forms.DockStyle.Fill;
this.errors.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.errors.ForeColor = System.Drawing.Color.DarkRed;
this.errors.Location = new System.Drawing.Point(3, 146);
this.errors.Name = "errors";
this.errors.Size = new System.Drawing.Size(637, 46);
this.errors.TabIndex = 3;
//
// apply
//
this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.apply.Location = new System.Drawing.Point(572, 394);
this.apply.Margin = new System.Windows.Forms.Padding(8);
this.apply.Name = "apply";
this.apply.Size = new System.Drawing.Size(63, 23);
this.apply.TabIndex = 1;
this.apply.Text = "Apply";
this.apply.UseVisualStyleBackColor = true;
this.apply.Click += new System.EventHandler(this.apply_Click);
//
// hideHelp
//
this.hideHelp.Location = new System.Drawing.Point(565, 3);
this.hideHelp.Name = "hideHelp";
this.hideHelp.Size = new System.Drawing.Size(75, 23);
this.hideHelp.TabIndex = 4;
this.hideHelp.Text = "Hide Help";
this.hideHelp.UseVisualStyleBackColor = true;
this.hideHelp.Click += new System.EventHandler(this.hideHelp_Click);
//
// BufferFormatSpecifier
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.tableLayoutPanel1);
this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Name = "BufferFormatSpecifier";
this.Size = new System.Drawing.Size(643, 425);
groupBox1.ResumeLayout(false);
groupBox1.PerformLayout();
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.ResumeLayout(false);
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BufferFormatSpecifier));
this.formatGroupBox = new System.Windows.Forms.GroupBox();
this.formatText = new System.Windows.Forms.TextBox();
this.helpText = new System.Windows.Forms.Label();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.errors = new System.Windows.Forms.Label();
this.apply = new System.Windows.Forms.Button();
this.toggleHelp = new System.Windows.Forms.Button();
this.formatGroupBox.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
// formatGroupBox
//
this.formatGroupBox.Controls.Add(this.formatText);
this.formatGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.formatGroupBox.Location = new System.Drawing.Point(3, 175);
this.formatGroupBox.Name = "formatGroupBox";
this.formatGroupBox.Size = new System.Drawing.Size(448, 257);
this.formatGroupBox.TabIndex = 0;
this.formatGroupBox.TabStop = false;
this.formatGroupBox.Text = "Format";
//
// formatText
//
this.formatText.Dock = System.Windows.Forms.DockStyle.Fill;
this.formatText.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.formatText.Location = new System.Drawing.Point(3, 16);
this.formatText.Multiline = true;
this.formatText.Name = "formatText";
this.formatText.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.formatText.Size = new System.Drawing.Size(442, 238);
this.formatText.TabIndex = 0;
this.formatText.Text = "float4 asd; // blah blah\r\nfloat3 bar;";
this.formatText.KeyDown += new System.Windows.Forms.KeyEventHandler(this.formatText_KeyDown);
//
// helpText
//
this.helpText.AutoSize = true;
this.helpText.Location = new System.Drawing.Point(8, 8);
this.helpText.Margin = new System.Windows.Forms.Padding(8);
this.helpText.Name = "helpText";
this.helpText.Size = new System.Drawing.Size(428, 156);
this.helpText.TabIndex = 1;
this.helpText.Text = resources.GetString("helpText.Text");
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 2;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.Controls.Add(this.formatGroupBox, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.helpText, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.errors, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.apply, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.toggleHelp, 1, 0);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 3;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel1.Size = new System.Drawing.Size(535, 481);
this.tableLayoutPanel1.TabIndex = 0;
//
// errors
//
this.tableLayoutPanel1.SetColumnSpan(this.errors, 2);
this.errors.Dock = System.Windows.Forms.DockStyle.Fill;
this.errors.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.errors.ForeColor = System.Drawing.Color.DarkRed;
this.errors.Location = new System.Drawing.Point(3, 435);
this.errors.Name = "errors";
this.errors.Size = new System.Drawing.Size(529, 46);
this.errors.TabIndex = 3;
//
// apply
//
this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.apply.Location = new System.Drawing.Point(464, 404);
this.apply.Margin = new System.Windows.Forms.Padding(8);
this.apply.Name = "apply";
this.apply.Size = new System.Drawing.Size(63, 23);
this.apply.TabIndex = 1;
this.apply.Text = "Apply";
this.apply.UseVisualStyleBackColor = true;
this.apply.Click += new System.EventHandler(this.apply_Click);
//
// toggleHelp
//
this.toggleHelp.Location = new System.Drawing.Point(457, 3);
this.toggleHelp.Name = "toggleHelp";
this.toggleHelp.Size = new System.Drawing.Size(75, 23);
this.toggleHelp.TabIndex = 4;
this.toggleHelp.Text = "Toggle Help";
this.toggleHelp.UseVisualStyleBackColor = true;
this.toggleHelp.Click += new System.EventHandler(this.toggleHelp_Click);
//
// BufferFormatSpecifier
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.tableLayoutPanel1);
this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Name = "BufferFormatSpecifier";
this.Size = new System.Drawing.Size(535, 481);
this.formatGroupBox.ResumeLayout(false);
this.formatGroupBox.PerformLayout();
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.ResumeLayout(false);
}
@@ -150,7 +149,8 @@
private System.Windows.Forms.TextBox formatText;
private System.Windows.Forms.Button apply;
private System.Windows.Forms.Label errors;
private System.Windows.Forms.Button hideHelp;
private System.Windows.Forms.Button toggleHelp;
private System.Windows.Forms.Label helpText;
private System.Windows.Forms.GroupBox formatGroupBox;
}
}
+22 -4
View File
@@ -76,10 +76,28 @@ namespace renderdocui.Windows.Dialogs
}
}
private void hideHelp_Click(object sender, EventArgs e)
{
helpText.Visible = !helpText.Visible;
}
private void toggleHelp_Click(object sender, EventArgs e)
{
helpText.Visible = !helpText.Visible;
tableLayoutPanel1.SuspendLayout();
if (helpText.Visible)
{
tableLayoutPanel1.Controls.Remove(formatGroupBox);
tableLayoutPanel1.Controls.Add(formatGroupBox, 0, 1);
tableLayoutPanel1.SetRowSpan(formatGroupBox, 1);
}
else
{
tableLayoutPanel1.Controls.Remove(formatGroupBox);
tableLayoutPanel1.Controls.Add(formatGroupBox, 0, 0);
tableLayoutPanel1.SetRowSpan(formatGroupBox, 2);
}
tableLayoutPanel1.ResumeLayout(false);
tableLayoutPanel1.PerformLayout();
}
}
public interface IBufferFormatProcessor
@@ -117,9 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="groupBox1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<data name="helpText.Text" xml:space="preserve">
<value>Type in a buffer format declaration. Comments and {} braces are skipped, : semantics are ignored.
Declare each element as an hlsl variable, e.g: "float4 first; float2 second; uint2 third;"