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

Virtualpads - target screen and analog button - make clear unsticky the float values, also fix sticky context menu item check

This commit is contained in:
adelikat 2014-06-29 21:16:33 +00:00
parent 0d581613e2
commit 9e554b7aa9
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.Common/inputAdapters/InputAdapters.cs
View File

@ -308,6 +308,7 @@ namespace BizHawk.Client.Common
public void Unset(string button) public void Unset(string button)
{ {
stickySet.Remove(button); stickySet.Remove(button);
_floatSet.Remove(button);
} }
public bool IsSticky(string button) public bool IsSticky(string button)

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

@ -33,7 +33,7 @@
this.ControllerBox = new System.Windows.Forms.GroupBox(); this.ControllerBox = new System.Windows.Forms.GroupBox();
this.PadBoxContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.PadBoxContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.clearAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.clearAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.stickyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.StickyContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PadMenu = new MenuStripEx(); this.PadMenu = new MenuStripEx();
this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.AutoloadMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AutoloadMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -68,9 +68,10 @@
// //
this.PadBoxContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.PadBoxContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.clearAllToolStripMenuItem, this.clearAllToolStripMenuItem,
this.stickyToolStripMenuItem}); this.StickyContextMenuItem});
this.PadBoxContextMenu.Name = "PadBoxContextMenu"; this.PadBoxContextMenu.Name = "PadBoxContextMenu";
this.PadBoxContextMenu.Size = new System.Drawing.Size(175, 48); this.PadBoxContextMenu.Size = new System.Drawing.Size(175, 70);
this.PadBoxContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.PadBoxContextMenu_Opening);
// //
// clearAllToolStripMenuItem // clearAllToolStripMenuItem
// //
@ -80,12 +81,12 @@
this.clearAllToolStripMenuItem.Text = "Clear All"; this.clearAllToolStripMenuItem.Text = "Clear All";
this.clearAllToolStripMenuItem.Click += new System.EventHandler(this.ClearAllMenuItem_Click); this.clearAllToolStripMenuItem.Click += new System.EventHandler(this.ClearAllMenuItem_Click);
// //
// stickyToolStripMenuItem // StickyContextMenuItem
// //
this.stickyToolStripMenuItem.Name = "stickyToolStripMenuItem"; this.StickyContextMenuItem.Name = "StickyContextMenuItem";
this.stickyToolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.StickyContextMenuItem.Size = new System.Drawing.Size(174, 22);
this.stickyToolStripMenuItem.Text = "Sticky"; this.StickyContextMenuItem.Text = "Sticky";
this.stickyToolStripMenuItem.Click += new System.EventHandler(this.StickyMenuItem_Click); this.StickyContextMenuItem.Click += new System.EventHandler(this.StickyMenuItem_Click);
// //
// PadMenu // PadMenu
// //
@ -230,6 +231,6 @@
private System.Windows.Forms.ToolStripMenuItem StickyMenuItem; private System.Windows.Forms.ToolStripMenuItem StickyMenuItem;
private System.Windows.Forms.ContextMenuStrip PadBoxContextMenu; private System.Windows.Forms.ContextMenuStrip PadBoxContextMenu;
private System.Windows.Forms.ToolStripMenuItem clearAllToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem clearAllToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem stickyToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem StickyContextMenuItem;
} }
} }

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

@ -227,6 +227,11 @@ namespace BizHawk.Client.EmuHawk
Global.Config.VirtualPadSticky ^= true; Global.Config.VirtualPadSticky ^= true;
} }
private void PadBoxContextMenu_Opening(object sender, System.ComponentModel.CancelEventArgs e)
{
StickyContextMenuItem.Checked = Global.Config.VirtualPadSticky;
}
#endregion #endregion
#endregion #endregion

2
BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs
View File

@ -22,7 +22,7 @@ namespace BizHawk.Client.EmuHawk
public void Clear() public void Clear()
{ {
// Nothing to do Global.StickyXORAdapter.Unset(Name);
} }
public void Set(IController controller) public void Set(IController controller)

3
BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadTargetScreen.cs
View File

@ -32,7 +32,8 @@ namespace BizHawk.Client.EmuHawk
public void Clear() public void Clear()
{ {
// Nothing to do Global.StickyXORAdapter.Unset(XName);
Global.StickyXORAdapter.Unset(YName);
} }
public void Set(IController controller) public void Set(IController controller)