- fix: selection is not correctly set after input in column mode
This commit is contained in:
parent
7db3a7ebc1
commit
62caa94e23
1
NEWS.md
1
NEWS.md
|
@ -1,6 +1,7 @@
|
||||||
Red Panda C++ Version 1.1.6
|
Red Panda C++ Version 1.1.6
|
||||||
|
|
||||||
- fix: block indent doesn't work
|
- fix: block indent doesn't work
|
||||||
|
- fix: selection is not correctly set after input in column mode
|
||||||
|
|
||||||
Red Panda C++ Version 1.1.5
|
Red Panda C++ Version 1.1.5
|
||||||
|
|
||||||
|
|
|
@ -2541,25 +2541,20 @@ void SynEdit::doTabKey()
|
||||||
doBlockIndent();
|
doBlockIndent();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int i = 0;
|
|
||||||
{
|
|
||||||
mUndoList->beginBlock();
|
mUndoList->beginBlock();
|
||||||
auto action = finally([this]{
|
|
||||||
mUndoList->endBlock();
|
|
||||||
});
|
|
||||||
if (selAvail()) {
|
if (selAvail()) {
|
||||||
setSelectedTextEmpty();
|
setSelectedTextEmpty();
|
||||||
}
|
}
|
||||||
QString Spaces;
|
QString Spaces;
|
||||||
if (mOptions.testFlag(eoTabsToSpaces)) {
|
if (mOptions.testFlag(eoTabsToSpaces)) {
|
||||||
int cols = charToColumn(mCaretY,mCaretX);
|
int cols = charToColumn(mCaretY,mCaretX);
|
||||||
i = tabWidth() - (cols) % tabWidth();
|
int i = tabWidth() - (cols) % tabWidth();
|
||||||
Spaces = QString(i,' ');
|
Spaces = QString(i,' ');
|
||||||
} else {
|
} else {
|
||||||
Spaces = '\t';
|
Spaces = '\t';
|
||||||
}
|
}
|
||||||
setSelTextPrimitive(QStringList(Spaces));
|
setSelTextPrimitive(QStringList(Spaces));
|
||||||
}
|
mUndoList->endBlock();
|
||||||
ensureCursorPosVisible();
|
ensureCursorPosVisible();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6634,10 +6629,9 @@ void SynEdit::onLinesChanged()
|
||||||
if (mActiveSelectionMode == SynSelectionMode::Column) {
|
if (mActiveSelectionMode == SynSelectionMode::Column) {
|
||||||
BufferCoord oldBlockStart = blockBegin();
|
BufferCoord oldBlockStart = blockBegin();
|
||||||
BufferCoord oldBlockEnd = blockEnd();
|
BufferCoord oldBlockEnd = blockEnd();
|
||||||
oldBlockStart.ch = mCaretX;
|
int colEnd = charToColumn(mCaretY,mCaretX);
|
||||||
int colEnd = charToColumn(oldBlockStart.line,oldBlockStart.ch);
|
oldBlockStart.ch = columnToChar(oldBlockStart.line,colEnd);
|
||||||
int charEnd = columnToChar(oldBlockEnd.line,colEnd);
|
oldBlockEnd.ch = columnToChar(oldBlockEnd.line,colEnd);
|
||||||
oldBlockEnd.ch = charEnd;
|
|
||||||
setBlockBegin(oldBlockStart);
|
setBlockBegin(oldBlockStart);
|
||||||
setBlockEnd(oldBlockEnd);
|
setBlockEnd(oldBlockEnd);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue