mirror of
				https://github.com/nicbarker/clay.git
				synced 2025-11-04 08:36:17 +00:00 
			
		
		
		
	Fixed termbox2 demo build, added scroll functionality (#523)
This commit is contained in:
		
							parent
							
								
									83129995f7
								
							
						
					
					
						commit
						7216815536
					
				| 
						 | 
					@ -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;
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue