|
|
|
@ -1246,7 +1246,7 @@ void Editor::EnsureCaretVisible(bool useMargin, bool vert, bool horiz) {
|
|
|
|
|
int lineCaret = DisplayFromPosition(posCaret);
|
|
|
|
|
bool bSlop, bStrict, bJump, bEven;
|
|
|
|
|
|
|
|
|
|
//Qt::Vertical positioning
|
|
|
|
|
// Vertical positioning
|
|
|
|
|
if (vert && (pt.y < rcClient.top || ptBottomCaret.y > rcClient.bottom || (caretYPolicy & CARET_STRICT) != 0)) {
|
|
|
|
|
int linesOnScreen = LinesOnScreen();
|
|
|
|
|
int halfScreen = Platform::Maximum(linesOnScreen - 1, 2) / 2;
|
|
|
|
@ -1340,7 +1340,7 @@ void Editor::EnsureCaretVisible(bool useMargin, bool vert, bool horiz) {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//Qt::Horizontal positioning
|
|
|
|
|
// Horizontal positioning
|
|
|
|
|
if (horiz && (wrapState == eWrapNone)) {
|
|
|
|
|
int halfScreen = Platform::Maximum(rcClient.Width() - 4, 4) / 2;
|
|
|
|
|
int xOffsetNew = xOffset;
|
|
|
|
|