From 6268f3ca09afef812cf288f323cacff22fbfcffc Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 4 Apr 2019 23:08:22 +0800 Subject: Finish refactor!!! --- src/ui/render/window_render_object.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/ui/render/window_render_object.cpp') 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 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); }); } } -- cgit v1.2.3