From e5b5daeaa060dd979d0efe1225e97e2f3bc28e26 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 4 Jul 2014 15:40:21 +0000 Subject: [PATCH] VirtualPad Analog button - if not in sticky mode, update every frame with the current value, and a slight tweak to read-only view --- .../VirtualPads/controls/VirtualPadAnalogButton.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs index 6435eccb02..0c81da9ba6 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/controls/VirtualPadAnalogButton.cs @@ -64,6 +64,7 @@ namespace BizHawk.Client.EmuHawk if (_readonly != value) { AnalogTrackBar.Enabled = + DisplayNameLabel.Enabled = ValueLabel.Enabled = !value; @@ -166,5 +167,18 @@ namespace BizHawk.Client.EmuHawk Global.StickyXORAdapter.SetFloat(Name, AnalogTrackBar.Value); } } + + protected override void OnPaint(PaintEventArgs e) + { + if (!_isSet) + { + _programmaticallyChangingValue = true; + AnalogTrackBar.Value = (int)Global.StickyXORAdapter.GetFloat(Name); + ValueLabel.Text = AnalogTrackBar.Value.ToString(); + _programmaticallyChangingValue = false; + } + + base.OnPaint(e); + } } }