mirror of
https://git.naxdy.org/Mirror/Ryujinx.git
synced 2025-01-10 12:49:13 +00:00
Fix stupid mistake
This commit is contained in:
parent
355ec4036f
commit
a553b090b6
4 changed files with 77 additions and 78 deletions
|
@ -63,13 +63,13 @@ namespace Ryujinx.Ava.UI.Models.Input
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private GamepadInputId _leftControllerStickButton;
|
private GamepadInputId _leftStickButton;
|
||||||
public GamepadInputId LeftControllerStickButton
|
public GamepadInputId LeftStickButton
|
||||||
{
|
{
|
||||||
get => _leftControllerStickButton;
|
get => _leftStickButton;
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
_leftControllerStickButton = value;
|
_leftStickButton = value;
|
||||||
OnPropertyChanged();
|
OnPropertyChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -118,13 +118,13 @@ namespace Ryujinx.Ava.UI.Models.Input
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private GamepadInputId _rightControllerStickButton;
|
private GamepadInputId _rightStickButton;
|
||||||
public GamepadInputId RightControllerStickButton
|
public GamepadInputId RightStickButton
|
||||||
{
|
{
|
||||||
get => _rightControllerStickButton;
|
get => _rightStickButton;
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
_rightControllerStickButton = value;
|
_rightStickButton = value;
|
||||||
OnPropertyChanged();
|
OnPropertyChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -483,13 +483,13 @@ namespace Ryujinx.Ava.UI.Models.Input
|
||||||
LeftInvertStickX = controllerInput.LeftJoyconStick.InvertStickX;
|
LeftInvertStickX = controllerInput.LeftJoyconStick.InvertStickX;
|
||||||
LeftInvertStickY = controllerInput.LeftJoyconStick.InvertStickY;
|
LeftInvertStickY = controllerInput.LeftJoyconStick.InvertStickY;
|
||||||
LeftRotate90 = controllerInput.LeftJoyconStick.Rotate90CW;
|
LeftRotate90 = controllerInput.LeftJoyconStick.Rotate90CW;
|
||||||
LeftControllerStickButton = controllerInput.LeftJoyconStick.StickButton;
|
LeftStickButton = controllerInput.LeftJoyconStick.StickButton;
|
||||||
|
|
||||||
RightJoystick = controllerInput.RightJoyconStick.Joystick;
|
RightJoystick = controllerInput.RightJoyconStick.Joystick;
|
||||||
RightInvertStickX = controllerInput.RightJoyconStick.InvertStickX;
|
RightInvertStickX = controllerInput.RightJoyconStick.InvertStickX;
|
||||||
RightInvertStickY = controllerInput.RightJoyconStick.InvertStickY;
|
RightInvertStickY = controllerInput.RightJoyconStick.InvertStickY;
|
||||||
RightRotate90 = controllerInput.RightJoyconStick.Rotate90CW;
|
RightRotate90 = controllerInput.RightJoyconStick.Rotate90CW;
|
||||||
RightControllerStickButton = controllerInput.RightJoyconStick.StickButton;
|
RightStickButton = controllerInput.RightJoyconStick.StickButton;
|
||||||
|
|
||||||
DpadUp = controllerInput.LeftJoycon.DpadUp;
|
DpadUp = controllerInput.LeftJoycon.DpadUp;
|
||||||
DpadDown = controllerInput.LeftJoycon.DpadDown;
|
DpadDown = controllerInput.LeftJoycon.DpadDown;
|
||||||
|
@ -582,7 +582,7 @@ namespace Ryujinx.Ava.UI.Models.Input
|
||||||
InvertStickX = LeftInvertStickX,
|
InvertStickX = LeftInvertStickX,
|
||||||
InvertStickY = LeftInvertStickY,
|
InvertStickY = LeftInvertStickY,
|
||||||
Rotate90CW = LeftRotate90,
|
Rotate90CW = LeftRotate90,
|
||||||
StickButton = LeftControllerStickButton,
|
StickButton = LeftStickButton,
|
||||||
},
|
},
|
||||||
RightJoyconStick = new JoyconConfigControllerStick<GamepadInputId, StickInputId>
|
RightJoyconStick = new JoyconConfigControllerStick<GamepadInputId, StickInputId>
|
||||||
{
|
{
|
||||||
|
@ -590,7 +590,7 @@ namespace Ryujinx.Ava.UI.Models.Input
|
||||||
InvertStickX = RightInvertStickX,
|
InvertStickX = RightInvertStickX,
|
||||||
InvertStickY = RightInvertStickY,
|
InvertStickY = RightInvertStickY,
|
||||||
Rotate90CW = RightRotate90,
|
Rotate90CW = RightRotate90,
|
||||||
StickButton = RightControllerStickButton,
|
StickButton = RightStickButton,
|
||||||
},
|
},
|
||||||
Rumble = new RumbleConfigController
|
Rumble = new RumbleConfigController
|
||||||
{
|
{
|
||||||
|
|
|
@ -54,13 +54,13 @@ namespace Ryujinx.Ava.UI.Models.Input
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private Key _leftKeyboardStickButton;
|
private Key _leftStickButton;
|
||||||
public Key LeftKeyboardStickButton
|
public Key LeftStickButton
|
||||||
{
|
{
|
||||||
get => _leftKeyboardStickButton;
|
get => _leftStickButton;
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
_leftKeyboardStickButton = value;
|
_leftStickButton = value;
|
||||||
OnPropertyChanged();
|
OnPropertyChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -109,13 +109,13 @@ namespace Ryujinx.Ava.UI.Models.Input
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private Key _rightKeyboardStickButton;
|
private Key _rightStickButton;
|
||||||
public Key RightKeyboardStickButton
|
public Key RightStickButton
|
||||||
{
|
{
|
||||||
get => _rightKeyboardStickButton;
|
get => _rightStickButton;
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
_rightKeyboardStickButton = value;
|
_rightStickButton = value;
|
||||||
OnPropertyChanged();
|
OnPropertyChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -335,11 +335,13 @@ namespace Ryujinx.Ava.UI.Models.Input
|
||||||
LeftStickDown = keyboardConfig.LeftJoyconStick.StickDown;
|
LeftStickDown = keyboardConfig.LeftJoyconStick.StickDown;
|
||||||
LeftStickLeft = keyboardConfig.LeftJoyconStick.StickLeft;
|
LeftStickLeft = keyboardConfig.LeftJoyconStick.StickLeft;
|
||||||
LeftStickRight = keyboardConfig.LeftJoyconStick.StickRight;
|
LeftStickRight = keyboardConfig.LeftJoyconStick.StickRight;
|
||||||
|
LeftStickButton = keyboardConfig.LeftJoyconStick.StickButton;
|
||||||
|
|
||||||
RightStickUp = keyboardConfig.RightJoyconStick.StickUp;
|
RightStickUp = keyboardConfig.RightJoyconStick.StickUp;
|
||||||
RightStickDown = keyboardConfig.RightJoyconStick.StickDown;
|
RightStickDown = keyboardConfig.RightJoyconStick.StickDown;
|
||||||
RightStickLeft = keyboardConfig.RightJoyconStick.StickLeft;
|
RightStickLeft = keyboardConfig.RightJoyconStick.StickLeft;
|
||||||
RightStickRight = keyboardConfig.RightJoyconStick.StickRight;
|
RightStickRight = keyboardConfig.RightJoyconStick.StickRight;
|
||||||
|
RightStickButton = keyboardConfig.RightJoyconStick.StickButton;
|
||||||
|
|
||||||
DpadUp = keyboardConfig.LeftJoycon.DpadUp;
|
DpadUp = keyboardConfig.LeftJoycon.DpadUp;
|
||||||
DpadDown = keyboardConfig.LeftJoycon.DpadDown;
|
DpadDown = keyboardConfig.LeftJoycon.DpadDown;
|
||||||
|
@ -371,8 +373,7 @@ namespace Ryujinx.Ava.UI.Models.Input
|
||||||
Backend = InputBackendType.WindowKeyboard,
|
Backend = InputBackendType.WindowKeyboard,
|
||||||
PlayerIndex = PlayerIndex,
|
PlayerIndex = PlayerIndex,
|
||||||
ControllerType = ControllerType,
|
ControllerType = ControllerType,
|
||||||
LeftJoycon =
|
LeftJoycon = new LeftJoyconCommonConfig<Key>
|
||||||
new LeftJoyconCommonConfig<Key>
|
|
||||||
{
|
{
|
||||||
DpadUp = DpadUp,
|
DpadUp = DpadUp,
|
||||||
DpadDown = DpadDown,
|
DpadDown = DpadDown,
|
||||||
|
@ -384,8 +385,7 @@ namespace Ryujinx.Ava.UI.Models.Input
|
||||||
ButtonSl = LeftButtonSl,
|
ButtonSl = LeftButtonSl,
|
||||||
ButtonSr = LeftButtonSr,
|
ButtonSr = LeftButtonSr,
|
||||||
},
|
},
|
||||||
RightJoycon =
|
RightJoycon = new RightJoyconCommonConfig<Key>
|
||||||
new RightJoyconCommonConfig<Key>
|
|
||||||
{
|
{
|
||||||
ButtonA = ButtonA,
|
ButtonA = ButtonA,
|
||||||
ButtonB = ButtonB,
|
ButtonB = ButtonB,
|
||||||
|
@ -397,14 +397,13 @@ namespace Ryujinx.Ava.UI.Models.Input
|
||||||
ButtonR = ButtonR,
|
ButtonR = ButtonR,
|
||||||
ButtonZr = ButtonZr
|
ButtonZr = ButtonZr
|
||||||
},
|
},
|
||||||
LeftJoyconStick =
|
LeftJoyconStick = new JoyconConfigKeyboardStick<Key>
|
||||||
new JoyconConfigKeyboardStick<Key>
|
|
||||||
{
|
{
|
||||||
StickUp = LeftStickUp,
|
StickUp = LeftStickUp,
|
||||||
StickDown = LeftStickDown,
|
StickDown = LeftStickDown,
|
||||||
StickRight = LeftStickRight,
|
StickRight = LeftStickRight,
|
||||||
StickLeft = LeftStickLeft,
|
StickLeft = LeftStickLeft,
|
||||||
StickButton = LeftKeyboardStickButton
|
StickButton = LeftStickButton
|
||||||
},
|
},
|
||||||
RightJoyconStick = new JoyconConfigKeyboardStick<Key>
|
RightJoyconStick = new JoyconConfigKeyboardStick<Key>
|
||||||
{
|
{
|
||||||
|
@ -412,7 +411,7 @@ namespace Ryujinx.Ava.UI.Models.Input
|
||||||
StickDown = RightStickDown,
|
StickDown = RightStickDown,
|
||||||
StickLeft = RightStickLeft,
|
StickLeft = RightStickLeft,
|
||||||
StickRight = RightStickRight,
|
StickRight = RightStickRight,
|
||||||
StickButton = RightKeyboardStickButton
|
StickButton = RightStickButton
|
||||||
},
|
},
|
||||||
Version = InputConfig.CurrentVersion
|
Version = InputConfig.CurrentVersion
|
||||||
};
|
};
|
||||||
|
|
|
@ -142,7 +142,7 @@
|
||||||
TextAlignment="Center" />
|
TextAlignment="Center" />
|
||||||
<ToggleButton>
|
<ToggleButton>
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Text="{Binding Config.LeftControllerStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
|
Text="{Binding Config.LeftStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
|
||||||
TextAlignment="Center" />
|
TextAlignment="Center" />
|
||||||
</ToggleButton>
|
</ToggleButton>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
@ -560,7 +560,7 @@
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
<!-- Right Joystick -->
|
<!-- Right Buttons -->
|
||||||
<Border
|
<Border
|
||||||
BorderBrush="{DynamicResource ThemeControlBorderColor}"
|
BorderBrush="{DynamicResource ThemeControlBorderColor}"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
|
@ -674,7 +674,7 @@
|
||||||
TextAlignment="Center" />
|
TextAlignment="Center" />
|
||||||
<ToggleButton>
|
<ToggleButton>
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Text="{Binding Config.RightControllerStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
|
Text="{Binding Config.RightStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
|
||||||
TextAlignment="Center" />
|
TextAlignment="Center" />
|
||||||
</ToggleButton>
|
</ToggleButton>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
|
@ -143,7 +143,7 @@
|
||||||
TextAlignment="Center" />
|
TextAlignment="Center" />
|
||||||
<ToggleButton>
|
<ToggleButton>
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Text="{Binding Config.LeftKeyboardStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
|
Text="{Binding Config.LeftStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
|
||||||
TextAlignment="Center" />
|
TextAlignment="Center" />
|
||||||
</ToggleButton>
|
</ToggleButton>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
@ -481,7 +481,7 @@
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
<!-- Right Joystick -->
|
<!-- Right Buttons -->
|
||||||
<Border
|
<Border
|
||||||
BorderBrush="{DynamicResource ThemeControlBorderColor}"
|
BorderBrush="{DynamicResource ThemeControlBorderColor}"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
|
@ -596,7 +596,7 @@
|
||||||
TextAlignment="Center" />
|
TextAlignment="Center" />
|
||||||
<ToggleButton>
|
<ToggleButton>
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Text="{Binding Config.RightKeyboardStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
|
Text="{Binding Config.RightStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
|
||||||
TextAlignment="Center" />
|
TextAlignment="Center" />
|
||||||
</ToggleButton>
|
</ToggleButton>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
Loading…
Reference in a new issue