Fix buttons alignment

addons/project/gitwidget.cpp

@@ -45,11 +45,14 @@ GitWidget::GitWidget(KateProject *project, QWidget *parent, KTextEditor::MainWin
     });
 
     m_menuBtn->setIcon(QIcon::fromTheme(QStringLiteral("application-menu")));
-    m_commitBtn->setIcon(QIcon(QStringLiteral(":/kxmlgui5/kateproject/git-commit-dark.svg")));
+    //    m_commitBtn->setIcon(QIcon(QStringLiteral(":/kxmlgui5/kateproject/git-commit-dark.svg")));
     m_commitBtn->setText(i18n("Commit"));
 
     QVBoxLayout *layout = new QVBoxLayout;
+    layout->setSpacing(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     QHBoxLayout *btnsLayout = new QHBoxLayout;
+    btnsLayout->setContentsMargins(0, 0, 0, 0);
 
     btnsLayout->addWidget(m_commitBtn);
     btnsLayout->addWidget(m_menuBtn);

addons/project/gitwidget.h

@@ -53,6 +53,7 @@ private:
     void discard(const QStringList &files);
     void openAtHEAD(const QString &file);
     void showDiff(const QString &file, bool staged);
+    void launchExternalDiffTool(const QString &file, bool staged);
     void commitChanges(const QString &msg, const QString &desc);
     void sendMessage(const QString &message, bool warn);
 

addons/project/kateprojectview.cpp

@@ -42,7 +42,6 @@ KateProjectView::KateProjectView(KateProjectPluginView *pluginView, KateProject
     layout->setSpacing(0);
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addLayout(btnLayout);
-    layout->addWidget(m_branchBtn);
     layout->addWidget(m_gitBtn);
     layout->addWidget(m_stackWidget);
     //    layout->addWidget(m_treeView);