gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-15 22:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15610 from groud/fix_node_resize_setting_anchors

Browse source 
Fixes nodes being resized or moved when changing an anchor
This commit is contained in:
Rémi Verschelde 2018-01-11 23:46:50 +01:00 committed by GitHub
parent e3f02b1a1b 00473e0897
commit c1c17b04bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scene/gui/control.cpp
View file

@ -1357,24 +1357,32 @@ float Control::_a2s(float p_val, float p_anchor, float p_range) const {
} }
void Control::set_anchor(Margin p_margin, float p_anchor, bool p_keep_margin, bool p_push_opposite_anchor) { void Control::set_anchor(Margin p_margin, float p_anchor, bool p_keep_margin, bool p_push_opposite_anchor) {
bool pushed = false; float parent_range = _get_parent_range((p_margin == MARGIN_LEFT || p_margin == MARGIN_RIGHT) ? 0 : 1);
float previous_margin_pos = data.margin[p_margin] + data.anchor[p_margin] * parent_range;
float previous_opposite_margin_pos = data.margin[(p_margin + 2) % 4] + data.anchor[(p_margin + 2) % 4] * parent_range;
data.anchor[p_margin] = CLAMP(p_anchor, 0.0, 1.0); data.anchor[p_margin] = CLAMP(p_anchor, 0.0, 1.0);
if (((p_margin == MARGIN_LEFT || p_margin == MARGIN_TOP) && data.anchor[p_margin] > data.anchor[(p_margin + 2) % 4]) || if (((p_margin == MARGIN_LEFT || p_margin == MARGIN_TOP) && data.anchor[p_margin] > data.anchor[(p_margin + 2) % 4]) ||
((p_margin == MARGIN_RIGHT || p_margin == MARGIN_BOTTOM) && data.anchor[p_margin] < data.anchor[(p_margin + 2) % 4])) { ((p_margin == MARGIN_RIGHT || p_margin == MARGIN_BOTTOM) && data.anchor[p_margin] < data.anchor[(p_margin + 2) % 4])) {
if (p_push_opposite_anchor) { if (p_push_opposite_anchor) {
data.anchor[(p_margin + 2) % 4] = data.anchor[p_margin]; data.anchor[(p_margin + 2) % 4] = data.anchor[p_margin];
pushed = true;
} else { } else {
data.anchor[p_margin] = data.anchor[(p_margin + 2) % 4]; data.anchor[p_margin] = data.anchor[(p_margin + 2) % 4];
} }
} }
if (is_inside_tree()) { if (!p_keep_margin) {
if (p_keep_margin) { data.margin[p_margin] = _s2a(previous_margin_pos, data.anchor[p_margin], parent_range);
_size_changed(); if (p_push_opposite_anchor) {
data.margin[(p_margin + 2) % 4] = _s2a(previous_opposite_margin_pos, data.anchor[(p_margin + 2) % 4], parent_range);
} }
} }
if (is_inside_tree()) {
_size_changed();
}
update(); update();
_change_notify(); _change_notify();
} }