fix: Dirty Fix改为部分刷新光标后的显示问题 (#320)

使用绘制偏移量使得部分刷新能够覆盖真正的光标部分。一旦找到根因，就应该取消这些偏移量。 Log: Dirty Fix改为部分刷新光标后的显示问题 Signed-off-by: Yutao Meng <[email protected]>
linuxdeepin · Dec 28, 2023 · 3ffd506 · 3ffd506
1 parent 2a44327
commit 3ffd506
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/3rdparty/terminalwidget/lib/TerminalDisplay.cpp b/3rdparty/terminalwidget/lib/TerminalDisplay.cpp
@@ -647,7 +647,7 @@ void TerminalDisplay::setKeyboardCursorShape(QTermWidget::KeyboardCursorShape sh
 {
     _cursorShape = shape;
 
-    updateCursor();
+    update();
 }
 QTermWidget::KeyboardCursorShape TerminalDisplay::keyboardCursorShape() const
 {
@@ -738,11 +738,13 @@ void TerminalDisplay::drawCursor(QPainter& painter,
            painter.setPen(_cursorColor);
        else
            painter.setPen(foregroundColor);
-
+       // Todo (Archie Meng): 绘制偏移量用于很脏地修复光标显示问题，如果找到刷新问题的根因，应该改成不使用偏移量的形式。
        if ( _cursorShape == Emulation::KeyboardCursorShape::BlockCursor )
        {
+
             if ( hasFocus() )
             {
+                cursorRect.translate(1, 1);
                 painter.fillRect(cursorRect, _cursorColor.isValid() ? _cursorColor : foregroundColor);
 
                 if ( !_cursorColor.isValid() )
@@ -766,29 +768,29 @@ void TerminalDisplay::drawCursor(QPainter& painter,
        }
        else if ( _cursorShape == Emulation::KeyboardCursorShape::UnderlineCursor )
             painter.drawLine(QLineF(
-                                 QPointF(cursorRect.left(),
+                                 QPointF(cursorRect.left() + 2,
                                          cursorRect.bottom()),
                                  QPointF(cursorRect.right(),
                                          cursorRect.bottom())));
        else if ( _cursorShape == Emulation::KeyboardCursorShape::IBeamCursor )
             painter.drawLine(QLineF(
-                                QPointF(cursorRect.left(),
-                             		cursorRect.top()),
-                                QPointF(cursorRect.left(),
+                                QPointF(cursorRect.left() + 2,
+                                    cursorRect.top() + 2),
+                                QPointF(cursorRect.left() + 2,
                              		cursorRect.bottom())));
        else if ( _cursorShape == Emulation::KeyboardCursorShape::BoldUnderlineCursor )
         { 
             if ( hasFocus() )
             {
-                cursorRect.translate(0,cursorRect.height());
+                cursorRect.translate(1,cursorRect.height() - 4);
                 cursorRect.setHeight(4);
                 painter.fillRect(cursorRect, _cursorColor.isValid() ? _cursorColor : foregroundColor);
             }
             else
             {
                 painter.drawRect(
                                 cursorRect.left(),
-                                cursorRect.bottom(),
+                                cursorRect.bottom() - 4,
                                 cursorRect.width(),
                                 4);
             }