summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/CMakeLists.txt2
-rw-r--r--src/yuzu/configuration/configure_input_player_widget.cpp7
2 files changed, 2 insertions, 7 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 386d7bddf..987076956 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -653,6 +653,8 @@ else()
653 $<$<CXX_COMPILER_ID:GNU>:-Werror=unused-but-set-parameter> 653 $<$<CXX_COMPILER_ID:GNU>:-Werror=unused-but-set-parameter>
654 $<$<CXX_COMPILER_ID:GNU>:-Werror=unused-but-set-variable> 654 $<$<CXX_COMPILER_ID:GNU>:-Werror=unused-but-set-variable>
655 655
656 $<$<CXX_COMPILER_ID:Clang>:-fsized-deallocation>
657
656 -Wno-sign-conversion 658 -Wno-sign-conversion
657 ) 659 )
658endif() 660endif()
diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp
index e77ccc057..9c6674023 100644
--- a/src/yuzu/configuration/configure_input_player_widget.cpp
+++ b/src/yuzu/configuration/configure_input_player_widget.cpp
@@ -1002,12 +1002,6 @@ constexpr std::array<float, 3 * 2> up_arrow_symbol = {
1002 0.0f, -3.0f, -3.0f, 2.0f, 3.0f, 2.0f, 1002 0.0f, -3.0f, -3.0f, 2.0f, 3.0f, 2.0f,
1003}; 1003};
1004 1004
1005constexpr std::array<float, 13 * 2> up_arrow = {
1006 9.4f, -9.8f, 9.4f, -10.2f, 8.9f, -29.8f, 8.5f, -30.0f, 8.1f,
1007 -30.1f, 7.7f, -30.1f, -8.6f, -30.0f, -9.0f, -29.8f, -9.3f, -29.5f,
1008 -9.5f, -29.1f, -9.5f, -28.7f, -9.1f, -9.1f, -8.8f, -8.8f,
1009};
1010
1011constexpr std::array<float, 64 * 2> trigger_button = { 1005constexpr std::array<float, 64 * 2> trigger_button = {
1012 5.5f, -12.6f, 5.8f, -12.6f, 6.7f, -12.5f, 8.1f, -12.3f, 8.6f, -12.2f, 9.2f, -12.0f, 1006 5.5f, -12.6f, 5.8f, -12.6f, 6.7f, -12.5f, 8.1f, -12.3f, 8.6f, -12.2f, 9.2f, -12.0f,
1013 9.5f, -11.9f, 9.9f, -11.8f, 10.6f, -11.5f, 11.0f, -11.3f, 11.2f, -11.2f, 11.4f, -11.1f, 1007 9.5f, -11.9f, 9.9f, -11.8f, 10.6f, -11.5f, 11.0f, -11.3f, 11.2f, -11.2f, 11.4f, -11.1f,
@@ -2524,7 +2518,6 @@ void PlayerControlPreview::DrawArrowButton(QPainter& p, const QPointF center,
2524void PlayerControlPreview::DrawTriggerButton(QPainter& p, const QPointF center, 2518void PlayerControlPreview::DrawTriggerButton(QPainter& p, const QPointF center,
2525 const Direction direction, bool pressed) { 2519 const Direction direction, bool pressed) {
2526 std::array<QPointF, trigger_button.size() / 2> qtrigger_button; 2520 std::array<QPointF, trigger_button.size() / 2> qtrigger_button;
2527 QPoint offset;
2528 2521
2529 for (std::size_t point = 0; point < trigger_button.size() / 2; ++point) { 2522 for (std::size_t point = 0; point < trigger_button.size() / 2; ++point) {
2530 switch (direction) { 2523 switch (direction) {