diff options
| author | Rémi Verschelde | 2017-06-05 15:52:05 +0200 |
|---|---|---|
| committer | GitHub | 2017-06-05 15:52:05 +0200 |
| commit | f8d7670e82007103573b88f48fe7b7c4addbd66d (patch) | |
| tree | f4802061ca26ae9220ec9a5e9d51d80e1a465faa /scene/main | |
| parent | 075c7d8133e4fde353ab54a255638b0c9a3740a5 (diff) | |
| parent | a3c90b029308eb46b7fd83a0cf7b502ecbd79d55 (diff) | |
| download | godot-f8d7670.tar.gz godot-f8d7670.tar.zst godot-f8d7670.zip | |
Merge pull request #9038 from AlexHolly/rect2-rename-pos
renamed all Rect2.pos to Rect2.position
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/viewport.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index a1d90c143..ec36cf48b 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1310,7 +1310,7 @@ Transform2D Viewport::_get_input_pre_xform() const { if (to_screen_rect != Rect2()) { - pre_xf.elements[2] = -to_screen_rect.pos; + pre_xf.elements[2] = -to_screen_rect.position; pre_xf.scale(size / to_screen_rect.size); } @@ -1473,17 +1473,17 @@ void Viewport::_gui_show_tooltip() { gui.tooltip_label->set_text(tooltip); Rect2 r(gui.tooltip_pos + Point2(10, 10), gui.tooltip_label->get_combined_minimum_size() + ttp->get_minimum_size()); Rect2 vr = gui.tooltip_label->get_viewport_rect(); - if (r.size.x + r.pos.x > vr.size.x) - r.pos.x = vr.size.x - r.size.x; - else if (r.pos.x < 0) - r.pos.x = 0; + if (r.size.x + r.position.x > vr.size.x) + r.position.x = vr.size.x - r.size.x; + else if (r.position.x < 0) + r.position.x = 0; - if (r.size.y + r.pos.y > vr.size.y) - r.pos.y = vr.size.y - r.size.y; - else if (r.pos.y < 0) - r.pos.y = 0; + if (r.size.y + r.position.y > vr.size.y) + r.position.y = vr.size.y - r.size.y; + else if (r.position.y < 0) + r.position.y = 0; - gui.tooltip_popup->set_global_position(r.pos); + gui.tooltip_popup->set_global_position(r.position); gui.tooltip_popup->set_size(r.size); gui.tooltip_popup->raise(); |
