summaryrefslogtreecommitdiffstats
path: root/scene/gui/button_array.cpp
diff options
context:
space:
mode:
authoralexholly <alexander.holland@live.de>2017-06-04 00:25:13 +0200
committeralexholly <alexander.holland@live.de>2017-06-04 02:09:17 +0200
commita3c90b029308eb46b7fd83a0cf7b502ecbd79d55 (patch)
tree37aaaa84b53d962b441de0683a502e189cb371bb /scene/gui/button_array.cpp
parent69bec86028f87307e549d7a2f49bbb7e2b1f3771 (diff)
downloadredot-engine-a3c90b029308eb46b7fd83a0cf7b502ecbd79d55.tar.gz
renamed all Rect2.pos to Rect2.position
Diffstat (limited to 'scene/gui/button_array.cpp')
-rw-r--r--scene/gui/button_array.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/button_array.cpp b/scene/gui/button_array.cpp
index 670246a200..1616272e66 100644
--- a/scene/gui/button_array.cpp
+++ b/scene/gui/button_array.cpp
@@ -236,8 +236,8 @@ void ButtonArray::_notification(int p_what) {
}
Rect2 r;
- r.pos[orientation] = ofs;
- r.pos[!orientation] = 0;
+ r.position[orientation] = ofs;
+ r.position[!orientation] = 0;
r.size[orientation] = s;
r.size[!orientation] = op_size;
@@ -272,10 +272,10 @@ void ButtonArray::_notification(int p_what) {
Point2 text_ofs = ((r.size - ssize - sbsize) / 2.0 + Point2(0, f->get_ascent())).floor() + sbofs;
if (buttons[i].icon.is_valid()) {
- draw_texture(buttons[i].icon, r.pos + Point2(text_ofs.x, Math::floor((r.size.height - buttons[i].icon->get_height()) / 2.0)));
+ draw_texture(buttons[i].icon, r.position + Point2(text_ofs.x, Math::floor((r.size.height - buttons[i].icon->get_height()) / 2.0)));
text_ofs.x += buttons[i].icon->get_width() + icon_sep;
}
- draw_string(f, text_ofs + r.pos, buttons[i].xl_text, c);
+ draw_string(f, text_ofs + r.position, buttons[i].xl_text, c);
buttons[i]._pos_cache = ofs;
buttons[i]._size_cache = s;