GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1372:79bf37fd2aff

Fix hardcorded icon size for save and discard tool button

perrinel -

r1372:79bf37fd2aff

parent child

Context file:

r1372:79bf37fd2aff

gui/src/Catalogue/CatalogueEventsWidget.cpp +3 -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 %
                 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,
                                     emitSelection();
                                 });
                             ui->treeView->setIndexWidget(validationIndex, widget);
+                            ui->treeView->header()->resizeSection((int)CatalogueEventsModel::Column::Validation,
+                                                                  QHeaderView::ResizeToContents);
                         }
                     }
                     else {

gui/src/Catalogue/CatalogueExplorerHelper.cpp +3 -5

             #include <QBoxLayout>
             #include <QToolButton>
-            const auto VALIDATION_BUTTON_ICON_SIZE = 12;
             QWidget *CatalogueExplorerHelper::buildValidationWidget(QWidget *parent, std::function<void()> save,
                                                                     std::function<void()> discard)
                 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;
             }

gui/src/Catalogue/CatalogueSideBarWidget.cpp +4 -1

                 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,
                                 }
                             });
                         sideBarWidget->ui->treeView->setIndexWidget(validationIndex, widget);
+                        sideBarWidget->ui->treeView->header()->resizeSection(
+                            (int)CatalogueTreeModel::Column::Validation, QHeaderView::ResizeToContents);
                     }
                 }
                 else {

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages