Switching Buttons another time

Source/DisplayClusterInput/Private/DisplayClusterInputDevice.cpp

@@ -19,13 +19,14 @@ FDisplayClusterInputDevice::FDisplayClusterInputDevice(
 		&FDisplayClusterKeys::Axis0,
 		&FDisplayClusterKeys::Axis1
 	};
+	//Reordered to match the 4.22 behavior
 	ButtonIndices = TArray<const FKey*>
 	{
 		&FDisplayClusterKeys::Button0,
-		&FDisplayClusterKeys::Button1,
-		&FDisplayClusterKeys::Button2,
-		&FDisplayClusterKeys::Button3,
 		&FDisplayClusterKeys::Button4,
+		&FDisplayClusterKeys::Button3,
+		&FDisplayClusterKeys::Button2,
+		&FDisplayClusterKeys::Button1,
 		&FDisplayClusterKeys::Button5,
 		&FDisplayClusterKeys::Button6,
 		&FDisplayClusterKeys::Button7,
@@ -45,16 +46,13 @@ void FDisplayClusterInputDevice::PreInit()
 
 	EKeys::AddKey(FKeyDetails(FDisplayClusterKeys::Button0, LOCTEXT("nDisplayButton0", "nDisplay Button 0"),
 	                          FKeyDetails::GamepadKey, "DisplayCluster"));
-
-	// Buttons are turned around here for convenience to be mapped 1-4 from left to right on the flystick
-	
-	EKeys::AddKey(FKeyDetails(FDisplayClusterKeys::Button4, LOCTEXT("nDisplayButton1", "nDisplay Button 1"),
+	EKeys::AddKey(FKeyDetails(FDisplayClusterKeys::Button1, LOCTEXT("nDisplayButton1", "nDisplay Button 1"),
 	                          FKeyDetails::GamepadKey, "DisplayCluster"));
-	EKeys::AddKey(FKeyDetails(FDisplayClusterKeys::Button3, LOCTEXT("nDisplayButton2", "nDisplay Button 2"),
+	EKeys::AddKey(FKeyDetails(FDisplayClusterKeys::Button2, LOCTEXT("nDisplayButton2", "nDisplay Button 2"),
 	                          FKeyDetails::GamepadKey, "DisplayCluster"));
-	EKeys::AddKey(FKeyDetails(FDisplayClusterKeys::Button2, LOCTEXT("nDisplayButton3", "nDisplay Button 3"),
+	EKeys::AddKey(FKeyDetails(FDisplayClusterKeys::Button3, LOCTEXT("nDisplayButton3", "nDisplay Button 3"),
 	                          FKeyDetails::GamepadKey, "DisplayCluster"));
-	EKeys::AddKey(FKeyDetails(FDisplayClusterKeys::Button1, LOCTEXT("nDisplayButton4", "nDisplay Button 4"),
+	EKeys::AddKey(FKeyDetails(FDisplayClusterKeys::Button4, LOCTEXT("nDisplayButton4", "nDisplay Button 4"),
 	                          FKeyDetails::GamepadKey, "DisplayCluster"));
 	EKeys::AddKey(FKeyDetails(FDisplayClusterKeys::Button5, LOCTEXT("nDisplayButton5", "nDisplay Button 5"),
 	                          FKeyDetails::GamepadKey, "DisplayCluster"));