epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sound Fix for DropDownButton Widget

Browse Source
This commit is contained in:
steelphase
2014-09-28 19:00:35 -04:00
parent e9b76e516b
commit 65ded0ed90
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/Widgets/ButtonWidget.cs
View File

@@ -52,12 +52,12 @@ namespace OpenRA.Widgets
public Action OnDoubleClick = () => {};
public Action<KeyInput> OnKeyPress = _ => {};
readonly Ruleset modRules;
protected readonly Ruleset ModRules;
[ObjectCreator.UseCtor]
public ButtonWidget(Ruleset modRules)
{
this.modRules = modRules;
ModRules = modRules;
GetText = () => Text;
GetColor = () => TextColor;
@@ -74,7 +74,7 @@ namespace OpenRA.Widgets
protected ButtonWidget(ButtonWidget other)
: base(other)
{
this.modRules = other.modRules;
ModRules = other.ModRules;
Text = other.Text;
Font = other.Font;
@@ -119,10 +119,10 @@ namespace OpenRA.Widgets
if (!IsDisabled())
{
OnKeyPress(e);
Sound.PlayNotification(modRules, null, "Sounds", "ClickSound", null);
Sound.PlayNotification(ModRules, null, "Sounds", "ClickSound", null);
}
else
Sound.PlayNotification(modRules, null, "Sounds", "ClickDisabledSound", null);
Sound.PlayNotification(ModRules, null, "Sounds", "ClickDisabledSound", null);
return true;
}
@@ -159,12 +159,12 @@ namespace OpenRA.Widgets
{
OnMouseDown(mi);
Depressed = true;
Sound.PlayNotification(modRules, null, "Sounds", "ClickSound", null);
Sound.PlayNotification(ModRules, null, "Sounds", "ClickSound", null);
}
else
{
YieldMouseFocus(mi);
Sound.PlayNotification(modRules, null, "Sounds", "ClickDisabledSound", null);
Sound.PlayNotification(ModRules, null, "Sounds", "ClickDisabledSound", null);
}
}
else if (mi.Event == MouseInputEvent.Move && HasMouseFocus)

2
OpenRA.Game/Widgets/DropDownButtonWidget.cs
View File

@@ -76,7 +76,7 @@ namespace OpenRA.Widgets
// Mask to prevent any clicks from being sent to other widgets
fullscreenMask = new MaskWidget();
fullscreenMask.Bounds = new Rectangle(0, 0, Game.Renderer.Resolution.Width, Game.Renderer.Resolution.Height);
fullscreenMask.OnMouseDown += mi => RemovePanel();
fullscreenMask.OnMouseDown += mi => { Sound.PlayNotification(this.ModRules, null, "Sounds", "ClickSound", null); RemovePanel(); };
if (onCancel != null)
fullscreenMask.OnMouseDown += _ => onCancel();