...

4 files changed, 24 insertions, 23 deletions

diff --git a/src/ui/controls/flex_layout.cpp b/src/ui/controls/flex_layout.cpp
index c881b6f1..5412164a 100644
--- a/src/ui/controls/flex_layout.cpp
+++ b/src/ui/controls/flex_layout.cpp
@@ -59,11 +59,11 @@ void FlexLayout::SetFlexDirection(FlexDirection direction) {
   render_object_->SetFlexDirection(direction);
 }
 
-void FlexLayout::OnAddChild(Control* child, int position) {
+void FlexLayout::OnAddChild(Control* child, const Index position) {
   render_object_->AddChild(child->GetRenderObject(), position);
 }
 
-void FlexLayout::OnRemoveChild(Control* child, int position) {
+void FlexLayout::OnRemoveChild(Control* child, const Index position) {
   CRU_UNUSED(child)
 
   render_object_->RemoveChild(position);
diff --git a/src/ui/controls/stack_layout.cpp b/src/ui/controls/stack_layout.cpp
index b9abb510..47511f33 100644
--- a/src/ui/controls/stack_layout.cpp
+++ b/src/ui/controls/stack_layout.cpp
@@ -15,11 +15,11 @@ render::RenderObject* StackLayout::GetRenderObject() const {
   return render_object_.get();
 }
 
-void StackLayout::OnAddChild(Control* child, int position) {
+void StackLayout::OnAddChild(Control* child, const Index position) {
   render_object_->AddChild(child->GetRenderObject(), position);
 }
 
-void StackLayout::OnRemoveChild(Control* child, int position) {
+void StackLayout::OnRemoveChild(Control* child, const Index position) {
   CRU_UNUSED(child)
 
   render_object_->RemoveChild(position);
diff --git a/src/ui/layout_control.cpp b/src/ui/layout_control.cpp
index cb71da30..90a825ff 100644
--- a/src/ui/layout_control.cpp
+++ b/src/ui/layout_control.cpp
@@ -7,13 +7,14 @@ LayoutControl::~LayoutControl() {
   for (const auto child : children_) delete child;
 }
 
-void LayoutControl::AddChild(Control* control, const int position) {
-  Expects(control->GetParent() == nullptr);  // The control already has a parent.
+void LayoutControl::AddChild(Control* control, const Index position) {
+  Expects(control->GetParent() ==
+          nullptr);  // The control already has a parent.
   Expects(!dynamic_cast<Window*>(control));  // Can't add a window as child.
-  Expects(position >= 0 ||
-         position <=
-             static_cast<int>(
-                 this->children_.size()));  // The position is out of range.
+  Expects(position >= 0);
+  Expects(position <=
+          static_cast<Index>(
+              this->children_.size()));  // The position is out of range.
 
   children_.insert(this->children_.cbegin() + position, control);
 
@@ -23,11 +24,11 @@ void LayoutControl::AddChild(Control* control, const int position) {
   OnAddChild(control, position);
 }
 
-void LayoutControl::RemoveChild(const int position) {
-  Expects(position >= 0 &&
-         position <
-             static_cast<int>(
-                 this->children_.size()));  // The position is out of range.
+void LayoutControl::RemoveChild(const Index position) {
+  Expects(position >= 0);
+  Expects(position <
+          static_cast<Index>(
+              this->children_.size()));  // The position is out of range.
 
   const auto i = children_.cbegin() + position;
   const auto child = *i;
@@ -40,12 +41,12 @@ void LayoutControl::RemoveChild(const int position) {
   OnRemoveChild(child, position);
 }
 
-void LayoutControl::OnAddChild(Control* child, int position) {
+void LayoutControl::OnAddChild(Control* child, const Index position) {
   CRU_UNUSED(child)
   CRU_UNUSED(position)
 }
 
-void LayoutControl::OnRemoveChild(Control* child, int position) {
+void LayoutControl::OnRemoveChild(Control* child, const Index position) {
   CRU_UNUSED(child)
   CRU_UNUSED(position)
 }
diff --git a/src/ui/render/render_object.cpp b/src/ui/render/render_object.cpp
index c1b1b19b..e329d150 100644
--- a/src/ui/render/render_object.cpp
+++ b/src/ui/render/render_object.cpp
@@ -5,7 +5,7 @@
 #include <algorithm>
 
 namespace cru::ui::render {
-void RenderObject::AddChild(RenderObject* render_object, const int position) {
+void RenderObject::AddChild(RenderObject* render_object, const Index position) {
   Expects(child_mode_ != ChildMode::None);
   Expects(!(child_mode_ == ChildMode::Single && children_.size() > 0));
 
@@ -14,7 +14,7 @@ void RenderObject::AddChild(RenderObject* render_object, const int position) {
   Expects(position >= 0);  // Position index is less than 0.
   Expects(
       position <=
-      static_cast<int>(children_.size()));  // Position index is out of bound.
+      static_cast<Index>(children_.size()));  // Position index is out of bound.
 
   children_.insert(children_.cbegin() + position, render_object);
   render_object->SetParent(this);
@@ -22,9 +22,9 @@ void RenderObject::AddChild(RenderObject* render_object, const int position) {
   OnAddChild(render_object, position);
 }
 
-void RenderObject::RemoveChild(const int position) {
+void RenderObject::RemoveChild(const Index position) {
   Expects(position >= 0);  // Position index is less than 0.
-  Expects(position < static_cast<int>(
+  Expects(position < static_cast<Index>(
                          children_.size()));  // Position index is out of bound.
 
   const auto i = children_.cbegin() + position;
@@ -72,7 +72,7 @@ void RenderObject::OnParentChanged(RenderObject* old_parent,
   CRU_UNUSED(new_parent)
 }
 
-void RenderObject::OnAddChild(RenderObject* new_child, int position) {
+void RenderObject::OnAddChild(RenderObject* new_child, Index position) {
   CRU_UNUSED(new_child)
   CRU_UNUSED(position)
 
@@ -80,7 +80,7 @@ void RenderObject::OnAddChild(RenderObject* new_child, int position) {
   InvalidatePaint();
 }
 
-void RenderObject::OnRemoveChild(RenderObject* removed_child, int position) {
+void RenderObject::OnRemoveChild(RenderObject* removed_child, Index position) {
   CRU_UNUSED(removed_child)
   CRU_UNUSED(position)