mirror of
https://github.com/nicbarker/clay.git
synced 2025-09-18 04:26:18 +00:00
Compare commits
2 commits
261e78ad46
...
7680aa6798
Author | SHA1 | Date | |
---|---|---|---|
![]() |
7680aa6798 | ||
![]() |
94a3d57236 |
28
clay.h
28
clay.h
|
@ -736,7 +736,8 @@ typedef struct Clay_PointerData {
|
|||
// CLAY_POINTER_DATA_PRESSED - The left mouse button click or touch happened at some point in the past, and is still currently held down this frame.
|
||||
// CLAY_POINTER_DATA_RELEASED_THIS_FRAME - The left mouse button click or touch was released this frame.
|
||||
// CLAY_POINTER_DATA_RELEASED - The left mouse button click or touch is not currently down / was released at some point in the past.
|
||||
Clay_PointerDataInteractionState state;
|
||||
Clay_PointerDataInteractionState state : 4;
|
||||
Clay_PointerDataInteractionState right_state : 4;
|
||||
} Clay_PointerData;
|
||||
|
||||
typedef struct Clay_ElementDeclaration {
|
||||
|
@ -831,6 +832,8 @@ CLAY_DLL_EXPORT Clay_Arena Clay_CreateArenaWithCapacityAndMemory(size_t capacity
|
|||
// Sets the state of the "pointer" (i.e. the mouse or touch) in Clay's internal data. Used for detecting and responding to mouse events in the debug view,
|
||||
// as well as for Clay_Hovered() and scroll element handling.
|
||||
CLAY_DLL_EXPORT void Clay_SetPointerState(Clay_Vector2 position, bool pointerDown);
|
||||
// Same as `Clay_SetPointerState` but includes right click info
|
||||
CLAY_DLL_EXPORT void Clay_SetPointerStateEx(Clay_Vector2 position, bool pointerDown, bool rightPointerDown);
|
||||
// Initialize Clay's internal arena and setup required data before layout can begin. Only needs to be called once.
|
||||
// - arena can be created using Clay_CreateArenaWithCapacityAndMemory()
|
||||
// - layoutDimensions are the initial bounding dimensions of the layout (i.e. the screen width and height for a full screen layout)
|
||||
|
@ -3960,8 +3963,8 @@ void Clay_SetLayoutDimensions(Clay_Dimensions dimensions) {
|
|||
Clay_GetCurrentContext()->layoutDimensions = dimensions;
|
||||
}
|
||||
|
||||
CLAY_WASM_EXPORT("Clay_SetPointerState")
|
||||
void Clay_SetPointerState(Clay_Vector2 position, bool isPointerDown) {
|
||||
CLAY_WASM_EXPORT("Clay_SetPointerStateEx")
|
||||
void Clay_SetPointerStateEx(Clay_Vector2 position, bool isPointerDown, bool isRightPointerDown) {
|
||||
Clay_Context* context = Clay_GetCurrentContext();
|
||||
if (context->booleanWarnings.maxElementsExceeded) {
|
||||
return;
|
||||
|
@ -4033,6 +4036,25 @@ void Clay_SetPointerState(Clay_Vector2 position, bool isPointerDown) {
|
|||
context->pointerInfo.state = CLAY_POINTER_DATA_RELEASED_THIS_FRAME;
|
||||
}
|
||||
}
|
||||
if (isRightPointerDown) {
|
||||
if (context->pointerInfo.right_state == CLAY_POINTER_DATA_PRESSED_THIS_FRAME) {
|
||||
context->pointerInfo.right_state = CLAY_POINTER_DATA_PRESSED;
|
||||
} else if (context->pointerInfo.right_state != CLAY_POINTER_DATA_PRESSED) {
|
||||
context->pointerInfo.right_state = CLAY_POINTER_DATA_PRESSED_THIS_FRAME;
|
||||
}
|
||||
} else {
|
||||
if (context->pointerInfo.right_state == CLAY_POINTER_DATA_RELEASED_THIS_FRAME) {
|
||||
context->pointerInfo.right_state = CLAY_POINTER_DATA_RELEASED;
|
||||
} else if (context->pointerInfo.right_state != CLAY_POINTER_DATA_RELEASED) {
|
||||
context->pointerInfo.right_state = CLAY_POINTER_DATA_RELEASED_THIS_FRAME;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
CLAY_WASM_EXPORT("Clay_SetPointerState")
|
||||
void Clay_SetPointerState(Clay_Vector2 position, bool isPointerDown)
|
||||
{
|
||||
Clay_SetPointerStateEx(position, isPointerDown, false);
|
||||
}
|
||||
|
||||
CLAY_WASM_EXPORT("Clay_Initialize")
|
||||
|
|
Loading…
Reference in a new issue