summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/tabs.cpp1
-rw-r--r--scene/gui/tree.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/scene/gui/tabs.cpp b/scene/gui/tabs.cpp
index ecce71bdbd..c3e75842c3 100644
--- a/scene/gui/tabs.cpp
+++ b/scene/gui/tabs.cpp
@@ -633,7 +633,6 @@ int Tabs::get_tab_width(int p_idx) const {
x+=tab_bg->get_minimum_size().width;
if (tabs[p_idx].right_button.is_valid()) {
- print_line("has right");
Ref<Texture> rb=tabs[p_idx].right_button;
Size2 bms = rb->get_size();//+get_stylebox("button")->get_minimum_size();
bms.width+=get_constant("hseparation");
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index e81c08dbea..3b25701944 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -1730,6 +1730,8 @@ void Tree::_text_editor_modal_close() {
return;
}
+ if (value_editor->has_point(value_editor->get_local_mouse_pos()))
+ return;
text_editor_enter(text_editor->get_text());
}
@@ -2316,7 +2318,7 @@ bool Tree::edit_selected() {
return false;
Rect2 rect;
- rect.pos.y = get_item_offset(s) - v_scroll->get_val();
+ rect.pos.y = get_item_offset(s) - get_scroll().y;
for(int i=0;i<col;i++) {