3 files changed, 10 insertions, 7 deletions
diff --git a/src/ui/render/border_render_object.cpp b/src/ui/render/border_render_object.cpp
index 93e87c90..97e386dd 100644
--- a/src/ui/render/border_render_object.cpp
+++ b/src/ui/render/border_render_object.cpp
@@ -192,7 +192,7 @@ void BorderRenderObject::RecreateGeometry() {
   builder.reset(graph_factory->CreateGeometryBuilder());
   f(builder.get(), outer_rect, corner_radius_);
   f(builder.get(), inner_rect, corner_radius_);
-  border_outer_geometry_.reset(builder->Build());
+  geometry_.reset(builder->Build());
   builder.reset();
 }
 }  // namespace cru::ui::render
diff --git a/src/ui/render/flex_layout_render_object.cpp b/src/ui/render/flex_layout_render_object.cpp
index 99368c23..e7840b7e 100644
--- a/src/ui/render/flex_layout_render_object.cpp
+++ b/src/ui/render/flex_layout_render_object.cpp
@@ -188,7 +188,7 @@ void FlexLayoutRenderObject::OnLayoutContent(const Rect& content_rect) {
     const float content_anchor_x = calculate_anchor(
         content_main_align_, 0, content_rect.width, actual_content_width);
 
-    auto anchor_x = 0;
+    float anchor_x = 0;
     for (int i = 0; i < children.size(); i++) {
       const auto child = children[i];
       const auto size = child->GetPreferredSize();
@@ -215,7 +215,7 @@ void FlexLayoutRenderObject::OnLayoutContent(const Rect& content_rect) {
     const float content_anchor_y = calculate_anchor(
         content_main_align_, 0, content_rect.height, actual_content_height);
 
-    auto anchor_y = 0;
+    float anchor_y = 0;
     for (int i = 0; i < children.size(); i++) {
       const auto child = children[i];
       const auto size = child->GetPreferredSize();
diff --git a/src/ui/render/window_render_object.cpp b/src/ui/render/window_render_object.cpp
index ca1ab707..781087aa 100644
--- a/src/ui/render/window_render_object.cpp
+++ b/src/ui/render/window_render_object.cpp
@@ -1,22 +1,25 @@
 #include "cru/ui/render/window_render_object.hpp"
 
+#include "cru/platform/native_window.hpp"
 #include "cru/platform/painter_util.hpp"
+#include "cru/ui/window.hpp"
 
 #include <cassert>
 
 namespace cru::ui::render {
 void WindowRenderObject::MeasureAndLayout() {
-  const auto client_size = window_->GetClientSize();
+  const auto client_size = window_->GetNativeWindow()->GetClientSize();
   Measure(client_size);
   Layout(Rect{Point{}, client_size});
 }
 
 void WindowRenderObject::Draw(platform::Painter* painter) {
+  painter->Clear(colors::white);
   if (const auto child = GetChild()) {
     auto offset = child->GetOffset();
-    platform::util::WithTransform(painter,
-                         platform::Matrix::Translation(offset.x, offset.y),
-                         [child](auto rt) { child->Draw(rt); });
+    platform::util::WithTransform(
+        painter, platform::Matrix::Translation(offset.x, offset.y),
+        [child](auto rt) { child->Draw(rt); });
   }
 }