zhangyiss/FTXUI
1
0
Fork 0
mirror of https://github.com/ArthurSonzogni/FTXUI.git synced 2025-11-04 05:28:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deduplicate logic in ComponentBase members (#162)

Browse Source 
- Invoke DetachAllChildren from ~ComponentBase
- Define Focused using Active
- Compact TakeFocus loop code
- const-correctness for Parent, Active and Focused
This commit is contained in:
Tushar Maheshwari
2021-07-21 04:07:44 +05:30
committed by GitHub
parent 09805e5e86
commit 7f95d59954
2 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/ftxui/component/component_base.hpp
View File

@@ -26,7 +26,7 @@ class ComponentBase {
virtual ~ComponentBase(); virtual ~ComponentBase();
// Component hierarchy: // Component hierarchy:
ComponentBase* Parent(); ComponentBase* Parent() const;
Component& ChildAt(size_t i); Component& ChildAt(size_t i);
size_t ChildCount() const; size_t ChildCount() const;
void Add(Component children); void Add(Component children);
@@ -52,9 +52,9 @@ class ComponentBase {
virtual Component ActiveChild(); virtual Component ActiveChild();
// Whether this is the active child of its parent. // Whether this is the active child of its parent.
bool Active(); bool Active() const;
// Whether all the ancestors are active. // Whether all the ancestors are active.
bool Focused(); bool Focused() const;
// Make the |child| to be the "active" one. // Make the |child| to be the "active" one.
virtual void SetActiveChild(ComponentBase* child); virtual void SetActiveChild(ComponentBase* child);
@@ -66,7 +66,7 @@ class ComponentBase {
protected: protected:
CapturedMouse CaptureMouse(const Event& event); CapturedMouse CaptureMouse(const Event& event);
std::vector<Component> children_; Components children_;
private: private:
ComponentBase* parent_ = nullptr; ComponentBase* parent_ = nullptr;

25
src/ftxui/component/component.cpp
View File

@@ -18,15 +18,14 @@ class CaptureMouseImpl : public CapturedMouseInterface {};
} // namespace } // namespace
ComponentBase::~ComponentBase() { ComponentBase::~ComponentBase() {
while (children_.size() != 0) DetachAllChildren();
children_.back()->Detach();
} }
/// @brief Return the parent ComponentBase, or nul if any. /// @brief Return the parent ComponentBase, or nul if any.
/// @see Detach /// @see Detach
/// @see Parent /// @see Parent
/// @ingroup component /// @ingroup component
ComponentBase* ComponentBase::Parent() { ComponentBase* ComponentBase::Parent() const {
return parent_; return parent_;
} }
@@ -109,7 +108,7 @@ Component ComponentBase::ActiveChild() {
/// @brief Returns if the element if the currently active child of its parent. /// @brief Returns if the element if the currently active child of its parent.
/// @ingroup component /// @ingroup component
bool ComponentBase::Active() { bool ComponentBase::Active() const {
return !parent_ || parent_->ActiveChild().get() == this; return !parent_ || parent_->ActiveChild().get() == this;
} }
@@ -117,16 +116,12 @@ bool ComponentBase::Active() {
/// True when the ComponentBase is focused by the user. An element is Focused /// True when the ComponentBase is focused by the user. An element is Focused
/// when it is with all its ancestors the ActiveChild() of their parents. /// when it is with all its ancestors the ActiveChild() of their parents.
/// @ingroup component /// @ingroup component
bool ComponentBase::Focused() { bool ComponentBase::Focused() const {
ComponentBase* current = this; auto current = this;
for (;;) { while (current && current->Active()) {
ComponentBase* parent = current->parent_; current = current->parent_;
if (!parent)
return true;
if (parent->ActiveChild().get() != current)
return false;
current = parent;
} }
return !current;
} }
/// @brief Make the |child| to be the "active" one. /// @brief Make the |child| to be the "active" one.
@@ -145,11 +140,9 @@ void ComponentBase::SetActiveChild(Component child) {
/// @ingroup component /// @ingroup component
void ComponentBase::TakeFocus() { void ComponentBase::TakeFocus() {
ComponentBase* child = this; ComponentBase* child = this;
ComponentBase* parent = parent_; while (ComponentBase* parent = child->parent_) {
while (parent) {
parent->SetActiveChild(child); parent->SetActiveChild(child);
child = parent; child = parent;
parent = parent->parent_;
} }
} }