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

Merge pull request #4251 from Paulb23/block_indent_issue_3803

Browse source 
Fixed block indent inconsistency, issue #3803
This commit is contained in:
Rémi Verschelde 2016-04-06 19:39:07 +02:00
commit 3e3f16fefc
3 changed files with 67 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
scene/gui/text_edit.cpp
View file

@ -1244,6 +1244,66 @@ void TextEdit::backspace_at_cursor() {
}
void TextEdit::indent_selection_right() {
if (!is_selection_active()) {
return;
}
begin_complex_operation();
int start_line = get_selection_from_line();
int end_line = get_selection_to_line();
// ignore if the cursor is not past the first column
if (get_selection_to_column() == 0) {
end_line--;
}
for (int i = start_line; i <= end_line; i++) {
String line_text = get_line(i);
line_text = '\t' + line_text;
set_line(i, line_text);
}
// fix selection being off by one on the last line
selection.to_column++;
end_complex_operation();
update();
}
void TextEdit::indent_selection_left() {
if (!is_selection_active()) {
return;
}
begin_complex_operation();
int start_line = get_selection_from_line();
int end_line = get_selection_to_line();
// ignore if the cursor is not past the first column
if (get_selection_to_column() == 0) {
end_line--;
}
String last_line_text = get_line(end_line);
for (int i = start_line; i <= end_line; i++) {
String line_text = get_line(i);
if (line_text.begins_with("\t")) {
line_text = line_text.substr(1, line_text.length());
set_line(i, line_text);
} else if (line_text.begins_with(" ")) {
line_text = line_text.substr(4, line_text.length());
set_line(i, line_text);
}
}
// fix selection being off by one on the last line
if (last_line_text != get_line(end_line) && selection.to_column > 0) {
selection.to_column--;
}
end_complex_operation();
update();
}
void TextEdit::_get_mouse_pos(const Point2i& p_mouse, int &r_row, int &r_col) const {
@ -1671,51 +1731,13 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
switch(k.scancode) {
case KEY_TAB: {
String txt = _base_get_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
String prev_txt=txt;
if (k.mod.shift) {
for(int i=0;i<txt.length();i++) {
if (((i>0 && txt[i-1]=='\n') || (i==0 /*&& selection.from_column==0*/)) && (txt[i]=='\t' || txt[i]==' ')) {
txt.remove(i);
//i--;
}
}
indent_selection_left();
} else {
for(int i=0;i<txt.length();i++) {
if (((i>0 && txt[i-1]=='\n') || (i==0 /*&& selection.from_column==0*/))) {
txt=txt.insert(i,"\t");
//i--;
}
}
indent_selection_right();
}
if (txt!=prev_txt) {
int sel_line=selection.from_line;
int sel_column=selection.from_column;
cursor_set_line(selection.from_line);
cursor_set_column(selection.from_column);
begin_complex_operation();
_remove_text(selection.from_line,selection.from_column,selection.to_line,selection.to_column);
_insert_text_at_cursor(txt);
end_complex_operation();
selection.active=true;
selection.from_column=sel_column;
selection.from_line=sel_line;
selection.to_column=cursor.column;
selection.to_line=cursor.line;
update();
}
dobreak=true;
accept_event();
} break;
case KEY_X:
case KEY_C:

3
scene/gui/text_edit.h
View file

@ -334,6 +334,9 @@ public:
void set_line(int line, String new_text);
void backspace_at_cursor();
void indent_selection_left();
void indent_selection_right();
inline void set_scroll_pass_end_of_file(bool p_enabled) {
scroll_past_end_of_file_enabled = p_enabled;
update();

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

@ -1161,24 +1161,7 @@ void ScriptEditor::_menu_option(int p_option) {
tx->begin_complex_operation();
if (tx->is_selection_active())
{
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);
// begins with tab
if (line_text.begins_with("\t"))
{
line_text = line_text.substr(1, line_text.length());
tx->set_line(i, line_text);
}
// begins with 4 spaces
else if (line_text.begins_with(" "))
{
line_text = line_text.substr(4, line_text.length());
tx->set_line(i, line_text);
}
}
tx->indent_selection_left();
}
else
{
@ -1212,14 +1195,7 @@ void ScriptEditor::_menu_option(int p_option) {
tx->begin_complex_operation();
if (tx->is_selection_active())
{
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);
line_text = '\t' + line_text;
tx->set_line(i, line_text);
}
tx->indent_selection_right();
}
else
{