From e07058453a3e045bb24e3968b325e68a0b1ce3ac Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 6 Apr 2020 15:48:20 +0300 Subject: [PATCH] resizeColumnsToContents() causing disappearance of the formula column. --- .../valentina/dialogs/dialogincrements.cpp | 20 +++++++------------ src/app/valentina/dialogs/dialogincrements.h | 6 +++--- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp index 856185b07..c997e1d21 100644 --- a/src/app/valentina/dialogs/dialogincrements.cpp +++ b/src/app/valentina/dialogs/dialogincrements.cpp @@ -95,9 +95,8 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par qCDebug(vDialog, "Showing variables."); ShowUnits(); - const bool freshCall = true; - FillIncrements(freshCall); - FillPreviewCalculations(freshCall); + FillIncrements(); + FillPreviewCalculations(); FillLengthsLines(); FillLengthLinesAngles(); FillLengthsCurves(); @@ -182,15 +181,15 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par /** * @brief FillIncrementTable fill data for increment table */ -void DialogIncrements::FillIncrements(bool freshCall) +void DialogIncrements::FillIncrements() { - FillIncrementsTable(ui->tableWidgetIncrement, data->DataIncrementsWithSeparators(), false, freshCall); + FillIncrementsTable(ui->tableWidgetIncrement, data->DataIncrementsWithSeparators(), false); } //--------------------------------------------------------------------------------------------------------------------- -void DialogIncrements::FillPreviewCalculations(bool freshCall) +void DialogIncrements::FillPreviewCalculations() { - FillIncrementsTable(ui->tableWidgetPC, data->DataIncrementsWithSeparators(), true, freshCall); + FillIncrementsTable(ui->tableWidgetPC, data->DataIncrementsWithSeparators(), true); } //--------------------------------------------------------------------------------------------------------------------- @@ -869,7 +868,7 @@ void DialogIncrements::RefreshPattern() //--------------------------------------------------------------------------------------------------------------------- void DialogIncrements::FillIncrementsTable(QTableWidget *table, const QMap > &increments, - bool takePreviewCalculations, bool freshCall) + bool takePreviewCalculations) { SCASSERT(table != nullptr) @@ -920,11 +919,6 @@ void DialogIncrements::FillIncrementsTable(QTableWidget *table, } } - if (freshCall) - { - table->resizeColumnsToContents(); - table->resizeRowsToContents(); - } table->horizontalHeader()->setStretchLastSection(true); table->blockSignals(false); } diff --git a/src/app/valentina/dialogs/dialogincrements.h b/src/app/valentina/dialogs/dialogincrements.h index 97f17be60..eb80a056c 100644 --- a/src/app/valentina/dialogs/dialogincrements.h +++ b/src/app/valentina/dialogs/dialogincrements.h @@ -111,10 +111,10 @@ private: void FillIncrementsTable(QTableWidget *table, const QMap > &increments, - bool takePreviewCalculations, bool freshCall = false); + bool takePreviewCalculations); - void FillIncrements(bool freshCall = false); - void FillPreviewCalculations(bool freshCall = false); + void FillIncrements(); + void FillPreviewCalculations(); void FillLengthsLines(); void FillLengthLinesAngles(); void FillLengthsCurves();