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

Move ToolStripEx to WinForms.Controls, break into separate files, add namespaces, make ClickThrough built in instead of an option (if the functionality isn't desired just use the original class)

This commit is contained in:
adelikat 2020-07-01 12:55:21 -05:00
parent 07c6063da1
commit 52f2596492
30 changed files with 149 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -380,7 +380,6 @@
<Compile Update="CustomControls/MsgBox.designer.cs" DependentUpon="MsgBox.cs" />
<EmbeddedResource Update="CustomControls/MsgBox.resx" DependentUpon="MsgBox.cs" />
<Compile Update="CustomControls/RepeatButton.cs" SubType="Component" />
<Compile Update="CustomControls/ToolStripEx.cs" SubType="Component" />
<Compile Update="CustomControls/TransparentTrackbar.cs" SubType="Component" />
<Compile Update="CustomControls/ViewportPanel.cs" SubType="Component" />
<Compile Update="GraphicsImplementations/GLControlWrapper_GdiPlus.cs" SubType="Component" />

83
src/BizHawk.Client.EmuHawk/CustomControls/ToolStripEx.cs
View File

@ -1,83 +0,0 @@
//credit: http://blogs.msdn.com/b/rickbrew/archive/2006/01/09/511003.aspx
using System;
using System.Windows.Forms;
/// <summary>
/// This class adds on to the functionality provided in System.Windows.Forms.ToolStrip.
/// </summary>
public class ToolStripEx : ToolStrip
{
/// <summary>
/// Gets or sets whether the ToolStripEx honors item clicks when its containing form does
/// not have input focus.
/// </summary>
public bool ClickThrough { get; set; } = true;
protected override void WndProc(ref Message m)
{
base.WndProc(ref m);
if (ClickThrough
&& m.Msg == NativeConstants.WM_MOUSEACTIVATE
&& m.Result == (IntPtr)NativeConstants.MA_ACTIVATEANDEAT)
{
m.Result = (IntPtr)NativeConstants.MA_ACTIVATE;
}
}
}
/// <summary>
/// This class adds on to the functionality provided in System.Windows.Forms.MenuStrip.
/// </summary>
public class MenuStripEx : MenuStrip
{
/// <summary>
/// Gets or sets whether the ToolStripEx honors item clicks when its containing form does
/// not have input focus.
/// </summary>
public bool ClickThrough { get; set; } = true;
protected override void WndProc(ref Message m)
{
base.WndProc(ref m);
if (ClickThrough
&& m.Msg == NativeConstants.WM_MOUSEACTIVATE
&& m.Result == (IntPtr)NativeConstants.MA_ACTIVATEANDEAT)
{
m.Result = (IntPtr)NativeConstants.MA_ACTIVATE;
}
}
}
/// <summary>
/// This class adds on to the functionality provided in System.Windows.Forms.MenuStrip.
/// </summary>
public class StatusStripEx : StatusStrip
{
/// <summary>
/// Gets or sets whether the ToolStripEx honors item clicks when its containing form does
/// not have input focus.
/// </summary>
public bool ClickThrough { get; set; } = true;
protected override void WndProc(ref Message m)
{
base.WndProc(ref m);
if (ClickThrough
&& m.Msg == NativeConstants.WM_MOUSEACTIVATE
&& m.Result == (IntPtr)NativeConstants.MA_ACTIVATEANDEAT)
{
m.Result = (IntPtr)NativeConstants.MA_ACTIVATE;
}
}
}
internal sealed class NativeConstants
{
private NativeConstants(){}
internal const uint WM_MOUSEACTIVATE = 0x21;
internal const uint MA_ACTIVATE = 1;
internal const uint MA_ACTIVATEANDEAT = 2;
internal const uint MA_NOACTIVATE = 3;
internal const uint MA_NOACTIVATEANDEAT = 4;
}

4
src/BizHawk.Client.EmuHawk/LogWindow.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class LogWindow
{

6
src/BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class MainForm
{
@ -380,7 +382,6 @@
//
// MainformMenu
//
this.MainformMenu.ClickThrough = true;
this.MainformMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu,
this.EmulationSubMenu,
@ -2642,7 +2643,6 @@
//
// MainStatusBar
//
this.MainStatusBar.ClickThrough = true;
this.MainStatusBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.DumpStatusButton,
this.EmuStatus,

5
src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class FirmwaresConfig
{
@ -192,7 +194,6 @@
//
// toolStrip1
//
this.toolStrip1.ClickThrough = true;
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tbbGroup,
this.toolStripSeparator2,

5
src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class BasicBot
{
@ -143,7 +145,6 @@
//
// BotMenu
//
this.BotMenu.ClickThrough = true;
this.BotMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu,
this.OptionsSubMenu,

6
src/BizHawk.Client.EmuHawk/tools/CDL.designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class CDL
{
@ -59,7 +61,6 @@
//
// menuStrip1
//
this.menuStrip1.ClickThrough = true;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
@ -193,7 +194,6 @@
//
// toolStrip1
//
this.toolStrip1.ClickThrough = true;
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsbLoggingActive,
this.toolStripSeparator3,

6
src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class Cheats
{
@ -159,7 +161,6 @@
//
// CheatsMenu
//
this.CheatsMenu.ClickThrough = true;
this.CheatsMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu,
this.CheatsSubMenu,
@ -437,7 +438,6 @@
//
// toolStrip1
//
this.toolStrip1.ClickThrough = true;
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.NewToolBarItem,
this.OpenToolBarItem,

5
src/BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class GenericDebugger
{
@ -65,7 +67,6 @@
//
// menuStrip1
//
this.menuStrip1.ClickThrough = true;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem,
this.DebugSubMenu});

5
src/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class GenVdpViewer
{
@ -155,7 +157,6 @@
//
// menuStrip1
//
this.menuStrip1.ClickThrough = true;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);

5
src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class HexEditor
{
@ -98,7 +100,6 @@
//
// HexMenuStrip
//
this.HexMenuStrip.ClickThrough = true;
this.HexMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu,
this.EditMenuItem,

6
src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class LuaConsole
{
@ -190,7 +192,6 @@
//
// menuStrip1
//
this.menuStrip1.ClickThrough = true;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu,
this.ScriptSubMenu,
@ -639,7 +640,6 @@
//
// toolStrip1
//
this.toolStrip1.ClickThrough = true;
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.NewScriptToolbarItem,
this.OpenScriptToolbarItem,

5
src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class NESMusicRipper
{
@ -140,7 +142,6 @@
//
// menuStrip1
//
this.menuStrip1.ClickThrough = true;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);

5
src/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class NESNameTableViewer
{
@ -129,7 +131,6 @@
//
// menuStrip1
//
this.menuStrip1.ClickThrough = true;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);

6
src/BizHawk.Client.EmuHawk/tools/NES/NESPPU.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class NesPPU
{
@ -463,7 +465,6 @@
//
// NesPPUMenu
//
this.NesPPUMenu.ClickThrough = true;
this.NesPPUMenu.ImageScalingSize = new System.Drawing.Size(20, 20);
this.NesPPUMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu,
@ -722,7 +723,6 @@
//
// NesPPUStatusBar
//
this.NesPPUStatusBar.ClickThrough = true;
this.NesPPUStatusBar.ImageScalingSize = new System.Drawing.Size(20, 20);
this.NesPPUStatusBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripStatusLabel1});

5
src/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class PceBgViewer
{
@ -57,7 +59,6 @@
//
// PceBgViewerMenu
//
this.PceBgViewerMenu.ClickThrough = true;
this.PceBgViewerMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ViewerSubMenu});
this.PceBgViewerMenu.Location = new System.Drawing.Point(0, 0);

5
src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class PCESoundDebugger
{
@ -245,7 +247,6 @@
//
// SoundMenuStrip
//
this.SoundMenuStrip.ClickThrough = true;
this.SoundMenuStrip.Location = new System.Drawing.Point(0, 0);
this.SoundMenuStrip.Name = "SoundMenuStrip";
this.SoundMenuStrip.Size = new System.Drawing.Size(787, 24);

5
src/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class PceTileViewer
{
@ -122,7 +124,6 @@
//
// menuStrip1
//
this.menuStrip1.ClickThrough = true;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);

5
src/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class SmsVdpViewer
{
@ -111,7 +113,6 @@
//
// menuStrip1
//
this.menuStrip1.ClickThrough = true;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);

5
src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class SNESGraphicsDebugger
{
@ -271,7 +273,6 @@
//
// menuStrip1
//
this.menuStrip1.ClickThrough = true;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);

6
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class TAStudio
{
@ -204,7 +206,6 @@
//
// TASMenu
//
this.TASMenu.ClickThrough = true;
this.TASMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu,
this.EditSubMenu,
@ -1237,7 +1238,6 @@
//
// TasStatusStrip
//
this.TasStatusStrip.ClickThrough = true;
this.TasStatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.MessageStatusLabel,
this.SavingProgressBar,

5
src/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class TI83KeyPad
{
@ -172,7 +174,6 @@
//
// menuStrip1
//
this.menuStrip1.ClickThrough = true;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripMenuItem1,
this.KeyPadSubMenu,

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

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class ToolBox
{
@ -38,7 +40,6 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.ToolBoxStrip.AutoSize = false;
this.ToolBoxStrip.BackColor = System.Drawing.SystemColors.Control;
this.ToolBoxStrip.ClickThrough = true;
this.ToolBoxStrip.Dock = System.Windows.Forms.DockStyle.None;
this.ToolBoxStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
this.ToolBoxStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;

5
src/BizHawk.Client.EmuHawk/tools/TraceLogger.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class TraceLogger
{
@ -125,7 +127,6 @@
//
// menuStrip1
//
this.menuStrip1.ClickThrough = true;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu,
this.EditSubMenu,

5
src/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class VirtualpadTool
{
@ -96,7 +98,6 @@
//
// PadMenu
//
this.PadMenu.ClickThrough = true;
this.PadMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.PadsSubMenu,
this.SettingsSubMenu});

6
src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class RamSearch
{
@ -300,7 +302,6 @@
//
// RamSearchMenu
//
this.RamSearchMenu.ClickThrough = true;
this.RamSearchMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem,
this.settingsToolStripMenuItem,
@ -948,7 +949,6 @@
//
// toolStrip1
//
this.toolStrip1.ClickThrough = true;
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.DoSearchToolButton,
this.toolStripSeparator10,

7
src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs generated
View File

@ -1,4 +1,6 @@
namespace BizHawk.Client.EmuHawk
using BizHawk.WinForms.Controls;
namespace BizHawk.Client.EmuHawk
{
partial class RamWatch
{
@ -274,7 +276,6 @@
//
// statusStrip1
//
this.statusStrip1.ClickThrough = true;
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ErrorIconButton,
this.MessageLabel});
@ -302,7 +303,6 @@
//
// toolStrip1
//
this.toolStrip1.ClickThrough = true;
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.newToolStripButton,
this.openToolStripButton,
@ -466,7 +466,6 @@
//
// RamWatchMenu
//
this.RamWatchMenu.ClickThrough = true;
this.RamWatchMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu,
this.WatchesSubMenu,

21
src/BizHawk.WinForms.Controls/MenuEx/MenuStripEx.cs Normal file
View File

@ -0,0 +1,21 @@
using System;
using System.Windows.Forms;
namespace BizHawk.WinForms.Controls
{
/// <summary>
/// This class adds on to the functionality provided in <see cref="MenuStrip"/>.
/// </summary>
public class MenuStripEx : MenuStrip
{
protected override void WndProc(ref Message m)
{
base.WndProc(ref m);
if (m.Msg == NativeConstants.WM_MOUSEACTIVATE
&& m.Result == (IntPtr)NativeConstants.MA_ACTIVATEANDEAT)
{
m.Result = (IntPtr)NativeConstants.MA_ACTIVATE;
}
}
}
}

21
src/BizHawk.WinForms.Controls/MenuEx/StatusStripEx.cs Normal file
View File

@ -0,0 +1,21 @@
using System;
using System.Windows.Forms;
namespace BizHawk.WinForms.Controls
{
/// <summary>
/// This class adds on to the functionality provided in <see cref="StatusStrip"/>.
/// </summary>
public class StatusStripEx : StatusStrip
{
protected override void WndProc(ref Message m)
{
base.WndProc(ref m);
if (m.Msg == NativeConstants.WM_MOUSEACTIVATE
&& m.Result == (IntPtr)NativeConstants.MA_ACTIVATEANDEAT)
{
m.Result = (IntPtr)NativeConstants.MA_ACTIVATE;
}
}
}
}

32
src/BizHawk.WinForms.Controls/MenuEx/ToolStripEx.cs Normal file
View File

@ -0,0 +1,32 @@
using System;
using System.Windows.Forms;
//credit: http://blogs.msdn.com/b/rickbrew/archive/2006/01/09/511003.aspx
namespace BizHawk.WinForms.Controls
{
/// <summary>
/// This class adds on to the functionality provided in <see cref="ToolStrip"/>.
/// </summary>
public class ToolStripEx : ToolStrip
{
protected override void WndProc(ref Message m)
{
base.WndProc(ref m);
if (m.Msg == NativeConstants.WM_MOUSEACTIVATE
&& m.Result == (IntPtr)NativeConstants.MA_ACTIVATEANDEAT)
{
m.Result = (IntPtr)NativeConstants.MA_ACTIVATE;
}
}
}
internal sealed class NativeConstants
{
private NativeConstants() { }
internal const uint WM_MOUSEACTIVATE = 0x21;
internal const uint MA_ACTIVATE = 1;
internal const uint MA_ACTIVATEANDEAT = 2;
internal const uint MA_NOACTIVATE = 3;
internal const uint MA_NOACTIVATEANDEAT = 4;
}
}