Switch all configs to value based rather than pointer

nicbarker · Oct 20, 2024 · 03c619d · 03c619d
1 parent 54132c1
commit 03c619d
Show file tree

Hide file tree

Showing 8 changed files with 393 additions and 351 deletions.
diff --git a/README.md b/README.md
diff --git a/bindings/odin/examples/clay-official-website/clay-official-website.odin b/bindings/odin/examples/clay-official-website/clay-official-website.odin
@@ -454,29 +454,23 @@ createLayout :: proc(lerpValue: f32) -> clay.ClayArray(clay.RenderCommand) {
         if clay.UI(clay.ID("TopBorder5"), clay.Layout({sizing = {clay.SizingGrow({}), clay.SizingFixed(4)}}), clay.Rectangle({color = COLOR_TOP_BORDER_1})) {}
         if clay.UI(
             clay.ID("ScrollContainerBackgroundRectangle"),
-            clay.Layout({sizing = {clay.SizingGrow({}), clay.SizingGrow({})}}),
+            clay.Scroll({vertical = true}),
+            clay.Layout({sizing = {clay.SizingGrow({}), clay.SizingGrow({})}, layoutDirection = clay.LayoutDirection.TOP_TO_BOTTOM}),
             clay.Rectangle({color = COLOR_LIGHT}),
+            clay.Border({betweenChildren = {2, COLOR_RED}})
         ) {
-            if clay.UI(clay.ID("OuterScrollContainer"), clay.Layout({sizing = {clay.SizingGrow({}), clay.SizingGrow({})}}), clay.Scroll({vertical = true})) {
-                if clay.UI(
-                    clay.ID("ScrollContainerInner"),
-                    clay.Layout({layoutDirection = .TOP_TO_BOTTOM, sizing = {width = clay.SizingGrow({})}}),
-                    clay.Border({betweenChildren = {2, COLOR_RED}}),
-                ) {
-                    if (!mobileScreen) {
-                        LandingPageDesktop()
-                        FeatureBlocksDesktop()
-                        DeclarativeSyntaxPageDesktop()
-                        HighPerformancePageDesktop(lerpValue)
-                        RendererPageDesktop()
-                    } else {
-                        LandingPageMobile()
-                        FeatureBlocksMobile()
-                        DeclarativeSyntaxPageMobile()
-                        HighPerformancePageMobile(lerpValue)
-                        RendererPageMobile()
-                    }
-                }
+            if (!mobileScreen) {
+                LandingPageDesktop()
+                FeatureBlocksDesktop()
+                DeclarativeSyntaxPageDesktop()
+                HighPerformancePageDesktop(lerpValue)
+                RendererPageDesktop()
+            } else {
+                LandingPageMobile()
+                FeatureBlocksMobile()
+                DeclarativeSyntaxPageMobile()
+                HighPerformancePageMobile(lerpValue)
+                RendererPageMobile()
             }
         }
     }

diff --git a/clay.h b/clay.h
diff --git a/examples/clay-official-website/main.c b/examples/clay-official-website/main.c
diff --git a/examples/cpp-project-example/CMakeLists.txt b/examples/cpp-project-example/CMakeLists.txt
@@ -8,5 +8,5 @@ add_executable(clay_examples_cpp_project_example main.cpp)
 
 target_include_directories(clay_examples_cpp_project_example PUBLIC .)
 
-set(CMAKE_CXX_FLAGS_DEBUG "-Wall")
+set(CMAKE_CXX_FLAGS_DEBUG "-Werror -Wall")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3")
diff --git a/examples/cpp-project-example/main.cpp b/examples/cpp-project-example/main.cpp
@@ -2,9 +2,14 @@
 #define CLAY_IMPLEMENTATION
 #include "../../clay.h"
 
+Clay_LayoutConfig layoutElement = Clay_LayoutConfig { .padding = {5} };
+
 int main(void) {
     uint64_t totalMemorySize = Clay_MinMemorySize();
     Clay_Arena clayMemory = Clay_Arena { .label = CLAY_STRING("Clay Memory Arena"), .capacity = totalMemorySize, .memory = (char *)malloc(totalMemorySize) };
     Clay_Initialize(clayMemory, Clay_Dimensions {1024,768});
+    Clay_BeginLayout();
+    CLAY(CLAY_RECTANGLE({ .color = {255,255,255,0} }), CLAY_LAYOUT(layoutElement)) {}
+    Clay_EndLayout();
     return 0;
 }
diff --git a/examples/raylib-sidebar-scrolling-container/main.c b/examples/raylib-sidebar-scrolling-container/main.c
diff --git a/examples/raylib-sidebar-scrolling-container/multi-compilation-unit.c b/examples/raylib-sidebar-scrolling-container/multi-compilation-unit.c
@@ -3,5 +3,5 @@
 // NOTE: This file only exists to make sure that clay works when included in multiple translation units.
 
 void SatisfyCompiler() {
-    CLAY(CLAY_ID("SatisfyCompiler"), CLAY_LAYOUT()) {}
+    CLAY(CLAY_ID("SatisfyCompiler"), CLAY_LAYOUT({})) {}
 }