From 0e4967f5393d14346120def6778a1728d11f9135 Mon Sep 17 00:00:00 2001 From: goyuken Date: Sat, 8 Feb 2014 23:15:10 +0000 Subject: [PATCH] PCE tile viewer and SMS VDP viewer: implement CTRL+C clipboard copying --- .../tools/PCE/PCETileViewer.Designer.cs | 100 ++++++++++-------- .../tools/PCE/PCETileViewer.cs | 22 ++++ .../tools/SMS/VDPViewer.Designer.cs | 15 +++ BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs | 22 ++++ 4 files changed, 116 insertions(+), 43 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs index 545c1d42c1..be9f241cb9 100644 --- a/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs @@ -29,12 +29,13 @@ private void InitializeComponent() { this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.checkBoxVDC2 = new System.Windows.Forms.CheckBox(); - this.bmpViewSPPal = new BizHawk.Client.EmuHawk.BmpView(); - this.bmpViewSP = new BizHawk.Client.EmuHawk.BmpView(); this.bmpViewBGPal = new BizHawk.Client.EmuHawk.BmpView(); this.bmpViewBG = new BizHawk.Client.EmuHawk.BmpView(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.bmpViewSPPal = new BizHawk.Client.EmuHawk.BmpView(); + this.bmpViewSP = new BizHawk.Client.EmuHawk.BmpView(); + this.checkBoxVDC2 = new System.Windows.Forms.CheckBox(); + this.label1 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.SuspendLayout(); @@ -50,45 +51,6 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "Background"; // - // groupBox2 - // - this.groupBox2.Controls.Add(this.bmpViewSPPal); - this.groupBox2.Controls.Add(this.bmpViewSP); - this.groupBox2.Location = new System.Drawing.Point(12, 299); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(786, 281); - this.groupBox2.TabIndex = 5; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Sprite"; - // - // checkBoxVDC2 - // - this.checkBoxVDC2.AutoSize = true; - this.checkBoxVDC2.Location = new System.Drawing.Point(12, 586); - this.checkBoxVDC2.Name = "checkBoxVDC2"; - this.checkBoxVDC2.Size = new System.Drawing.Size(57, 17); - this.checkBoxVDC2.TabIndex = 6; - this.checkBoxVDC2.Text = "VDC 2"; - this.checkBoxVDC2.UseVisualStyleBackColor = true; - this.checkBoxVDC2.CheckedChanged += new System.EventHandler(this.checkBoxVDC2_CheckedChanged); - // - // bmpViewSPPal - // - this.bmpViewSPPal.Location = new System.Drawing.Point(524, 19); - this.bmpViewSPPal.Name = "bmpViewSPPal"; - this.bmpViewSPPal.Size = new System.Drawing.Size(256, 256); - this.bmpViewSPPal.TabIndex = 1; - this.bmpViewSPPal.Text = "bmpView4"; - this.bmpViewSPPal.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpViewSPPal_MouseClick); - // - // bmpViewSP - // - this.bmpViewSP.Location = new System.Drawing.Point(6, 19); - this.bmpViewSP.Name = "bmpViewSP"; - this.bmpViewSP.Size = new System.Drawing.Size(512, 256); - this.bmpViewSP.TabIndex = 0; - this.bmpViewSP.Text = "bmpView3"; - // // bmpViewBGPal // this.bmpViewBGPal.Location = new System.Drawing.Point(524, 19); @@ -106,16 +68,67 @@ this.bmpViewBG.TabIndex = 2; this.bmpViewBG.Text = "bmpView1"; // + // groupBox2 + // + this.groupBox2.Controls.Add(this.bmpViewSPPal); + this.groupBox2.Controls.Add(this.bmpViewSP); + this.groupBox2.Location = new System.Drawing.Point(12, 299); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(786, 281); + this.groupBox2.TabIndex = 5; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Sprite"; + // + // bmpViewSPPal + // + this.bmpViewSPPal.Location = new System.Drawing.Point(524, 19); + this.bmpViewSPPal.Name = "bmpViewSPPal"; + this.bmpViewSPPal.Size = new System.Drawing.Size(256, 256); + this.bmpViewSPPal.TabIndex = 1; + this.bmpViewSPPal.Text = "bmpView4"; + this.bmpViewSPPal.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bmpViewSPPal_MouseClick); + // + // bmpViewSP + // + this.bmpViewSP.Location = new System.Drawing.Point(6, 19); + this.bmpViewSP.Name = "bmpViewSP"; + this.bmpViewSP.Size = new System.Drawing.Size(512, 256); + this.bmpViewSP.TabIndex = 0; + this.bmpViewSP.Text = "bmpView3"; + // + // checkBoxVDC2 + // + this.checkBoxVDC2.AutoSize = true; + this.checkBoxVDC2.Location = new System.Drawing.Point(12, 586); + this.checkBoxVDC2.Name = "checkBoxVDC2"; + this.checkBoxVDC2.Size = new System.Drawing.Size(57, 17); + this.checkBoxVDC2.TabIndex = 6; + this.checkBoxVDC2.Text = "VDC 2"; + this.checkBoxVDC2.UseVisualStyleBackColor = true; + this.checkBoxVDC2.CheckedChanged += new System.EventHandler(this.checkBoxVDC2_CheckedChanged); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(504, 593); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(294, 13); + this.label1.TabIndex = 7; + this.label1.Text = "CTRL + C copies the pane under the mouse to the clipboard."; + // // PCETileViewer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(810, 615); + this.Controls.Add(this.label1); this.Controls.Add(this.checkBoxVDC2); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); + this.KeyPreview = true; this.Name = "PCETileViewer"; this.Text = "Tile Viewer"; + this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.PCETileViewer_KeyDown); this.groupBox1.ResumeLayout(false); this.groupBox2.ResumeLayout(false); this.ResumeLayout(false); @@ -132,5 +145,6 @@ private BmpView bmpViewBG; private BmpView bmpViewSPPal; private BmpView bmpViewSP; + private System.Windows.Forms.Label label1; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs index f85a88c2ca..1e4b7e6edf 100644 --- a/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs +++ b/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs @@ -201,5 +201,27 @@ namespace BizHawk.Client.EmuHawk DrawSprites(); bmpViewSP.Refresh(); } + + private void PCETileViewer_KeyDown(object sender, KeyEventArgs e) + { + if (ModifierKeys.HasFlag(Keys.Control) && e.KeyCode == Keys.C) + { + // find the control under the mouse + Point m = Cursor.Position; + Control top = this; + Control found; + do + { + found = top.GetChildAtPoint(top.PointToClient(m)); + top = found; + } while (found != null && found.HasChildren); + + if (found is BmpView) + { + var bv = found as BmpView; + Clipboard.SetImage(bv.bmp); + } + } + } } } diff --git a/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs b/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs index 0817d07366..e300cc8aa4 100644 --- a/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs @@ -34,6 +34,7 @@ this.bmpViewBG = new BizHawk.Client.EmuHawk.BmpView(); this.bmpViewPalette = new BizHawk.Client.EmuHawk.BmpView(); this.bmpViewTiles = new BizHawk.Client.EmuHawk.BmpView(); + this.label1 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -94,20 +95,33 @@ this.bmpViewTiles.TabIndex = 0; this.bmpViewTiles.Text = "bmpViewTiles"; // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 304); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(294, 13); + this.label1.TabIndex = 4; + this.label1.Text = "CTRL + C copies the pane under the mouse to the clipboard."; + // // VDPViewer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(572, 326); + this.Controls.Add(this.label1); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); + this.KeyPreview = true; this.Name = "VDPViewer"; this.Text = "VDP Viewer"; + this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.VDPViewer_KeyDown); this.groupBox1.ResumeLayout(false); this.groupBox2.ResumeLayout(false); this.groupBox3.ResumeLayout(false); this.ResumeLayout(false); + this.PerformLayout(); } @@ -119,5 +133,6 @@ private BmpView bmpViewPalette; private System.Windows.Forms.GroupBox groupBox3; private BmpView bmpViewBG; + private System.Windows.Forms.Label label1; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs b/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs index f65a9c7516..bfc83c5248 100644 --- a/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs +++ b/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs @@ -178,5 +178,27 @@ namespace BizHawk.Client.EmuHawk } } } + + private void VDPViewer_KeyDown(object sender, KeyEventArgs e) + { + if (ModifierKeys.HasFlag(Keys.Control) && e.KeyCode == Keys.C) + { + // find the control under the mouse + Point m = Cursor.Position; + Control top = this; + Control found; + do + { + found = top.GetChildAtPoint(top.PointToClient(m)); + top = found; + } while (found != null && found.HasChildren); + + if (found is BmpView) + { + var bv = found as BmpView; + Clipboard.SetImage(bv.bmp); + } + } + } } }