drifty/emulator
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emulator synced 2026-01-06 18:04:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat/fix: Choose Color, Toggle Gyro & Deadzone Fix

Browse Source 
Signed-off-by: Collecting <collecting@noreply.localhost>
This commit is contained in:
Collecting
2025-10-31 05:35:35 +00:00
parent 1315e238b1
commit 59bba7848d
1 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/citron/configuration/configure_input_player_widget.cpp
View File

@@ -106,6 +106,12 @@ void PlayerControlPreview::UpdateColors() {
colors.charging = QColor(250, 168, 26); colors.charging = QColor(250, 168, 26);
colors.button_turbo = QColor(217, 158, 4); colors.button_turbo = QColor(217, 158, 4);
// Apply custom controller body color if it exists, overriding the theme color.
const auto custom_body_color = controller->GetBodyColor();
if (custom_body_color != 0) {
colors.primary = QColor(custom_body_color);
}
colors.left = colors.primary; colors.left = colors.primary;
colors.right = colors.primary; colors.right = colors.primary;
@@ -348,10 +354,12 @@ void PlayerControlPreview::DrawLeftController(QPainter& p, const QPointF center)
{ {
// Draw motion cubes // Draw motion cubes
using namespace Settings::NativeMotion; using namespace Settings::NativeMotion;
p.setPen(colors.outline); if (gyro_visible) {
p.setBrush(colors.transparent); p.setPen(colors.outline);
Draw3dCube(p, center + QPointF(-140, 90), p.setBrush(colors.transparent);
motion_values[Settings::NativeMotion::MotionLeft].euler, 20.0f); Draw3dCube(p, center + QPointF(-140, 90),
motion_values[Settings::NativeMotion::MotionLeft].euler, 20.0f);
}
} }
using namespace Settings::NativeButton; using namespace Settings::NativeButton;
@@ -485,10 +493,12 @@ void PlayerControlPreview::DrawRightController(QPainter& p, const QPointF center
{ {
// Draw motion cubes // Draw motion cubes
using namespace Settings::NativeMotion; using namespace Settings::NativeMotion;
p.setPen(colors.outline); if (gyro_visible) {
p.setBrush(colors.transparent); p.setPen(colors.outline);
Draw3dCube(p, center + QPointF(140, 90), p.setBrush(colors.transparent);
motion_values[Settings::NativeMotion::MotionRight].euler, 20.0f); Draw3dCube(p, center + QPointF(140, 90),
motion_values[Settings::NativeMotion::MotionRight].euler, 20.0f);
}
} }
using namespace Settings::NativeButton; using namespace Settings::NativeButton;
@@ -631,12 +641,14 @@ void PlayerControlPreview::DrawDualController(QPainter& p, const QPointF center)
{ {
// Draw motion cubes // Draw motion cubes
using namespace Settings::NativeMotion; using namespace Settings::NativeMotion;
p.setPen(colors.outline); if (gyro_visible) {
p.setBrush(colors.transparent); p.setPen(colors.outline);
Draw3dCube(p, center + QPointF(-180, 90), p.setBrush(colors.transparent);
motion_values[Settings::NativeMotion::MotionLeft].euler, 20.0f); Draw3dCube(p, center + QPointF(-180, 90),
Draw3dCube(p, center + QPointF(180, 90), motion_values[Settings::NativeMotion::MotionLeft].euler, 20.0f);
motion_values[Settings::NativeMotion::MotionRight].euler, 20.0f); Draw3dCube(p, center + QPointF(180, 90),
motion_values[Settings::NativeMotion::MotionRight].euler, 20.0f);
}
} }
using namespace Settings::NativeButton; using namespace Settings::NativeButton;
@@ -736,10 +748,12 @@ void PlayerControlPreview::DrawHandheldController(QPainter& p, const QPointF cen
{ {
// Draw motion cubes // Draw motion cubes
using namespace Settings::NativeMotion; using namespace Settings::NativeMotion;
p.setPen(colors.outline); if (gyro_visible) {
p.setBrush(colors.transparent); p.setPen(colors.outline);
Draw3dCube(p, center + QPointF(0, -115), p.setBrush(colors.transparent);
motion_values[Settings::NativeMotion::MotionLeft].euler, 15.0f); Draw3dCube(p, center + QPointF(0, -115),
motion_values[Settings::NativeMotion::MotionLeft].euler, 15.0f);
}
} }
using namespace Settings::NativeButton; using namespace Settings::NativeButton;
@@ -850,10 +864,12 @@ void PlayerControlPreview::DrawProController(QPainter& p, const QPointF center)
{ {
// Draw motion cubes // Draw motion cubes
using namespace Settings::NativeMotion; using namespace Settings::NativeMotion;
p.setPen(colors.button); if (gyro_visible) {
p.setBrush(colors.transparent); p.setPen(colors.button);
Draw3dCube(p, center + QPointF(0, -100), p.setBrush(colors.transparent);
motion_values[Settings::NativeMotion::MotionLeft].euler, 15.0f); Draw3dCube(p, center + QPointF(0, -100),
motion_values[Settings::NativeMotion::MotionLeft].euler, 15.0f);
}
} }
using namespace Settings::NativeButton; using namespace Settings::NativeButton;
@@ -2544,6 +2560,7 @@ void PlayerControlPreview::DrawJoystickProperties(
DrawCircle(p, center, range); DrawCircle(p, center, range);
// Deadzone circle // Deadzone circle
pen.setStyle(Qt::SolidLine);
pen.setColor(colors.deadzone); pen.setColor(colors.deadzone);
p.setPen(pen); p.setPen(pen);
DrawCircle(p, center, deadzone); DrawCircle(p, center, deadzone);