mirror of
https://github.com/nicbarker/clay.git
synced 2025-11-02 15:56:16 +00:00
Compare commits
8 commits
e14e9aa3d5
...
80ae360c7c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
80ae360c7c | ||
|
|
fd97d8179e | ||
|
|
7216815536 | ||
|
|
83129995f7 | ||
|
|
af3d63ad0f | ||
|
|
0eb162e3a3 | ||
|
|
d1fd147b09 | ||
|
|
13b588d8c1 |
|
|
@ -168,6 +168,7 @@ For help starting out or to discuss clay, considering joining [the discord serve
|
||||||
- [Clay_SetCurrentContext](#clay_setcurrentcontext)
|
- [Clay_SetCurrentContext](#clay_setcurrentcontext)
|
||||||
- [Clay_SetLayoutDimensions](#clay_setlayoutdimensions)
|
- [Clay_SetLayoutDimensions](#clay_setlayoutdimensions)
|
||||||
- [Clay_SetPointerState](#clay_setpointerstate)
|
- [Clay_SetPointerState](#clay_setpointerstate)
|
||||||
|
- [Clay_GetPointerState](#clay_getpointerstate)
|
||||||
- [Clay_UpdateScrollContainers](#clay_updatescrollcontainers)
|
- [Clay_UpdateScrollContainers](#clay_updatescrollcontainers)
|
||||||
- [Clay_BeginLayout](#clay_beginlayout)
|
- [Clay_BeginLayout](#clay_beginlayout)
|
||||||
- [Clay_EndLayout](#clay_endlayout)
|
- [Clay_EndLayout](#clay_endlayout)
|
||||||
|
|
@ -657,6 +658,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
|
### Clay_UpdateScrollContainers
|
||||||
|
|
||||||
`void Clay_UpdateScrollContainers(bool enableDragScrolling, Clay_Vector2 scrollDelta, float deltaTime)`
|
`void Clay_UpdateScrollContainers(bool enableDragScrolling, Clay_Vector2 scrollDelta, float deltaTime)`
|
||||||
|
|
|
||||||
9
clay.h
9
clay.h
|
|
@ -837,6 +837,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,
|
// 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.
|
// as well as for Clay_Hovered() and scroll element handling.
|
||||||
CLAY_DLL_EXPORT void Clay_SetPointerState(Clay_Vector2 position, bool pointerDown);
|
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.
|
// 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()
|
// - 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)
|
// - layoutDimensions are the initial bounding dimensions of the layout (i.e. the screen width and height for a full screen layout)
|
||||||
|
|
@ -4037,6 +4040,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_WASM_EXPORT("Clay_Initialize")
|
||||||
Clay_Context* Clay_Initialize(Clay_Arena arena, Clay_Dimensions layoutDimensions, Clay_ErrorHandler errorHandler) {
|
Clay_Context* Clay_Initialize(Clay_Arena arena, Clay_Dimensions layoutDimensions, Clay_ErrorHandler errorHandler) {
|
||||||
// Cacheline align memory passed in
|
// Cacheline align memory passed in
|
||||||
|
|
|
||||||
|
|
@ -15,5 +15,5 @@ mkdir -p build/clay \
|
||||||
-Wl,--initial-memory=6553600 \
|
-Wl,--initial-memory=6553600 \
|
||||||
-o build/clay/index.wasm \
|
-o build/clay/index.wasm \
|
||||||
main.c \
|
main.c \
|
||||||
&& cp index.html build/clay/index.html && cp -r fonts/ build/clay/fonts \
|
&& cp index.html build/index.html && cp -r fonts/ build/clay/fonts \
|
||||||
&& cp index.html build/clay/index.html && cp -r images/ build/clay/images
|
&& cp -r images/ build/clay/images
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ set(FETCHCONTENT_QUIET FALSE)
|
||||||
FetchContent_Declare(
|
FetchContent_Declare(
|
||||||
termbox2
|
termbox2
|
||||||
GIT_REPOSITORY "https://github.com/termbox/termbox2.git"
|
GIT_REPOSITORY "https://github.com/termbox/termbox2.git"
|
||||||
GIT_TAG "9c9281a9a4c971a2be57f8645e828ec99fd555e8"
|
GIT_TAG "ffd159c2a6106dd5eef338a6702ad15d4d4aa809"
|
||||||
GIT_PROGRESS TRUE
|
GIT_PROGRESS TRUE
|
||||||
GIT_SHALLOW TRUE
|
GIT_SHALLOW TRUE
|
||||||
)
|
)
|
||||||
|
|
@ -17,7 +17,7 @@ FetchContent_MakeAvailable(termbox2)
|
||||||
FetchContent_Declare(
|
FetchContent_Declare(
|
||||||
stb
|
stb
|
||||||
GIT_REPOSITORY "https://github.com/nothings/stb.git"
|
GIT_REPOSITORY "https://github.com/nothings/stb.git"
|
||||||
GIT_TAG "f58f558c120e9b32c217290b80bad1a0729fbb2c"
|
GIT_TAG "fede005abaf93d9d7f3a679d1999b2db341b360f"
|
||||||
GIT_PROGRESS TRUE
|
GIT_PROGRESS TRUE
|
||||||
GIT_SHALLOW TRUE
|
GIT_SHALLOW TRUE
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ void component_text_pair(const char *key, const char *value)
|
||||||
|
|
||||||
void component_termbox_settings(void)
|
void component_termbox_settings(void)
|
||||||
{
|
{
|
||||||
CLAY_AUTO_ID({
|
CLAY(CLAY_ID("Termbox Settings"), {
|
||||||
.floating = {
|
.floating = {
|
||||||
.attachTo = CLAY_ATTACH_TO_PARENT,
|
.attachTo = CLAY_ATTACH_TO_PARENT,
|
||||||
.zIndex = 1,
|
.zIndex = 1,
|
||||||
|
|
@ -509,13 +509,18 @@ Clay_RenderCommandArray CreateLayout(clay_tb_image *image1, clay_tb_image *image
|
||||||
{
|
{
|
||||||
Clay_BeginLayout();
|
Clay_BeginLayout();
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
|
.clip = {
|
||||||
|
.vertical = false,
|
||||||
|
.horizontal = true,
|
||||||
|
.childOffset = Clay_GetScrollOffset(),
|
||||||
|
},
|
||||||
.layout = {
|
.layout = {
|
||||||
.sizing = {
|
.sizing = {
|
||||||
.width = CLAY_SIZING_GROW(),
|
.width = CLAY_SIZING_GROW(),
|
||||||
.height = CLAY_SIZING_GROW()
|
.height = CLAY_SIZING_GROW()
|
||||||
},
|
},
|
||||||
.childAlignment = {
|
.childAlignment = {
|
||||||
.x = CLAY_ALIGN_X_CENTER,
|
.x = CLAY_ALIGN_X_LEFT,
|
||||||
.y = CLAY_ALIGN_Y_CENTER
|
.y = CLAY_ALIGN_Y_CENTER
|
||||||
},
|
},
|
||||||
.childGap = 64
|
.childGap = 64
|
||||||
|
|
@ -714,12 +719,12 @@ void handle_termbox_events(void)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case TB_KEY_MOUSE_WHEEL_UP: {
|
case TB_KEY_MOUSE_WHEEL_UP: {
|
||||||
Clay_Vector2 scrollDelta = { 0, 1 * Clay_Termbox_Cell_Height() };
|
Clay_Vector2 scrollDelta = { 0.5 * Clay_Termbox_Cell_Width(), 0 };
|
||||||
Clay_UpdateScrollContainers(false, scrollDelta, 1);
|
Clay_UpdateScrollContainers(false, scrollDelta, 1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case TB_KEY_MOUSE_WHEEL_DOWN: {
|
case TB_KEY_MOUSE_WHEEL_DOWN: {
|
||||||
Clay_Vector2 scrollDelta = { 0, -1 * Clay_Termbox_Cell_Height() };
|
Clay_Vector2 scrollDelta = { -0.5 * Clay_Termbox_Cell_Width(), 0 };
|
||||||
Clay_UpdateScrollContainers(false, scrollDelta, 1);
|
Clay_UpdateScrollContainers(false, scrollDelta, 1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,8 @@
|
||||||
|
|
||||||
Copyright (c) 2025 Mivirl
|
Copyright (c) 2025 Mivirl
|
||||||
|
|
||||||
|
altered by Godje (Sep 2025)
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied warranty.
|
This software is provided 'as-is', without any express or implied warranty.
|
||||||
In no event will the authors be held liable for any damages arising from the
|
In no event will the authors be held liable for any damages arising from the
|
||||||
use of this software.
|
use of this software.
|
||||||
|
|
@ -1616,6 +1618,20 @@ void Clay_Termbox_Render(Clay_RenderCommandArray commands)
|
||||||
|
|
||||||
Clay_StringSlice *text = &render_data.stringContents;
|
Clay_StringSlice *text = &render_data.stringContents;
|
||||||
int32_t i = 0;
|
int32_t i = 0;
|
||||||
|
|
||||||
|
// culling text characters that are outside of the layout
|
||||||
|
int h_clip = 0 - cell_box.x;
|
||||||
|
while(h_clip > 0 && i < text->length){
|
||||||
|
uint32_t ch = ' ';
|
||||||
|
int codepoint_length = tb_utf8_char_to_unicode(&ch, text->chars + i);
|
||||||
|
if (0 > codepoint_length) {
|
||||||
|
clay_tb_assert(false, "Invalid utf8");
|
||||||
|
}
|
||||||
|
i += codepoint_length;
|
||||||
|
h_clip -= 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// printing the rest of the characters
|
||||||
for (int y = box_begin_y; y < box_end_y; ++y) {
|
for (int y = box_begin_y; y < box_end_y; ++y) {
|
||||||
for (int x = box_begin_x; x < box_end_x;) {
|
for (int x = box_begin_x; x < box_end_x;) {
|
||||||
uint32_t ch = ' ';
|
uint32_t ch = ' ';
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue