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

Fix #864 - don't display the depressed state if the checkbox is disabled

Browse Source
This commit is contained in:
Paul Chote
2011-06-20 14:38:59 +12:00
parent d043f4807f
commit 63e77755b7
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Widgets/CheckboxWidget.cs
View File

@@ -33,10 +33,11 @@ namespace OpenRA.Widgets
public override void DrawInner()
{
var disabled = IsDisabled();
var font = Game.Renderer.Fonts[Font];
var rect = RenderBounds;
var check = new Rectangle(rect.Location, new Size(Bounds.Height, Bounds.Height));
var state = IsDisabled() ? "checkbox-disabled" :
var state = disabled ? "checkbox-disabled" :
Depressed && HasPressedState ? "checkbox-pressed" :
RenderBounds.Contains(Viewport.LastMousePos) ? "checkbox-hover" :
"checkbox";
@@ -47,9 +48,9 @@ namespace OpenRA.Widgets
font.DrawText(Text,
new float2(rect.Left + rect.Height * 1.5f, RenderOrigin.Y - BaseLine + (Bounds.Height - textSize.Y)/2), Color.White);
if (IsChecked() || Depressed)
if (IsChecked() || (Depressed && HasPressedState && !disabled))
WidgetUtils.DrawRGBA(
ChromeProvider.GetImage("checkbox-bits", Depressed && HasPressedState ? "pressed" : "checked"),
ChromeProvider.GetImage("checkbox-bits", HasPressedState && (Depressed || disabled) ? "pressed" : "checked"),
new float2(rect.Left + 2, rect.Top + 2));
}