Improving Diff view when large descriptions

src/aux_widgets/CommitInfoPanel.cpp

@@ -31,6 +31,7 @@ CommitInfoPanel::CommitInfoPanel(QWidget *parent)
    mScrollArea = new QScrollArea();
    mScrollArea->setWidget(mLabelDescription);
    mScrollArea->setWidgetResizable(true);
+   mScrollArea->setFixedHeight(50);
 
    mLabelAuthor->setObjectName("labelAuthor");
 
@@ -64,6 +65,17 @@ void CommitInfoPanel::configure(const CommitInfo &commit)
    const auto description = commit.longLog();
    mLabelDescription->setText(description.isEmpty() ? "<No description provided>" : description);
 
+   QFontMetrics fm(mLabelDescription->font());
+   const auto neededsize = fm.boundingRect(QRect(0, 0, 300, 250), Qt::TextWordWrap, mLabelDescription->text());
+   auto height = neededsize.height();
+
+   if (height > 250)
+      height = 250;
+   else if (height < 50)
+      height = 50;
+
+   mScrollArea->setFixedHeight(height);
+
    auto f = mLabelDescription->font();
    f.setItalic(description.isEmpty());
    mLabelDescription->setFont(f);

src/big_widgets/DiffWidget.cpp

@@ -28,6 +28,7 @@ DiffWidget::DiffWidget(const QSharedPointer<GitBase> git, QSharedPointer<GitCach
    setAttribute(Qt::WA_DeleteOnClose);
 
    mInfoPanelParent->setObjectName("InfoPanel");
+   mInfoPanelParent->setFixedWidth(350);
 
    mCenterStackedWidget->setCurrentIndex(0);
    mCenterStackedWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);

src/big_widgets/HistoryWidget.cpp

@@ -43,13 +43,13 @@ HistoryWidget::HistoryWidget(const QSharedPointer<GitCache> &cache, const QShare
    , mGit(git)
    , mCache(cache)
    , mGitServerCache(gitServerCache)
+   , mWipWidget(new WipWidget(mCache, mGit))
+   , mAmendWidget(new AmendWidget(mCache, mGit))
+   , mCommitInfoWidget(new CommitInfoWidget(mCache, mGit))
    , mReturnFromFull(new QPushButton())
    , mUserName(new QLabel())
    , mUserEmail(new QLabel())
 {
-   mCommitInfoWidget = new CommitInfoWidget(mCache, mGit);
-   mWipWidget = new WipWidget(mCache, mGit);
-   mAmendWidget = new AmendWidget(mCache, mGit);
    setAttribute(Qt::WA_DeleteOnClose);
 
    QScopedPointer<GitConfig> gitConfig(new GitConfig(mGit));

src/commits/CommitInfoWidget.cpp

@@ -18,26 +18,29 @@ CommitInfoWidget::CommitInfoWidget(const QSharedPointer<GitCache> &cache, const
    , mCache(cache)
    , mGit(git)
    , mInfoPanel(new CommitInfoPanel())
-   , fileListWidget(new FileListWidget(mGit, mCache))
+   , mFileListWidget(new FileListWidget(mGit, mCache))
 {
    setAttribute(Qt::WA_DeleteOnClose);
 
-   fileListWidget->setObjectName("fileListWidget");
+   mFileListWidget->setObjectName("fileListWidget");
 
    const auto wipSeparator = new QFrame();
    wipSeparator->setObjectName("separator");
 
-   const auto verticalLayout = new QVBoxLayout(this);
-   verticalLayout->setSpacing(0);
-   verticalLayout->setContentsMargins(0, 0, 0, 0);
-   verticalLayout->addWidget(mInfoPanel);
-   verticalLayout->addWidget(wipSeparator);
-   verticalLayout->addWidget(fileListWidget);
-
-   connect(fileListWidget, &FileListWidget::itemDoubleClicked, this,
+   const auto mainLayout = new QGridLayout(this);
+   mainLayout->setSpacing(0);
+   mainLayout->setContentsMargins(0, 0, 0, 0);
+   mainLayout->addWidget(mInfoPanel, 0, 0);
+   mainLayout->addWidget(wipSeparator, 1, 0);
+   mainLayout->addWidget(mFileListWidget, 2, 0);
+   mainLayout->setRowStretch(1, 0);
+   mainLayout->setRowStretch(2, 0);
+   mainLayout->setRowStretch(2, 1);
+
+   connect(mFileListWidget, &FileListWidget::itemDoubleClicked, this,
            [this](QListWidgetItem *item) { emit signalOpenFileCommit(mCurrentSha, mParentSha, item->text(), false); });
-   connect(fileListWidget, &FileListWidget::signalShowFileHistory, this, &CommitInfoWidget::signalShowFileHistory);
-   connect(fileListWidget, &FileListWidget::signalEditFile, this, &CommitInfoWidget::signalEditFile);
+   connect(mFileListWidget, &FileListWidget::signalShowFileHistory, this, &CommitInfoWidget::signalShowFileHistory);
+   connect(mFileListWidget, &FileListWidget::signalEditFile, this, &CommitInfoWidget::signalEditFile);
 }
 
 void CommitInfoWidget::configure(const QString &sha)
@@ -62,7 +65,7 @@ void CommitInfoWidget::configure(const QString &sha)
 
          mInfoPanel->configure(commit);
 
-         fileListWidget->insertFiles(mCurrentSha, mParentSha);
+         mFileListWidget->insertFiles(mCurrentSha, mParentSha);
       }
    }
 }
@@ -77,5 +80,5 @@ void CommitInfoWidget::clear()
    mCurrentSha = QString();
    mParentSha = QString();
 
-   fileListWidget->clear();
+   mFileListWidget->clear();
 }

src/commits/CommitInfoWidget.h

@@ -62,5 +62,5 @@ class CommitInfoWidget : public QFrame
    QString mCurrentSha;
    QString mParentSha;
    CommitInfoPanel *mInfoPanel = nullptr;
-   FileListWidget *fileListWidget = nullptr;
+   FileListWidget *mFileListWidget = nullptr;
 };