godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/godotengine/godot

Browse Source
This commit is contained in:
Juan Linietsky 2015-12-04 10:19:58 -03:00
commit bb392bde16
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/gui/rich_text_label.cpp
View File

@ -1504,7 +1504,6 @@ Error RichTextLabel::append_bbcode(const String& p_bbcode) {
void RichTextLabel::scroll_to_line(int p_line) { void RichTextLabel::scroll_to_line(int p_line) {
p_line -= 1;
ERR_FAIL_INDEX(p_line,lines.size()); ERR_FAIL_INDEX(p_line,lines.size());
_validate_line_caches(); _validate_line_caches();
vscroll->set_val(lines[p_line].height_accum_cache-lines[p_line].height_cache); vscroll->set_val(lines[p_line].height_accum_cache-lines[p_line].height_cache);
@ -1572,11 +1571,8 @@ bool RichTextLabel::search(const String& p_string,bool p_from_selection) {
} }
if (line > 1) { line-=2;
line-=1; scroll_to_line(line<0?0:line);
}
scroll_to_line(line);
return true; return true;
} }

4
tools/editor/editor_node.cpp
View File

@ -1563,6 +1563,10 @@ void EditorNode::_edit_current() {
scene_tree_dock->set_selected(NULL); scene_tree_dock->set_selected(NULL);
property_editor->edit( NULL ); property_editor->edit( NULL );
object_menu->set_disabled(true); object_menu->set_disabled(true);
if (editor_plugin_over)
editor_plugin_over->make_visible(false);
return; return;
} }