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

tweak caret movement

This commit is contained in:
Roy Qu 2024-03-23 21:58:45 +08:00
parent 4f637481e4
commit 31aee0cfcc
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/qsynedit/qsynedit/qsynedit.cpp
View File

@ -2981,10 +2981,10 @@ void QSynEdit::ensureCaretVisibleEx(bool ForceToMiddle)
if (vCaretRow < yposToRow(0) || vCaretRow>(yposToRow(0) + (mLinesInWindow - 2))) if (vCaretRow < yposToRow(0) || vCaretRow>(yposToRow(0) + (mLinesInWindow - 2)))
setTopPos( (vCaretRow - (mLinesInWindow - 1) / 2-1) * mTextHeight); setTopPos( (vCaretRow - (mLinesInWindow - 1) / 2-1) * mTextHeight);
} else { } else {
if (vCaretRow < yposToRow(0)) if ((vCaretRow-1) * mTextHeight < mTopPos)
setTopPos( (vCaretRow - 1) * mTextHeight); setTopPos( (vCaretRow - 1) * mTextHeight);
else if (vCaretRow > yposToRow(0) + (mLinesInWindow - 2) && mLinesInWindow > 2) { else if (vCaretRow * mTextHeight > mTopPos + clientHeight() ) {
setTopPos( (vCaretRow - (mLinesInWindow - 2) -1) * mTextHeight); setTopPos( vCaretRow * mTextHeight - clientHeight());
} else } else
setTopPos(mTopPos); setTopPos(mTopPos);
} }
@ -5605,7 +5605,12 @@ void QSynEdit::executeCommand(EditCommand command, QChar ch, void *pData)
if (command == EditCommand::PageUp || command == EditCommand::SelPageUp) { if (command == EditCommand::PageUp || command == EditCommand::SelPageUp) {
counter = -counter; counter = -counter;
} }
int gap = (lineToRow(caretY())-1) * mTextHeight - topPos();
incPaintLock();
ensureCaretVisible();
moveCaretVert(counter, command == EditCommand::SelPageUp || command == EditCommand::SelPageDown); moveCaretVert(counter, command == EditCommand::SelPageUp || command == EditCommand::SelPageDown);
setTopPos((lineToRow(caretY())-1) * mTextHeight - gap);
decPaintLock();
break; break;
} }
case EditCommand::PageTop: case EditCommand::PageTop: