godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-02-24 22:36:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #102992 from Giganzo/anchor-show

Browse Source 
Add highlight to used anchor preset in ControlEditorToolbar popup
This commit is contained in:
Thaddeus Crews
2026-02-23 11:58:48 -06:00
parent 8953cea927 84bc552487
commit 4af7648288
2 changed files with 138 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
editor/scene/gui/control_editor_plugin.cpp
View File

@@ -586,7 +586,7 @@ void ControlEditorPresetPicker::_add_row_button(HBoxContainer *p_row, const int
b->set_custom_minimum_size(Size2i(36, 36) * EDSCALE);
b->set_icon_alignment(HORIZONTAL_ALIGNMENT_CENTER);
b->set_tooltip_text(p_name);
b->set_flat(true);
b->set_theme_type_variation(SceneStringName(FlatButton));
p_row->add_child(b);
b->connect(SceneStringName(pressed), callable_mp(this, &ControlEditorPresetPicker::_preset_button_pressed).bind(p_preset));
@@ -599,8 +599,32 @@ void ControlEditorPresetPicker::_add_separator(BoxContainer *p_box, Separator *p
p_box->add_child(p_separator);
}
void ControlEditorPresetPicker::_update_preset_button_state(int p_preset) {
for (KeyValue<int, Button *> &E : preset_buttons) {
Button *button = E.value;
if (!button) {
continue;
}
button->begin_bulk_theme_override();
if (E.key == p_preset) {
const Color pressed_color = get_theme_color(SNAME("icon_pressed_color"), "Button");
button->add_theme_color_override(SNAME("icon_normal_color"), pressed_color);
button->add_theme_color_override(SNAME("icon_hover_color"), pressed_color);
} else {
button->remove_theme_color_override(SNAME("icon_normal_color"));
button->remove_theme_color_override(SNAME("icon_hover_color"));
}
button->end_bulk_theme_override();
}
}
void AnchorPresetPicker::_preset_button_pressed(const int p_preset) {
emit_signal("anchors_preset_selected", p_preset);
_update_preset_button_state(p_preset);
}
void AnchorPresetPicker::_notification(int p_notification) {
@@ -631,6 +655,10 @@ void AnchorPresetPicker::_notification(int p_notification) {
}
}
void AnchorPresetPicker::set_selected_preset(int p_preset) {
_update_preset_button_state(p_preset);
}
void AnchorPresetPicker::_bind_methods() {
ADD_SIGNAL(MethodInfo("anchors_preset_selected", PropertyInfo(Variant::INT, "preset")));
}
@@ -694,6 +722,7 @@ void SizeFlagPresetPicker::_preset_button_pressed(const int p_preset) {
}
emit_signal("size_flags_selected", flags);
_update_preset_button_state(p_preset);
}
void SizeFlagPresetPicker::_expand_button_pressed() {
@@ -715,6 +744,10 @@ void SizeFlagPresetPicker::set_allowed_flags(Vector<SizeFlags> &p_flags) {
}
}
void SizeFlagPresetPicker::set_selected_preset(int p_preset) {
_update_preset_button_state(p_preset);
}
void SizeFlagPresetPicker::set_expand_flag(bool p_expand) {
expand_button->set_pressed(p_expand);
}
@@ -937,6 +970,99 @@ List<Control *> ControlEditorToolbar::_get_edited_controls() {
return selection;
}
void ControlEditorToolbar::_update_anchor_selection_ui(bool p_pressed) {
if (!p_pressed) {
return;
}
int nb_valid_controls = 0;
int first_preset = -1;
bool all_preset_same = true;
const List<Node *> &selection = editor_selection->get_top_selected_node_list();
for (Node *E : selection) {
Control *control = Object::cast_to<Control>(E);
if (!control) {
continue;
}
if (Object::cast_to<Container>(control->get_parent())) {
continue;
}
nb_valid_controls++;
const Dictionary &state = control->_edit_get_state();
const int lm = state["layout_mode"];
if (lm != LayoutMode::LAYOUT_MODE_ANCHORS && lm != LayoutMode::LAYOUT_MODE_UNCONTROLLED) {
all_preset_same = false;
break;
}
const int preset = state["anchors_layout_preset"];
if (first_preset == -1) {
first_preset = preset;
} else if (preset != first_preset) {
all_preset_same = false;
break;
}
}
anchors_picker->set_selected_preset((all_preset_same && nb_valid_controls > 0) ? first_preset : -1);
}
void ControlEditorToolbar::_update_container_sizing_selection_ui(bool p_pressed) {
if (!p_pressed) {
return;
}
bool all_h_shrink_fill_same = true;
bool all_v_shrink_fill_same = true;
bool all_h_expand = true;
bool all_v_expand = true;
int first_h_flags = -1;
int first_v_flags = -1;
const List<Node *> &selection = editor_selection->get_top_selected_node_list();
for (Node *E : selection) {
Control *control = Object::cast_to<Control>(E);
if (!control) {
continue;
}
const int h_flags = control->get_h_size_flags();
const int v_flags = control->get_v_size_flags();
const int h_shrink_fill = h_flags & ~(Control::SIZE_EXPAND);
const int v_shrink_fill = v_flags & ~(Control::SIZE_EXPAND);
if (first_h_flags == -1) {
first_h_flags = h_shrink_fill;
} else if (h_shrink_fill != first_h_flags) {
all_h_shrink_fill_same = false;
}
if (first_v_flags == -1) {
first_v_flags = v_shrink_fill;
} else if (v_shrink_fill != first_v_flags) {
all_v_shrink_fill_same = false;
}
if (!(h_flags & Control::SIZE_EXPAND)) {
all_h_expand = false;
}
if (!(v_flags & Control::SIZE_EXPAND)) {
all_v_expand = false;
}
}
container_h_picker->set_selected_preset(all_h_shrink_fill_same ? first_h_flags : -1);
container_v_picker->set_selected_preset(all_v_shrink_fill_same ? first_v_flags : -1);
container_h_picker->set_expand_flag(all_h_expand);
container_v_picker->set_expand_flag(all_v_expand);
}
void ControlEditorToolbar::_selection_changed() {
// Update toolbar visibility.
bool has_controls = false;
@@ -1050,30 +1176,6 @@ void ControlEditorToolbar::_selection_changed() {
container_h_picker->set_allowed_flags(allowed_all_flags);
container_v_picker->set_allowed_flags(allowed_all_flags);
}
// Update expand toggles.
int nb_valid_controls = 0;
int nb_h_expand = 0;
int nb_v_expand = 0;
const List<Node *> &selection = editor_selection->get_top_selected_node_list();
for (Node *E : selection) {
Control *control = Object::cast_to<Control>(E);
if (!control) {
continue;
}
nb_valid_controls++;
if (control->get_h_size_flags() & Control::SIZE_EXPAND) {
nb_h_expand++;
}
if (control->get_v_size_flags() & Control::SIZE_EXPAND) {
nb_v_expand++;
}
}
container_h_picker->set_expand_flag(nb_valid_controls == nb_h_expand);
container_v_picker->set_expand_flag(nb_valid_controls == nb_v_expand);
} else {
containers_button->set_visible(false);
}
@@ -1093,12 +1195,13 @@ ControlEditorToolbar::ControlEditorToolbar() {
// Anchor and offset tools.
anchors_button = memnew(ControlEditorPopupButton);
anchors_button->set_tooltip_text(TTR("Presets for the anchor and offset values of a Control node."));
anchors_button->connect(SceneStringName(toggled), callable_mp(this, &ControlEditorToolbar::_update_anchor_selection_ui));
add_child(anchors_button);
Label *anchors_label = memnew(Label);
anchors_label->set_text(TTR("Anchor preset"));
anchors_button->get_popup_hbox()->add_child(anchors_label);
AnchorPresetPicker *anchors_picker = memnew(AnchorPresetPicker);
anchors_picker = memnew(AnchorPresetPicker);
anchors_picker->set_h_size_flags(SIZE_SHRINK_CENTER);
anchors_button->get_popup_hbox()->add_child(anchors_picker);
anchors_picker->connect("anchors_preset_selected", callable_mp(this, &ControlEditorToolbar::_anchors_preset_selected));
@@ -1123,6 +1226,7 @@ ControlEditorToolbar::ControlEditorToolbar() {
// Container tools.
containers_button = memnew(ControlEditorPopupButton);
containers_button->set_tooltip_text(TTR("Sizing settings for children of a Container node."));
containers_button->connect(SceneStringName(toggled), callable_mp(this, &ControlEditorToolbar::_update_container_sizing_selection_ui));
add_child(containers_button);
Label *container_h_label = memnew(Label);

8
editor/scene/gui/control_editor_plugin.h
View File

@@ -170,6 +170,7 @@ protected:
void _add_row_button(HBoxContainer *p_row, const int p_preset, const String &p_name);
void _add_separator(BoxContainer *p_box, Separator *p_separator);
void _update_preset_button_state(int p_preset);
};
class AnchorPresetPicker : public ControlEditorPresetPicker {
@@ -182,6 +183,8 @@ protected:
static void _bind_methods();
public:
void set_selected_preset(int p_preset);
AnchorPresetPicker();
};
@@ -201,6 +204,7 @@ protected:
public:
void set_allowed_flags(Vector<SizeFlags> &p_flags);
void set_selected_preset(int p_preset);
void set_expand_flag(bool p_expand);
SizeFlagPresetPicker(bool p_vertical);
@@ -215,6 +219,8 @@ class ControlEditorToolbar : public HBoxContainer {
ControlEditorPopupButton *containers_button = nullptr;
Button *anchor_mode_button = nullptr;
AnchorPresetPicker *anchors_picker = nullptr;
SizeFlagPresetPicker *container_h_picker = nullptr;
SizeFlagPresetPicker *container_v_picker = nullptr;
@@ -225,6 +231,8 @@ class ControlEditorToolbar : public HBoxContainer {
void _anchor_mode_toggled(bool p_status);
void _container_flags_selected(int p_flags, bool p_vertical);
void _expand_flag_toggled(bool p_expand, bool p_vertical);
void _update_anchor_selection_ui(bool p_pressed);
void _update_container_sizing_selection_ui(bool p_pressed);
Vector2 _position_to_anchor(const Control *p_control, Vector2 position);
bool _is_node_locked(const Node *p_node);