Issue X2CommunityCore#47 Make UIListItemString->UIButton keyboard / c…

…ontroller compatible with self contained callbacks
Musashi1584 · Nov 10, 2017 · 2d97a08 · 2d97a08
1 parent e8ccab7
commit 2d97a08
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/X2WOTCCommunityHighlander/Src/XComGame/Classes/UIButton.uc b/X2WOTCCommunityHighlander/Src/XComGame/Classes/UIButton.uc
@@ -399,6 +399,13 @@ simulated function bool OnUnrealCommand(int cmd, int arg)
 	case class'UIUtilities_Input'.const.FXS_KEY_ENTER:
 	case class'UIUtilities_Input'.const.FXS_KEY_SPACEBAR:
 		Click();
+		// Start Issue #47
+		// navigable button bg for UIListItemString
+		if (!Click())
+		{
+			bHandled = false;
+		}
+		// End Issure #47
 		break;
 	default:
 		bHandled = false;

diff --git a/X2WOTCCommunityHighlander/Src/XComGame/Classes/UIListItemString.uc b/X2WOTCCommunityHighlander/Src/XComGame/Classes/UIListItemString.uc
@@ -520,6 +520,13 @@ simulated function bool OnUnrealCommand(int cmd, int arg)
 	{
 		if( ConfirmButton != none ) 
 			return ConfirmButton.OnUnrealCommand(cmd, arg);
+
+		// Start Issue #47: navigable button bg for UIListItemString start
+		if (ButtonBG.OnUnrealCommand(cmd, arg))
+		{
+			return true;
+		}
+		// End Issue #47
 	}
 
 	return Navigator.OnUnrealCommand(cmd, arg);