From 2401de6ba24f9de35b17dace5038ac48320462c9 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 19 Oct 2014 00:24:33 +0000 Subject: [PATCH] Tastudio - don't open the context menu when user right-clicks a column header --- BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs | 10 ++++++++++ .../tools/TAStudio/TAStudio.ListView.cs | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs index 2e927c3234..dd265de621 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs @@ -335,6 +335,16 @@ namespace BizHawk.Client.EmuHawk } } + [Browsable(false)] + [DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)] + public bool IsPointingAtColumnHeader + { + get + { + return IsHoveringOnColumnCell; + } + } + [Browsable(false)] [DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)] public int? FirstSelectedIndex diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index e4a34efe6b..67b215abc6 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -260,7 +260,7 @@ namespace BizHawk.Client.EmuHawk private void TasView_MouseUp(object sender, MouseEventArgs e) { - if (e.Button == MouseButtons.Right && !_supressContextMenu) + if (e.Button == MouseButtons.Right && !TasView.IsPointingAtColumnHeader && !_supressContextMenu) { RightClickMenu.Show(TasView, e.X, e.Y); }