Clean codes. Remove Measure1.

6 files changed, 9 insertions, 35 deletions

diff --git a/include/cru/ui/render/BorderRenderObject.h b/include/cru/ui/render/BorderRenderObject.h
index 16f04962..6060dc4c 100644
--- a/include/cru/ui/render/BorderRenderObject.h
+++ b/include/cru/ui/render/BorderRenderObject.h
@@ -54,8 +54,6 @@ class CRU_UI_API BorderRenderObject : public SingleChildRenderObject {
                         const MeasureSize& preferred_size) override;
   void OnLayoutContent(const Rect& content_rect) override;
 
-  Size OnMeasureContent1(const BoxConstraint& constraint) override;
-
   void OnResize(const Size& new_size) override;
 
  private:
diff --git a/include/cru/ui/render/CanvasRenderObject.h b/include/cru/ui/render/CanvasRenderObject.h
index 3471d75f..63da9cd9 100644
--- a/include/cru/ui/render/CanvasRenderObject.h
+++ b/include/cru/ui/render/CanvasRenderObject.h
@@ -44,8 +44,6 @@ class CRU_UI_API CanvasRenderObject : public RenderObject {
                         const MeasureSize& preferred_size) override;
   void OnLayoutContent(const Rect& content_rect) override;
 
-  Size OnMeasureContent1(const BoxConstraint& constraint) override;
-
  private:
   Size desired_size_{};
 
diff --git a/include/cru/ui/render/GeometryRenderObject.h b/include/cru/ui/render/GeometryRenderObject.h
index 1c998ef0..2320b71b 100644
--- a/include/cru/ui/render/GeometryRenderObject.h
+++ b/include/cru/ui/render/GeometryRenderObject.h
@@ -39,8 +39,6 @@ class GeometryRenderObject : public RenderObject {
                         const MeasureSize& preferred_size) override;
   void OnLayoutContent(const Rect& content_rect) override;
 
-  Size OnMeasureContent1(const BoxConstraint& constraint) override;
-
  private:
   std::shared_ptr<platform::graphics::IGeometry> geometry_ = nullptr;
   Rect view_port_{};
diff --git a/include/cru/ui/render/RenderObject.h b/include/cru/ui/render/RenderObject.h
index 5569c788..ce788ca6 100644
--- a/include/cru/ui/render/RenderObject.h
+++ b/include/cru/ui/render/RenderObject.h
@@ -103,12 +103,6 @@ class CRU_UI_API RenderObject : public Object {
     return custom_measure_requirement_;
   }
 
-  Size GetMinSize1() { return min_size_; }
-  void SetMinSize1(const Size& min_size);
-  Size GetMaxSize1() { return max_size_; }
-  void SetMaxSize1(const Size& max_size);
-  BoxConstraint CalculateMergedConstraint(const BoxConstraint& constraint);
-
   // This method will merge requirement passed by argument and requirement of
   // the render object using MeasureRequirement::Merge and then call
   // MeasureRequirement::Normalize on it. And it will use preferred size of the
@@ -121,8 +115,6 @@ class CRU_UI_API RenderObject : public Object {
   // This will set offset of this render object and call OnLayoutCore.
   void Layout(const Point& offset);
 
-  Size Measure1(const BoxConstraint& constraint);
-
   virtual Thickness GetTotalSpaceThickness();
   virtual Thickness GetInnerSpaceThickness();
 
@@ -156,8 +148,6 @@ class CRU_UI_API RenderObject : public Object {
   virtual Size OnMeasureCore(const MeasureRequirement& requirement,
                              const MeasureSize& preferred_size);
 
-  virtual Size OnMeasureCore1(const BoxConstraint& constraint);
-
   // Please reduce margin and padding or other custom things and pass the result
   // content rect to OnLayoutContent.
   virtual void OnLayoutCore();
@@ -169,8 +159,6 @@ class CRU_UI_API RenderObject : public Object {
   virtual Size OnMeasureContent(const MeasureRequirement& requirement,
                                 const MeasureSize& preferred_size) = 0;
 
-  virtual Size OnMeasureContent1(const BoxConstraint& constraint);
-
   // Layout all content and children(Call Layout on them).
   // Lefttop of content_rect should be added when calculated children's offset.
   virtual void OnLayoutContent(const Rect& content_rect) = 0;
@@ -182,22 +170,18 @@ class CRU_UI_API RenderObject : public Object {
 
  private:
   std::string name_;
-  controls::Control* control_ = nullptr;
-
-  RenderObject* parent_ = nullptr;
-
-  Point offset_{};
-  Size size_{};
+  controls::Control* control_;
+  RenderObject* parent_;
 
-  Size desired_size_{};
+  Point offset_;
+  Size size_;
 
-  Thickness margin_{};
-  Thickness padding_{};
+  Size desired_size_;
 
-  MeasureSize preferred_size_{};
-  MeasureRequirement custom_measure_requirement_{};
+  Thickness margin_;
+  Thickness padding_;
 
-  Size min_size_ = Size::kZero;
-  Size max_size_ = Size::kMax;
+  MeasureSize preferred_size_;
+  MeasureRequirement custom_measure_requirement_;
 };
 }  // namespace cru::ui::render
diff --git a/include/cru/ui/render/ScrollRenderObject.h b/include/cru/ui/render/ScrollRenderObject.h
index b3d1a09f..417ebf1c 100644
--- a/include/cru/ui/render/ScrollRenderObject.h
+++ b/include/cru/ui/render/ScrollRenderObject.h
@@ -73,8 +73,6 @@ class CRU_UI_API ScrollRenderObject : public SingleChildRenderObject {
                         const MeasureSize& preferred_size) override;
   void OnLayoutContent(const Rect& content_rect) override;
 
-  Size OnMeasureContent1(const BoxConstraint& constraint) override;
-
   void OnAttachedControlChanged(controls::Control* old_control,
                                 controls::Control* new_control) override;
 
diff --git a/include/cru/ui/render/TextRenderObject.h b/include/cru/ui/render/TextRenderObject.h
index 19ff800a..28d674aa 100644
--- a/include/cru/ui/render/TextRenderObject.h
+++ b/include/cru/ui/render/TextRenderObject.h
@@ -94,8 +94,6 @@ class CRU_UI_API TextRenderObject : public RenderObject {
   Size OnMeasureContent(const MeasureRequirement& requirement,
                         const MeasureSize& preferred_size) override;
 
-  Size OnMeasureContent1(const BoxConstraint& constraint) override;
-
   void OnLayoutContent(const Rect& content_rect) override;
 
  private: