ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Toolbox - some more intelligent code

This commit is contained in:
adelikat 2013-12-22 03:41:10 +00:00
parent 7a61b53fa1
commit 0e4c507d08
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs generated
View File

@ -29,7 +29,6 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ToolBox)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ToolBox));
this.CloseBtn = new System.Windows.Forms.Button();
this.ToolBoxStrip = new ToolStripEx(); this.ToolBoxStrip = new ToolStripEx();
this.CheatsToolBarItem = new System.Windows.Forms.ToolStripButton(); this.CheatsToolBarItem = new System.Windows.Forms.ToolStripButton();
this.RamWatchToolbarItem = new System.Windows.Forms.ToolStripButton(); this.RamWatchToolbarItem = new System.Windows.Forms.ToolStripButton();
@ -52,19 +51,6 @@
this.ToolBoxStrip.SuspendLayout(); this.ToolBoxStrip.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// CloseBtn
//
this.CloseBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.CloseBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.CloseBtn.Location = new System.Drawing.Point(152, 110);
this.CloseBtn.Name = "CloseBtn";
this.CloseBtn.Size = new System.Drawing.Size(0, 23);
this.CloseBtn.TabIndex = 1;
this.CloseBtn.TabStop = false;
this.CloseBtn.UseVisualStyleBackColor = true;
this.CloseBtn.Click += new System.EventHandler(this.CloseBtn_Click);
this.CloseBtn.Enter += new System.EventHandler(this.CloseBtn_Enter);
//
// ToolBoxStrip // ToolBoxStrip
// //
this.ToolBoxStrip.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.ToolBoxStrip.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@ -279,9 +265,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.CloseBtn;
this.ClientSize = new System.Drawing.Size(140, 145); this.ClientSize = new System.Drawing.Size(140, 145);
this.Controls.Add(this.CloseBtn);
this.Controls.Add(this.ToolBoxStrip); this.Controls.Add(this.ToolBoxStrip);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximumSize = new System.Drawing.Size(270, 600); this.MaximumSize = new System.Drawing.Size(270, 600);
@ -314,7 +298,6 @@
private System.Windows.Forms.ToolStripButton TAStudioToolbarItem; private System.Windows.Forms.ToolStripButton TAStudioToolbarItem;
private System.Windows.Forms.ToolStripButton GGGameGenieToolbarItem; private System.Windows.Forms.ToolStripButton GGGameGenieToolbarItem;
private System.Windows.Forms.ToolStripButton PceBgViewerToolbarItem; private System.Windows.Forms.ToolStripButton PceBgViewerToolbarItem;
private System.Windows.Forms.Button CloseBtn;
private System.Windows.Forms.ToolStripButton GBGameGenieToolbarItem; private System.Windows.Forms.ToolStripButton GBGameGenieToolbarItem;
private System.Windows.Forms.ToolStripButton GbGpuViewerToolBarItem; private System.Windows.Forms.ToolStripButton GbGpuViewerToolBarItem;

17
BizHawk.Client.EmuHawk/tools/ToolBox.cs
View File

@ -92,14 +92,17 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private void CloseBtn_Click(object sender, EventArgs e) protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
{ {
Close(); if (keyData == Keys.Escape)
} {
Close();
private void CloseBtn_Enter(object sender, EventArgs e) return true;
{ }
//ToolBoxStrip.Focus(); else
{
return base.ProcessCmdKey(ref msg, keyData);
}
} }
#region Icon Clicks #region Icon Clicks