feat: 引入编辑器渲染接口；

Author: Wing-summer

3rdparty/QHexView/document/qhexdocument.cpp

@@ -86,11 +86,11 @@ void QHexDocument::setMetaCommentVisible(bool b) {
     Q_EMIT metaCommentVisibleChanged(b);
 }
 
-bool QHexDocument::metabgVisible() { return m_metabg; }
+bool QHexDocument::metabgVisible() const { return m_metabg; }
 
-bool QHexDocument::metafgVisible() { return m_metafg; }
+bool QHexDocument::metafgVisible() const { return m_metafg; }
 
-bool QHexDocument::metaCommentVisible() { return m_metacomment; }
+bool QHexDocument::metaCommentVisible() const { return m_metacomment; }
 
 void QHexDocument::insertBookMarkAdjust(qsizetype offset, qsizetype length) {
     QMap<qsizetype, QString> bms;
@@ -218,7 +218,7 @@ void QHexDocument::removeBookMarkAdjustRevert(
     _bookmarks.insert(rmbms);
 }
 
-bool QHexDocument::isDocSaved() { return m_undostack->isClean(); }
+bool QHexDocument::isDocSaved() const { return m_undostack->isClean(); }
 
 void QHexDocument::setDocSaved(bool b) {
     if (b) {
@@ -230,9 +230,9 @@ void QHexDocument::setDocSaved(bool b) {
     Q_EMIT documentSaved(b);
 }
 
-bool QHexDocument::isReadOnly() { return m_readonly; }
-bool QHexDocument::isKeepSize() { return m_keepsize; }
-bool QHexDocument::isLocked() { return m_islocked; }
+bool QHexDocument::isReadOnly() const { return m_readonly; }
+bool QHexDocument::isKeepSize() const { return m_keepsize; }
+bool QHexDocument::isLocked() const { return m_islocked; }
 
 void QHexDocument::setLockKeepSize(bool b) { m_lockKeepSize = b; }
 

3rdparty/QHexView/document/qhexdocument.h

@@ -58,9 +58,9 @@ class QHexDocument : public QObject {
 
     bool setLockedFile(bool b);
     bool setKeepSize(bool b);
-    bool isReadOnly();
-    bool isKeepSize();
-    bool isLocked();
+    bool isReadOnly() const;
+    bool isKeepSize() const;
+    bool isLocked() const;
 
     void setLockKeepSize(bool b);
     bool lockKeepSize() const;
@@ -110,16 +110,16 @@ class QHexDocument : public QObject {
         QList<qsizetype> &results,
         const std::function<bool()> &pred = [] { return true; });
 
-    bool isDocSaved();
+    bool isDocSaved() const;
     void setDocSaved(bool b = true);
 
     void setMetafgVisible(bool b);
     void setMetabgVisible(bool b);
     void setMetaCommentVisible(bool b);
 
-    bool metafgVisible();
-    bool metabgVisible();
-    bool metaCommentVisible();
+    bool metafgVisible() const;
+    bool metabgVisible() const;
+    bool metaCommentVisible() const;
 
     void insertBookMarkAdjust(qsizetype offset, qsizetype length);
     QMap<qsizetype, QString> removeBookMarkAdjust(qsizetype offset,

3rdparty/QHexView/document/qhexrenderer.cpp

@@ -92,14 +92,16 @@ void QHexRenderer::renderFrame(QPainter *painter) {
     int asciix = this->getAsciiColumnX();
     int endx = this->getEndColumnX();
 
+    painter->setPen(m_borderColor);
+
     // x coordinates are in absolute space
     // y coordinates are in viewport space
     // see QHexView::paintEvent where the painter has been shifted horizontally
 
+    auto h = this->headerLineCount() * this->lineHeight();
+
     if (m_headerVisible)
-        painter->drawLine(0, this->headerLineCount() * this->lineHeight() - 1,
-                          endx,
-                          this->headerLineCount() * this->lineHeight() - 1);
+        painter->drawLine(0, h, endx, h);
     if (m_addressVisible)
         painter->drawLine(hexx, rect.top(), hexx, rect.bottom());
 
@@ -872,6 +874,12 @@ void QHexRenderer::drawHeader(QPainter *painter) {
     painter->restore();
 }
 
+void QHexRenderer::setBorderColor(const QColor &newBorderColor) {
+    m_borderColor = newBorderColor;
+}
+
+QColor QHexRenderer::borderColor() const { return m_borderColor; }
+
 QHexCursor *QHexRenderer::cursor() const { return m_cursor; }
 
 void QHexRenderer::setCursor(QHexCursor *newCursor) { m_cursor = newCursor; }

3rdparty/QHexView/document/qhexrenderer.h

@@ -101,6 +101,9 @@ class QHexRenderer : public QObject {
     QColor selBackgroundColor() const;
     void setSelBackgroundColor(const QColor &newSelBackgroundColor);
 
+    QColor borderColor() const;
+    void setBorderColor(const QColor &newBorderColor);
+
     QHexCursor *cursor() const;
     void setCursor(QHexCursor *newCursor);
 
@@ -111,6 +114,8 @@ class QHexRenderer : public QObject {
 
     QByteArray getLine(qsizetype line) const;
     qsizetype rendererLength() const;
+
+public:
     int getAddressWidth() const;
     int getHexColumnX() const;
     int getAsciiColumnX() const;
@@ -178,6 +183,7 @@ class QHexRenderer : public QObject {
     QColor m_bytesColor = Qt::black;
     QColor m_selectionColor = Qt::white;
     QColor m_selBackgroundColor = Qt::blue;
+    QColor m_borderColor = Qt::white;
     /*==============================*/
 };
 

3rdparty/QHexView/qhexview.cpp

@@ -323,7 +323,9 @@ void QHexView::keyPressEvent(QKeyEvent *e) {
 }
 
 QPoint QHexView::absolutePosition(const QPoint &pos) const {
-    QPoint shift(horizontalScrollBar()->value(), 0);
+    auto margins = viewport()->contentsMargins();
+    QPoint shift(horizontalScrollBar()->value() - margins.left(),
+                 -margins.top() * m_renderer->lineHeight());
     return pos + shift;
 }
 
@@ -567,23 +569,34 @@ QColor QHexView::selBackgroundColor() const {
     return m_renderer->selBackgroundColor();
 }
 
+QColor QHexView::borderColor() const { return m_renderer->borderColor(); }
+
 void QHexView::setSelBackgroundColor(const QColor &newSelBackgroundColor) {
     m_renderer->setSelBackgroundColor(newSelBackgroundColor);
     Q_EMIT selBackgroundColorChanged();
+    this->viewport()->update();
+}
+
+void QHexView::setBorderColor(const QColor &newBorderColor) {
+    m_renderer->setBorderColor(newBorderColor);
+    Q_EMIT borderColorChanged();
+    this->viewport()->update();
 }
 
 void QHexView::setFontSize(qreal size) {
     Q_ASSERT(size > 0);
     auto font = this->font();
     font.setPointSizeF(size * m_scaleRate);
     this->setFont(font);
+    this->viewport()->update();
 }
 
 QColor QHexView::selectionColor() const { return m_renderer->selectionColor(); }
 
 void QHexView::setSelectionColor(const QColor &newSelectionColor) {
     m_renderer->setSelectionColor(newSelectionColor);
     Q_EMIT selectionColorChanged();
+    this->viewport()->update();
 }
 
 QColor QHexView::bytesAlterBackground() const {
@@ -593,13 +606,15 @@ QColor QHexView::bytesAlterBackground() const {
 void QHexView::setBytesAlterBackground(const QColor &newBytesAlterBackground) {
     m_renderer->setBytesAlterBackground(newBytesAlterBackground);
     Q_EMIT bytesAlterBackgroundChanged();
+    this->viewport()->update();
 }
 
 QColor QHexView::bytesColor() const { return m_renderer->bytesColor(); }
 
 void QHexView::setBytesColor(const QColor &newBytesColor) {
     m_renderer->setBytesColor(newBytesColor);
     Q_EMIT bytesColorChanged();
+    this->viewport()->update();
 }
 
 QColor QHexView::bytesBackground() const {
@@ -609,20 +624,23 @@ QColor QHexView::bytesBackground() const {
 void QHexView::setBytesBackground(const QColor &newBytesBackground) {
     m_renderer->setBytesBackground(newBytesBackground);
     Q_EMIT bytesBackgroundChanged();
+    this->viewport()->update();
 }
 
 QColor QHexView::addressColor() const { return m_renderer->addressColor(); }
 
 void QHexView::setAddressColor(const QColor &newAddressColor) {
     m_renderer->setAddressColor(newAddressColor);
     Q_EMIT addressColorChanged();
+    this->viewport()->update();
 }
 
 QColor QHexView::headerColor() const { return m_renderer->headerColor(); }
 
 void QHexView::setHeaderColor(const QColor &newHeaderColor) {
     m_renderer->setHeaderColor(newHeaderColor);
     Q_EMIT headerColorChanged();
+    this->viewport()->update();
 }
 
 void QHexView::mousePressEvent(QMouseEvent *e) {
@@ -764,21 +782,27 @@ void QHexView::paintEvent(QPaintEvent *e) {
     const int lineHeight = m_renderer->lineHeight();
     const int headerCount = m_renderer->headerLineCount();
 
+    auto m = viewport()->contentsMargins();
+
     // these are lines from the point of view of the visible rect
     // where the first "headerCount" are taken by the header
-    const int first = (r.top() / lineHeight);              // included
-    const int lastPlusOne = (r.bottom() / lineHeight) + 1; // excluded
+    const int first = (r.top() / lineHeight); // included
+    const int lastPlusOne =
+        (r.bottom() / lineHeight) + 1 - m.top() - m.bottom(); // excluded
 
     // compute document lines, adding firstVisible and removing the header
     // the max is necessary if the rect covers the header
     const qsizetype begin = firstVisible + std::max(first - headerCount, 0);
     const qsizetype end = firstVisible + std::max(lastPlusOne - headerCount, 0);
 
+    Q_EMIT onPaintCustomEventBegin();
     painter.save();
-    painter.translate(-this->horizontalScrollBar()->value(), 0);
+    auto xOff = this->horizontalScrollBar()->value();
+    painter.translate(-xOff + m.left(), m.top() * m_renderer->lineHeight());
     m_renderer->render(&painter, begin, end, firstVisible);
     m_renderer->renderFrame(&painter);
     painter.restore();
+    Q_EMIT onPaintCustomEvent(xOff, firstVisible, begin, end);
 }
 
 void QHexView::moveToSelection() {
@@ -1160,6 +1184,7 @@ void QHexView::adjustScrollBars() {
 
     auto docLines = m_renderer->documentLines();
     auto visLines = this->visibleLines();
+    auto margins = viewport()->contentsMargins();
 
     // modified by wingsummer,fix the scrollbar bug
     if (docLines > visLines && !m_document->isEmpty()) {
@@ -1180,11 +1205,13 @@ void QHexView::adjustScrollBars() {
         this->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
         // +1 to see the rightmost vertical line, +2 seems more pleasant to the
         // eyes
-        hscrollbar->setMaximum(documentWidth - viewportWidth + 2);
+        hscrollbar->setMaximum(documentWidth - viewportWidth + 2 +
+                               margins.left() + margins.right());
     } else {
         this->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
         hscrollbar->setValue(0);
-        hscrollbar->setMaximum(documentWidth);
+        hscrollbar->setMaximum(documentWidth + margins.left() +
+                               margins.right());
     }
 }
 
@@ -1203,9 +1230,10 @@ qsizetype QHexView::lastVisibleLine() const {
 }
 
 qsizetype QHexView::visibleLines() const {
-    auto visLines =
-        qsizetype(std::ceil(this->height() / m_renderer->lineHeight() -
-                            m_renderer->headerLineCount()));
+    auto margins = viewport()->contentsMargins();
+    auto visLines = qsizetype(std::ceil(
+        this->height() / m_renderer->lineHeight() -
+        m_renderer->headerLineCount() - margins.top() - margins.bottom()));
     return std::min(visLines, m_renderer->documentLines());
 }