Merge pull request #720 from jensenr30/hunk-header

Hunk header does not interfere with line wrapping
Murmele · Mar 28, 2024 · 063099a · 063099a
2 parents dac0647 + 5e124bd
commit 063099a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/ui/DiffView/HunkWidget.cpp b/src/ui/DiffView/HunkWidget.cpp
@@ -35,6 +35,17 @@ const QString noNewLineAtEndOfFile =
     HunkWidget::tr("No newline at end of file");
 } // namespace
 
+_HunkWidget::HunkLabel::HunkLabel(const QString &name, bool submodule,
+                                  QWidget *parent)
+    : QWidget(parent), mName(name) {}
+void _HunkWidget::HunkLabel::paintEvent(QPaintEvent *event) {
+  QPainter painter(this);
+  painter.setRenderHint(QPainter::Antialiasing);
+  QFontMetrics fm = fontMetrics();
+  QRect rect = fm.boundingRect(0, 0, this->rect().width(), 300, 0, mName);
+  painter.drawText(rect, Qt::AlignLeft | Qt::ElideRight, mName);
+}
+
 _HunkWidget::Header::Header(const git::Diff &diff, const git::Patch &patch,
                             int index, bool lfs, bool submodule,
                             QWidget *parent)
@@ -45,9 +56,9 @@ _HunkWidget::Header::Header(const git::Diff &diff, const git::Patch &patch,
   mCheck->setVisible(diff.isStatusDiff() && !submodule &&
                      !patch.isConflicted());
 
-  QString header = (index >= 0) ? patch.header(index) : QString();
-  QString escaped = header.trimmed().toHtmlEscaped();
-  QLabel *label = new QLabel(DiffViewStyle::kHunkFmt.arg(escaped), this);
+  QString label_string = (index >= 0) ? patch.header(index) : QString();
+  label_string = label_string.trimmed().toHtmlEscaped();
+  HunkLabel *label = new HunkLabel(label_string, submodule, this);
 
   if (patch.isConflicted()) {
     mSave = new QToolButton(this);
@@ -132,7 +143,7 @@ _HunkWidget::Header::Header(const git::Diff &diff, const git::Patch &patch,
   QHBoxLayout *layout = new QHBoxLayout(this);
   layout->setContentsMargins(4, 4, 4, 4);
   layout->addWidget(mCheck);
-  layout->addWidget(label);
+  layout->addWidget(label, 1);
   layout->addStretch();
   layout->addLayout(buttons);
 

diff --git a/src/ui/DiffView/HunkWidget.h b/src/ui/DiffView/HunkWidget.h
@@ -19,6 +19,18 @@ class DisclosureButton;
 class Line;
 
 namespace _HunkWidget {
+class HunkLabel : public QWidget {
+public:
+  HunkLabel(const QString &name, bool submodule, QWidget *parent = nullptr);
+
+protected:
+  void paintEvent(QPaintEvent *event) override;
+
+private:
+  QString mName;
+  QString mOldName;
+};
+
 class Header : public QFrame {
   Q_OBJECT
 public: