diff --git a/carla b/carla index 9317df5..568fc96 160000 --- a/carla +++ b/carla @@ -1 +1 @@ -Subproject commit 9317df59709ae646f6e08a1e2c9834b4a0325101 +Subproject commit 568fc96aa376bee1f779d4d288b5095e8d67ca26 diff --git a/dpf b/dpf index 018e45d..3535934 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 018e45db4a40d57761f12e797093e3699b1ca5e3 +Subproject commit 3535934e70810617b67a36c8fbdf3a67dbde8725 diff --git a/src/custom/glfw.cpp b/src/custom/glfw.cpp index b4fa62a..e3718d7 100644 --- a/src/custom/glfw.cpp +++ b/src/custom/glfw.cpp @@ -1,6 +1,6 @@ /* * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2022 Filipe Coelho + * Copyright (C) 2021-2023 Filipe Coelho * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -50,16 +50,16 @@ GLFWAPI void glfwSetClipboardString(GLFWwindow*, const char* const text) GLFWAPI GLFWcursor* glfwCreateStandardCursor(const int shape) { static GLFWcursor cursors[] = { - { kMouseCursorArrow }, // GLFW_ARROW_CURSOR - { kMouseCursorCaret }, // GLFW_IBEAM_CURSOR - { kMouseCursorCrosshair }, // GLFW_CROSSHAIR_CURSOR - { kMouseCursorHand }, // GLFW_POINTING_HAND_CURSOR - { kMouseCursorNotAllowed }, // GLFW_NOT_ALLOWED_CURSOR - { kMouseCursorLeftRight }, // GLFW_RESIZE_EW_CURSOR - { kMouseCursorUpDown }, // GLFW_RESIZE_NS_CURSOR - { kMouseCursorDiagonal }, // GLFW_RESIZE_NWSE_CURSOR - { kMouseCursorAntiDiagonal }, // GLFW_RESIZE_NESW_CURSOR - // NOTE GLFW_RESIZE_ALL_CURSOR is unsupported in pugl + { kMouseCursorArrow }, // GLFW_ARROW_CURSOR + { kMouseCursorCaret }, // GLFW_IBEAM_CURSOR + { kMouseCursorCrosshair }, // GLFW_CROSSHAIR_CURSOR + { kMouseCursorHand }, // GLFW_POINTING_HAND_CURSOR + { kMouseCursorNotAllowed }, // GLFW_NOT_ALLOWED_CURSOR + { kMouseCursorLeftRight }, // GLFW_RESIZE_EW_CURSOR + { kMouseCursorUpDown }, // GLFW_RESIZE_NS_CURSOR + { kMouseCursorUpLeftDownRight }, // GLFW_RESIZE_NWSE_CURSOR + { kMouseCursorUpRightDownLeft }, // GLFW_RESIZE_NESW_CURSOR + { kMouseCursorAllScroll }, // GLFW_RESIZE_ALL_CURSOR }; switch (shape) @@ -79,9 +79,11 @@ GLFWAPI GLFWcursor* glfwCreateStandardCursor(const int shape) case GLFW_RESIZE_NS_CURSOR: return &cursors[kMouseCursorUpDown]; case GLFW_RESIZE_NWSE_CURSOR: - return &cursors[kMouseCursorDiagonal]; + return &cursors[kMouseCursorUpLeftDownRight]; case GLFW_RESIZE_NESW_CURSOR: - return &cursors[kMouseCursorAntiDiagonal]; + return &cursors[kMouseCursorUpRightDownLeft]; + case GLFW_RESIZE_ALL_CURSOR: + return &cursors[kMouseCursorAllScroll]; default: return nullptr; }