Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use as_sortable_control() in SplitContainer #91728

Merged
merged 1 commit into from
May 14, 2024
Merged

Use as_sortable_control() in SplitContainer #91728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions editor/editor_dock_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,13 @@ void DockSplitContainer::_update_visibility() {
}
is_updating = true;
bool any_visible = false;
for (int i = 0; i < 2; i++) {
Control *split = get_containable_child(i);
if (split && split->is_visible()) {
any_visible = true;
break;
for (int i = 0; i < get_child_count(false); i++) {
Control *c = Object::cast_to<Control>(get_child(i, false));
if (!c || !c->is_visible() || c->is_set_as_top_level()) {
continue;
}
any_visible = c;
break;
}
set_visible(any_visible);
is_updating = false;
Expand All @@ -74,10 +75,13 @@ void DockSplitContainer::add_child_notify(Node *p_child) {
SplitContainer::add_child_notify(p_child);

Control *child_control = nullptr;
for (int i = 0; i < 2; i++) {
Control *split = get_containable_child(i);
if (p_child == split) {
child_control = split;
for (int i = 0; i < get_child_count(false); i++) {
Control *c = Object::cast_to<Control>(get_child(i, false));
if (!c || c->is_set_as_top_level()) {
KoBeWi marked this conversation as resolved.
Show resolved Hide resolved
continue;
}
if (p_child == c) {
child_control = c;
break;
}
}
Expand All @@ -93,10 +97,13 @@ void DockSplitContainer::remove_child_notify(Node *p_child) {
SplitContainer::remove_child_notify(p_child);

Control *child_control = nullptr;
for (int i = 0; i < 2; i++) {
Control *split = get_containable_child(i);
if (p_child == split) {
child_control = split;
for (int i = 0; i < get_child_count(false); i++) {
Control *c = Object::cast_to<Control>(get_child(i, false));
if (!c || c->is_set_as_top_level()) {
continue;
}
if (p_child == c) {
child_control = c;
break;
}
}
Expand Down
22 changes: 11 additions & 11 deletions scene/gui/split_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void SplitContainerDragger::gui_input(const Ref<InputEvent> &p_event) {

SplitContainer *sc = Object::cast_to<SplitContainer>(get_parent());

if (sc->collapsed || !sc->get_containable_child(0) || !sc->get_containable_child(1) || sc->dragger_visibility != SplitContainer::DRAGGER_VISIBLE) {
if (sc->collapsed || !sc->_get_sortable_child(0) || !sc->_get_sortable_child(1) || sc->dragger_visibility != SplitContainer::DRAGGER_VISIBLE) {
return;
}

Expand Down Expand Up @@ -122,12 +122,12 @@ void SplitContainerDragger::_notification(int p_what) {
}
}

Control *SplitContainer::get_containable_child(int p_idx) const {
Control *SplitContainer::_get_sortable_child(int p_idx) const {
int idx = 0;

for (int i = 0; i < get_child_count(false); i++) {
Control *c = Object::cast_to<Control>(get_child(i, false));
if (!c || !c->is_visible() || c->is_set_as_top_level()) {
Control *c = as_sortable_control(get_child(i, false));
if (!c) {
continue;
}

Expand All @@ -154,8 +154,8 @@ Ref<Texture2D> SplitContainer::_get_grabber_icon() const {
}

void SplitContainer::_compute_middle_sep(bool p_clamp) {
Control *first = get_containable_child(0);
Control *second = get_containable_child(1);
Control *first = _get_sortable_child(0);
Control *second = _get_sortable_child(1);

// Determine expanded children.
bool first_expanded = (vertical ? first->get_v_size_flags() : first->get_h_size_flags()) & SIZE_EXPAND;
Expand Down Expand Up @@ -196,8 +196,8 @@ void SplitContainer::_compute_middle_sep(bool p_clamp) {
}

void SplitContainer::_resort() {
Control *first = get_containable_child(0);
Control *second = get_containable_child(1);
Control *first = _get_sortable_child(0);
Control *second = _get_sortable_child(1);

// If we have only one element.
if (!first || !second) {
Expand Down Expand Up @@ -258,7 +258,7 @@ Size2 SplitContainer::get_minimum_size() const {
int sep = (dragger_visibility != DRAGGER_HIDDEN_COLLAPSED) ? MAX(theme_cache.separation, vertical ? g->get_height() : g->get_width()) : 0;

for (int i = 0; i < 2; i++) {
if (!get_containable_child(i)) {
if (!_get_sortable_child(i)) {
break;
}

Expand All @@ -270,7 +270,7 @@ Size2 SplitContainer::get_minimum_size() const {
}
}

Size2 ms = get_containable_child(i)->get_combined_minimum_size();
Size2 ms = _get_sortable_child(i)->get_combined_minimum_size();

if (vertical) {
minimum.height += ms.height;
Expand Down Expand Up @@ -322,7 +322,7 @@ int SplitContainer::get_split_offset() const {
}

void SplitContainer::clamp_split_offset() {
if (!get_containable_child(0) || !get_containable_child(1)) {
if (!_get_sortable_child(0) || !_get_sortable_child(1)) {
return;
}

Expand Down
3 changes: 1 addition & 2 deletions scene/gui/split_container.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,11 @@ class SplitContainer : public Container {
Ref<Texture2D> _get_grabber_icon() const;
void _compute_middle_sep(bool p_clamp);
void _resort();
Control *_get_sortable_child(int p_idx) const;

protected:
bool is_fixed = false;

Control *get_containable_child(int p_idx) const;

void _notification(int p_what);
void _validate_property(PropertyInfo &p_property) const;
static void _bind_methods();
Expand Down
Loading