feat: 增强十六进制编辑区拓展插件；

Author: Wing-summer

3rdparty/QHexView/document/qhexrenderer.cpp

@@ -111,6 +111,19 @@ void QHexRenderer::renderFrame(QPainter *painter) {
         painter->drawLine(endx, rect.top(), endx, rect.bottom());
 }
 
+void QHexRenderer::renderAdditonalFrame(QPainter *painter, bool top,
+                                        bool left) {
+    QRect rect = painter->window();
+    int endx = this->getEndColumnX();
+    painter->setPen(m_borderColor);
+    if (top) {
+        painter->drawLine(0, 0, endx, 0);
+    }
+    if (left) {
+        painter->drawLine(0, 0, 0, rect.bottom());
+    }
+}
+
 // modified by wingsummer
 void QHexRenderer::render(QPainter *painter, qsizetype begin, qsizetype end,
                           qsizetype firstline) {

3rdparty/QHexView/document/qhexrenderer.h

@@ -43,6 +43,7 @@ class QHexRenderer : public QObject {
                           const QFontMetricsF &fontmetrics,
                           QObject *parent = nullptr);
     void renderFrame(QPainter *painter);
+    void renderAdditonalFrame(QPainter *painter, bool top, bool left);
     void render(QPainter *painter, qsizetype start, qsizetype end,
                 qsizetype firstline); // begin included, end excluded
     void updateMetrics(const QFontMetricsF &fm);

3rdparty/QHexView/qhexview.cpp

@@ -325,10 +325,17 @@ void QHexView::keyPressEvent(QKeyEvent *e) {
 QPoint QHexView::absolutePosition(const QPoint &pos) const {
     auto margins = viewport()->contentsMargins();
     QPoint shift(horizontalScrollBar()->value() - margins.left(),
-                 -margins.top() * m_renderer->lineHeight());
+                 -margins.top());
     return pos + shift;
 }
 
+bool QHexView::disableInternalPaint() const { return m_disableInternalPaint; }
+
+void QHexView::setDisableInternalPaint(bool newDisableInternalPaint) {
+    m_disableInternalPaint = newDisableInternalPaint;
+    update();
+}
+
 QHexCursor *QHexView::cursor() const { return m_cursor; }
 
 qsizetype QHexView::copyLimit() const { return m_copylimit; }
@@ -786,22 +793,25 @@ void QHexView::paintEvent(QPaintEvent *e) {
 
     // 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 first = (r.top() - m.top()) / lineHeight; // included
     const int lastPlusOne =
-        (r.bottom() / lineHeight) + 1 - m.top() - m.bottom(); // excluded
+        ((r.bottom() - m.top() - m.bottom()) / lineHeight) + 1; // 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();
     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();
+    if (Q_LIKELY(!m_disableInternalPaint)) {
+        painter.save();
+        painter.translate(-xOff + m.left(), m.top());
+        m_renderer->render(&painter, begin, end, firstVisible);
+        m_renderer->renderFrame(&painter);
+        m_renderer->renderAdditonalFrame(&painter, m.top() > 0, m.left() > 0);
+        painter.restore();
+    }
     Q_EMIT onPaintCustomEvent(xOff, firstVisible, begin, end);
 }
 
@@ -1184,7 +1194,6 @@ 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()) {
@@ -1200,6 +1209,7 @@ void QHexView::adjustScrollBars() {
     QScrollBar *hscrollbar = this->horizontalScrollBar();
     int documentWidth = m_renderer->documentWidth();
     int viewportWidth = viewport()->width();
+    auto margins = viewport()->contentsMargins();
 
     if (documentWidth > viewportWidth) {
         this->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
@@ -1231,9 +1241,10 @@ qsizetype QHexView::lastVisibleLine() const {
 
 qsizetype QHexView::visibleLines() const {
     auto margins = viewport()->contentsMargins();
-    auto visLines = qsizetype(std::ceil(
-        this->height() / m_renderer->lineHeight() -
-        m_renderer->headerLineCount() - margins.top() - margins.bottom()));
+    auto visLines = qsizetype(
+        std::ceil((this->height() - margins.top() - margins.bottom()) /
+                      m_renderer->lineHeight() -
+                  m_renderer->headerLineCount()));
     return std::min(visLines, m_renderer->documentLines());
 }
 

3rdparty/QHexView/qhexview.h

@@ -106,6 +106,9 @@ class QHexView : public QAbstractScrollArea {
     qsizetype copyLimit() const;
     QHexCursor *cursor() const;
 
+    bool disableInternalPaint() const;
+    void setDisableInternalPaint(bool newDisableInternalPaint);
+
 public slots:
     void setDocument(const QSharedPointer<QHexDocument> &document,
                      QHexCursor *cursor = nullptr);
@@ -228,6 +231,7 @@ private slots:
 
     qreal m_fontSize;
     qreal m_scaleRate = 1.0;
+    bool m_disableInternalPaint = false;
 
     qsizetype m_copylimit = 1; // MB
 };

TestHexExt/testhexext.cpp

@@ -48,7 +48,6 @@ QMenu *TestHexExt::registeredHexContextMenu() const { return m_context; }
 
 QList<WingHex::WingRibbonToolBoxInfo>
 TestHexExt::registeredRibbonTools() const {
-    // TODO
     return {};
 }
 
@@ -60,8 +59,10 @@ QMargins TestHexExt::contentMargins(WingHex::HexEditorContext *context) const {
     auto str = QString::number(lines);
     auto fm = context->fontMetrics();
     constexpr auto padding = 4;
-    auto len = fm.horizontalAdvance(str) + padding;
-    return {int(len), 0, 0, 1};
+    auto header = QStringLiteral("Line");
+    auto minLen = fm.horizontalAdvance(header) + padding;
+    auto colLen = qMax(fm.horizontalAdvance(str) + padding, minLen);
+    return {int(colLen) + 1, 0, 0, 0};
 }
 
 void TestHexExt::onPaintEvent(QPainter *painter, const QWidget *w,
@@ -90,7 +91,6 @@ void TestHexExt::onPaintEvent(QPainter *painter, const QWidget *w,
         painter->restore();
         context->renderHexBackground(painter, {0, 0}, colLen);
     }
-    painter->drawLine(colLen, 0, colLen, w->height());
 
     // draw Line Numbers
     painter->setPen(context->addressColor());