asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix crash in editor when using alt+arrows to indent, thanks adolson and romulox_x

Browse source
This commit is contained in:
Juan Linietsky 2015-05-05 00:17:22 -03:00
parent cb93e064a9
commit 74b0e0c296
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scene/gui/text_edit.cpp
View file

@ -3494,6 +3494,9 @@ void TextEdit::set_line(int line, String new_text)
return;
_remove_text(line, 0, line, text[line].length());
_insert_text(line, 0, new_text);
if (cursor.line==line) {
cursor.column=MIN(cursor.column,new_text.length());
}
}
void TextEdit::insert_at(const String &p_text, int at)

24
tools/editor/plugins/script_editor_plugin.cpp
View file

@ -816,11 +816,11 @@ void ScriptEditor::_menu_option(int p_option) {
if (scr.is_null())
return;
int begin, end;
begin = tx->get_selection_from_line();
if (tx->is_selection_active())
{
end = tx->get_selection_to_line();
int begin = tx->get_selection_from_line();
int end = tx->get_selection_to_line();
for (int i = begin; i <= end; i++)
{
String line_text = tx->get_line(i);
@ -840,7 +840,7 @@ void ScriptEditor::_menu_option(int p_option) {
}
else
{
begin = tx->cursor_get_line();
int begin = tx->cursor_get_line();
String line_text = tx->get_line(begin);
// begins with tab
if (line_text.begins_with("\t"))
@ -866,11 +866,10 @@ void ScriptEditor::_menu_option(int p_option) {
if (scr.is_null())
return;
int begin, end;
begin = tx->get_selection_from_line();
if (tx->is_selection_active())
{
end = tx->get_selection_to_line();
int begin = tx->get_selection_from_line();
int end = tx->get_selection_to_line();
for (int i = begin; i <= end; i++)
{
String line_text = tx->get_line(i);
@ -880,7 +879,7 @@ void ScriptEditor::_menu_option(int p_option) {
}
else
{
begin = tx->cursor_get_line();
int begin = tx->cursor_get_line();
String line_text = tx->get_line(begin);
line_text = '\t' + line_text;
tx->set_line(begin, line_text);
@ -913,11 +912,12 @@ void ScriptEditor::_menu_option(int p_option) {
if (scr.is_null())
return;
int begin, end;
begin = tx->get_selection_from_line();
if (tx->is_selection_active())
{
end = tx->get_selection_to_line();
int begin = tx->get_selection_from_line();
int end = tx->get_selection_to_line();
for (int i = begin; i <= end; i++)
{
String line_text = tx->get_line(i);
@ -931,7 +931,7 @@ void ScriptEditor::_menu_option(int p_option) {
}
else
{
begin = tx->cursor_get_line();
int begin = tx->cursor_get_line();
String line_text = tx->get_line(begin);
if (line_text.begins_with("#"))