Compare commits

...

6 Commits

Author SHA1 Message Date
Joram Vandemoortele
d000ea1fd8
Merge af3d63ad0f into 06167b4f4b 2025-04-12 18:55:37 +02:00
Nic Barker
06167b4f4b [Core] Fix a potential null pointer deref in scroll GetScrollContainerData
Some checks failed
CMake on multiple platforms / build (Release, cl, cl, windows-latest) (push) Has been cancelled
CMake on multiple platforms / build (Release, clang, clang++, ubuntu-latest) (push) Has been cancelled
CMake on multiple platforms / build (Release, gcc, g++, ubuntu-latest) (push) Has been cancelled
2025-04-12 11:27:10 +12:00
Orcolom
af3d63ad0f added dll_export macro 2025-02-26 21:13:36 +01:00
Orcolom
0eb162e3a3 Merge branch 'main' into feature/get-pointer
# Conflicts:
#	clay.h
2025-02-26 21:12:35 +01:00
Orcolom
d1fd147b09 added getpointerstate to readme 2025-02-19 22:01:25 +01:00
Orcolom
13b588d8c1 added a pointer get method 2025-02-19 21:54:08 +01:00
2 changed files with 23 additions and 1 deletions

View File

@ -169,6 +169,7 @@ For help starting out or to discuss clay, considering joining [the discord serve
- [Clay_SetCurrentContext](#clay_setcurrentcontext)
- [Clay_SetLayoutDimensions](#clay_setlayoutdimensions)
- [Clay_SetPointerState](#clay_setpointerstate)
- [Clay_GetPointerState](#clay_getpointerstate)
- [Clay_UpdateScrollContainers](#clay_updatescrollcontainers)
- [Clay_BeginLayout](#clay_beginlayout)
- [Clay_EndLayout](#clay_endlayout)
@ -646,6 +647,14 @@ Sets the internal pointer position and state (i.e. current mouse / touch positio
---
### Clay_GetPointerState
`Clay_PointerData Clay_GetPointerState()`
Get the internal pointer position and state (i.e. current mouse / touch position). returns clay internal click start and stop state.
---
### Clay_UpdateScrollContainers
`void Clay_UpdateScrollContainers(bool enableDragScrolling, Clay_Vector2 scrollDelta, float deltaTime)`

15
clay.h
View File

@ -801,6 +801,9 @@ 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);
// Gets the state of the "pointer". This will return the position provided by `Clay_SetPointerState`
// and the frame pressed state.
CLAY_DLL_EXPORT Clay_PointerData Clay_GetPointerState();
// 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)
@ -3859,6 +3862,12 @@ void Clay_SetPointerState(Clay_Vector2 position, bool isPointerDown) {
}
}
CLAY_WASM_EXPORT("Clay_GetPointerState")
Clay_PointerData Clay_GetPointerState() {
Clay_Context* context = Clay_GetCurrentContext();
return context->pointerInfo;
}
CLAY_WASM_EXPORT("Clay_Initialize")
Clay_Context* Clay_Initialize(Clay_Arena arena, Clay_Dimensions layoutDimensions, Clay_ErrorHandler errorHandler) {
Clay_Context *context = Clay__Context_Allocate_Arena(&arena);
@ -4118,11 +4127,15 @@ Clay_ScrollContainerData Clay_GetScrollContainerData(Clay_ElementId id) {
for (int32_t i = 0; i < context->scrollContainerDatas.length; ++i) {
Clay__ScrollContainerDataInternal *scrollContainerData = Clay__ScrollContainerDataInternalArray_Get(&context->scrollContainerDatas, i);
if (scrollContainerData->elementId == id.id) {
Clay_ScrollElementConfig *scrollElementConfig = Clay__FindElementConfigWithType(scrollContainerData->layoutElement, CLAY__ELEMENT_CONFIG_TYPE_SCROLL).scrollElementConfig;
if (!scrollElementConfig) { // This can happen on the first frame before a scroll container is declared
return CLAY__INIT(Clay_ScrollContainerData) CLAY__DEFAULT_STRUCT;
}
return CLAY__INIT(Clay_ScrollContainerData) {
.scrollPosition = &scrollContainerData->scrollPosition,
.scrollContainerDimensions = { scrollContainerData->boundingBox.width, scrollContainerData->boundingBox.height },
.contentDimensions = scrollContainerData->contentSize,
.config = *Clay__FindElementConfigWithType(scrollContainerData->layoutElement, CLAY__ELEMENT_CONFIG_TYPE_SCROLL).scrollElementConfig,
.config = *scrollElementConfig,
.found = true
};
}