asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #76029 from YuriSizov/control-we-are-not-the-same-you-and-i

Browse source 
Use Point2 consistently in Control methods
This commit is contained in:
Yuri Sizov 2023-04-17 14:30:26 +02:00 committed by GitHub
commit 055ee1276f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scene/gui/control.cpp
View file

@ -765,7 +765,7 @@ void Control::set_anchor_and_offset(Side p_side, real_t p_anchor, real_t p_pos,
set_offset(p_side, p_pos); set_offset(p_side, p_pos);
} }
void Control::set_begin(const Size2 &p_point) { void Control::set_begin(const Point2 &p_point) {
ERR_FAIL_COND(!isfinite(p_point.x) || !isfinite(p_point.y)); ERR_FAIL_COND(!isfinite(p_point.x) || !isfinite(p_point.y));
if (data.offset[0] == p_point.x && data.offset[1] == p_point.y) { if (data.offset[0] == p_point.x && data.offset[1] == p_point.y) {
return; return;
@ -776,11 +776,11 @@ void Control::set_begin(const Size2 &p_point) {
_size_changed(); _size_changed();
} }
Size2 Control::get_begin() const { Point2 Control::get_begin() const {
return Size2(data.offset[0], data.offset[1]); return Point2(data.offset[0], data.offset[1]);
} }
void Control::set_end(const Size2 &p_point) { void Control::set_end(const Point2 &p_point) {
if (data.offset[2] == p_point.x && data.offset[3] == p_point.y) { if (data.offset[2] == p_point.x && data.offset[3] == p_point.y) {
return; return;
} }
@ -790,8 +790,8 @@ void Control::set_end(const Size2 &p_point) {
_size_changed(); _size_changed();
} }
Size2 Control::get_end() const { Point2 Control::get_end() const {
return Size2(data.offset[2], data.offset[3]); return Point2(data.offset[2], data.offset[3]);
} }
void Control::set_h_grow_direction(GrowDirection p_direction) { void Control::set_h_grow_direction(GrowDirection p_direction) {
@ -1358,11 +1358,11 @@ void Control::set_grow_direction_preset(LayoutPreset p_preset) {
/// Manual positioning. /// Manual positioning.
void Control::_set_position(const Size2 &p_point) { void Control::_set_position(const Point2 &p_point) {
set_position(p_point); set_position(p_point);
} }
void Control::set_position(const Size2 &p_point, bool p_keep_offsets) { void Control::set_position(const Point2 &p_point, bool p_keep_offsets) {
if (p_keep_offsets) { if (p_keep_offsets) {
_compute_anchors(Rect2(p_point, data.size_cache), data.offset, data.anchor); _compute_anchors(Rect2(p_point, data.size_cache), data.offset, data.anchor);
} else { } else {