From 79bf37fd2aff838e8880abe2bb0dac6f40fb1067 2018-01-09 16:11:43
From: mperrinel <mperrinel@itlink.fr>
Date: 2018-01-09 16:11:43
Subject: [PATCH] Fix hardcorded icon size for save and discard tool button
---

diff --git a/gui/src/Catalogue/CatalogueEventsWidget.cpp b/gui/src/Catalogue/CatalogueEventsWidget.cpp
index 8386041..b0c94ea 100644
--- a/gui/src/Catalogue/CatalogueEventsWidget.cpp
+++ b/gui/src/Catalogue/CatalogueEventsWidget.cpp
@@ -25,9 +25,6 @@
 
 Q_LOGGING_CATEGORY(LOG_CatalogueEventsWidget, "CatalogueEventsWidget")
 
-/// Fixed size of the validation column
-const auto VALIDATION_COLUMN_SIZE = 35;
-
 /// Percentage added to the range of a event when it is displayed
 const auto EVENT_RANGE_MARGE = 30; // in %
 
@@ -449,11 +446,9 @@ CatalogueEventsWidget::CatalogueEventsWidget(QWidget *parent)
     ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::Tags,
                                                  QHeaderView::Stretch);
     ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::Validation,
-                                                 QHeaderView::Fixed);
+                                                 QHeaderView::ResizeToContents);
     ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::Name,
                                                  QHeaderView::Interactive);
-    ui->treeView->header()->resizeSection((int)CatalogueEventsModel::Column::Validation,
-                                          VALIDATION_COLUMN_SIZE);
     ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::TStart,
                                                  QHeaderView::ResizeToContents);
     ui->treeView->header()->setSectionResizeMode((int)CatalogueEventsModel::Column::TEnd,
@@ -515,6 +510,8 @@ void CatalogueEventsWidget::setEventChanges(const std::shared_ptr<DBEvent> &even
                         emitSelection();
                     });
                 ui->treeView->setIndexWidget(validationIndex, widget);
+                ui->treeView->header()->resizeSection((int)CatalogueEventsModel::Column::Validation,
+                                                      QHeaderView::ResizeToContents);
             }
         }
         else {
diff --git a/gui/src/Catalogue/CatalogueExplorerHelper.cpp b/gui/src/Catalogue/CatalogueExplorerHelper.cpp
index 1fb7767..c08c38d 100644
--- a/gui/src/Catalogue/CatalogueExplorerHelper.cpp
+++ b/gui/src/Catalogue/CatalogueExplorerHelper.cpp
@@ -3,7 +3,6 @@
 #include <QBoxLayout>
 #include <QToolButton>
 
-const auto VALIDATION_BUTTON_ICON_SIZE = 12;
 
 QWidget *CatalogueExplorerHelper::buildValidationWidget(QWidget *parent, std::function<void()> save,
                                                         std::function<void()> discard)
@@ -11,22 +10,21 @@ QWidget *CatalogueExplorerHelper::buildValidationWidget(QWidget *parent, std::fu
     auto widget = new QWidget{parent};
 
     auto layout = new QHBoxLayout{widget};
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->setSpacing(0);
 
     auto btnValid = new QToolButton{widget};
     btnValid->setIcon(QIcon{":/icones/save"});
-    btnValid->setIconSize(QSize{VALIDATION_BUTTON_ICON_SIZE, VALIDATION_BUTTON_ICON_SIZE});
     btnValid->setAutoRaise(true);
     QObject::connect(btnValid, &QToolButton::clicked, save);
     layout->addWidget(btnValid);
 
     auto btnDiscard = new QToolButton{widget};
     btnDiscard->setIcon(QIcon{":/icones/discard"});
-    btnDiscard->setIconSize(QSize{VALIDATION_BUTTON_ICON_SIZE, VALIDATION_BUTTON_ICON_SIZE});
     btnDiscard->setAutoRaise(true);
     QObject::connect(btnDiscard, &QToolButton::clicked, discard);
     layout->addWidget(btnDiscard);
 
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
+
     return widget;
 }
diff --git a/gui/src/Catalogue/CatalogueSideBarWidget.cpp b/gui/src/Catalogue/CatalogueSideBarWidget.cpp
index 7c1bc3c..ee7a3d2 100644
--- a/gui/src/Catalogue/CatalogueSideBarWidget.cpp
+++ b/gui/src/Catalogue/CatalogueSideBarWidget.cpp
@@ -111,7 +111,8 @@ CatalogueSideBarWidget::CatalogueSideBarWidget(QWidget *parent)
 
     ui->treeView->header()->setStretchLastSection(false);
     ui->treeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
-    ui->treeView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
+    ui->treeView->header()->setSectionResizeMode((int)CatalogueTreeModel::Column::Name,
+                                                 QHeaderView::Stretch);
 
     connect(ui->treeView, &QTreeView::clicked, this, &CatalogueSideBarWidget::emitSelection);
     connect(ui->treeView->selectionModel(), &QItemSelectionModel::currentChanged, this,
@@ -416,6 +417,8 @@ void CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate::setHasChanges(
                     }
                 });
             sideBarWidget->ui->treeView->setIndexWidget(validationIndex, widget);
+            sideBarWidget->ui->treeView->header()->resizeSection(
+                (int)CatalogueTreeModel::Column::Validation, QHeaderView::ResizeToContents);
         }
     }
     else {