From 11a5ed508b1cbde61a4d9dd4f469e86e74667623 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Sun, 21 Sep 2014 01:43:42 -0300
Subject: Fixed too many little issues, check the issues closed today.

---
 scene/gui/tree.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'scene/gui/tree.cpp')

diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index 25f04379e..9084983a4 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -3009,20 +3009,23 @@ TreeItem* Tree::_find_item_at_pos(TreeItem*p_item, const Point2& p_pos,int& r_co
 String Tree::get_tooltip(const Point2& p_pos) const {
 
 	if (root) {
+
 		Point2 pos=p_pos;
 		pos -= cache.bg->get_offset();
 		pos.y-=_get_title_button_height();
 		if (pos.y<0)
 			return Control::get_tooltip(p_pos);
 
-		pos.x+=h_scroll->get_val();
-		pos.y+=v_scroll->get_val();
+		if (h_scroll->is_visible())
+			pos.x+=h_scroll->get_val();
+		if (v_scroll->is_visible())
+			pos.y+=v_scroll->get_val();
 
 		int col,h;
 		TreeItem *it = _find_item_at_pos(root,pos,col,h);
 
-		if (it) {
 
+		if (it) {
 
 			String ret;
 			if (it->get_tooltip(col)=="")
-- 
cgit v1.2.3-70-g09d2