birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: jumps disordered (Go to Line,Transpose Lines UP,Transpose Lines (#6210)

Browse Source 
Down,Comment Selected Block and UnComment Selected Block)

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>

Co-authored-by: Tobias Alexander Franke <tobias.alexander.franke@huawei.com>
This commit is contained in:
tjmgd
2021-12-22 18:54:49 +00:00
committed by GitHub
parent 454d6405b0
commit 38bbf9659e
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/LuaIDE/Source/LUA/LUAEditorMainWindow.cpp
+1 -1
View File
@@ -1280,7 +1280,7 @@ namespace LUAEditor
// go to that line of the selected file.
lineNumber = dlg.getLineNumber();
currentView->SetCursorPosition(lineNumber - 1, 0);
currentView->SetCursorPosition(lineNumber, 0);
}
}
Code/Tools/LuaIDE/Source/LUA/LUAEditorView.cpp
+22 -11
View File
@@ -964,9 +964,11 @@ namespace LUAEditor
int endLine;
auto newText = AcumulateSelectedLines(startLine, endLine, callable);
SetSelection(startLine, 0, endLine + 1, 0);
SetSelection(startLine + 1, 0, endLine + 2, 0);
RemoveSelectedText();
SetCursorPosition(startLine + 1, 0);
ReplaceSelectedText(newText);
SetSelection(startLine, 0, endLine + 1, 0);
SetSelection(startLine + 1, 0, endLine + 1, INT_MAX);
}
void LUAViewWidget::CommentSelectedLines()
@@ -1002,21 +1004,30 @@ namespace LUAEditor
{
int startLine;
int endLine;
auto newText = AcumulateSelectedLines(startLine, endLine, [&](QString& newText, QTextBlock& block)
auto currText = AcumulateSelectedLines(startLine, endLine, [&](QString& newText, QTextBlock& block)
{
newText.append(block.text());
newText.append("\n");
});
currText.remove(currText.count() - 1, 1);
if (startLine == 0)
{
return;
}
SetSelection(startLine - 1, INT_MAX, endLine, INT_MAX);
auto upText = GetLineText(startLine -1);
SetSelection(startLine, 0, startLine, INT_MAX);
RemoveSelectedText();
SetCursorPosition(startLine - 1, 0);
ReplaceSelectedText(newText);
SetSelection(startLine - 1, 0, endLine - 1, INT_MAX);
SetSelection(startLine + 1, 0, endLine + 1, INT_MAX);
RemoveSelectedText();
SetCursorPosition(startLine , 0);
ReplaceSelectedText(currText);
SetCursorPosition(endLine + 1, 0);
ReplaceSelectedText(upText);
SetSelection(startLine, 0, endLine, INT_MAX);
}
void LUAViewWidget::MoveSelectedLinesDn()
@@ -1040,11 +1051,11 @@ namespace LUAEditor
newText.prepend("\n");
}
SetSelection(startLine, 0, endLine + 1, 0);
SetSelection(startLine + 1, 0, endLine + 2, 0);
RemoveSelectedText();
SetCursorPosition(startLine + 1, 0);
SetCursorPosition(startLine + 2, 0);
ReplaceSelectedText(newText);
SetSelection(startLine + 1, 0, endLine + 1, INT_MAX);
SetSelection(startLine + 2, 0, endLine + 2, INT_MAX);
}
void LUAViewWidget::SetReadonly(bool readonly)