rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fix: selection is not correctly set after input in column mode

This commit is contained in:
Roy Qu 2022-07-25 14:32:12 +08:00
parent 7db3a7ebc1
commit 62caa94e23
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS.md
View File

@ -1,6 +1,7 @@
Red Panda C++ Version 1.1.6
- fix: block indent doesn't work
- fix: selection is not correctly set after input in column mode
Red Panda C++ Version 1.1.5

38
RedPandaIDE/qsynedit/SynEdit.cpp
View File

@ -2541,25 +2541,20 @@ void SynEdit::doTabKey()
doBlockIndent();
return;
}
int i = 0;
{
mUndoList->beginBlock();
auto action = finally([this]{
mUndoList->endBlock();
});
if (selAvail()) {
setSelectedTextEmpty();
}
QString Spaces;
if (mOptions.testFlag(eoTabsToSpaces)) {
int cols = charToColumn(mCaretY,mCaretX);
i = tabWidth() - (cols) % tabWidth();
Spaces = QString(i,' ');
} else {
Spaces = '\t';
}
setSelTextPrimitive(QStringList(Spaces));
mUndoList->beginBlock();
if (selAvail()) {
setSelectedTextEmpty();
}
QString Spaces;
if (mOptions.testFlag(eoTabsToSpaces)) {
int cols = charToColumn(mCaretY,mCaretX);
int i = tabWidth() - (cols) % tabWidth();
Spaces = QString(i,' ');
} else {
Spaces = '\t';
}
setSelTextPrimitive(QStringList(Spaces));
mUndoList->endBlock();
ensureCursorPosVisible();
}
@ -6634,10 +6629,9 @@ void SynEdit::onLinesChanged()
if (mActiveSelectionMode == SynSelectionMode::Column) {
BufferCoord oldBlockStart = blockBegin();
BufferCoord oldBlockEnd = blockEnd();
oldBlockStart.ch = mCaretX;
int colEnd = charToColumn(oldBlockStart.line,oldBlockStart.ch);
int charEnd = columnToChar(oldBlockEnd.line,colEnd);
oldBlockEnd.ch = charEnd;
int colEnd = charToColumn(mCaretY,mCaretX);
oldBlockStart.ch = columnToChar(oldBlockStart.line,colEnd);
oldBlockEnd.ch = columnToChar(oldBlockEnd.line,colEnd);
setBlockBegin(oldBlockStart);
setBlockEnd(oldBlockEnd);
} else {