From f3a05994ada1229da4505c4dc933b034f4cfefb6 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 29 Nov 2017 08:20:43 +0100 Subject: [PATCH] Summary Calculator : Disable size hint to avoid text area to fill almost all space --- .../ProjectDataModel/RimSummaryCalculation.cpp | 15 +++++++++++++++ .../ProjectDataModel/RimSummaryCalculation.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp index fc823f7650..9ec7e9117e 100644 --- a/ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp +++ b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp @@ -428,6 +428,21 @@ QString RimSummaryCalculation::buildCalculationName() const return name; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimSummaryCalculation::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) +{ + if (field == &m_expression) + { + caf::PdmUiTextEditorAttribute* myAttr = dynamic_cast(attribute); + if (myAttr) + { + myAttr->heightHint = -1; + } + } +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCalculation.h b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.h index 107fcb660f..8c973ff724 100644 --- a/ApplicationCode/ProjectDataModel/RimSummaryCalculation.h +++ b/ApplicationCode/ProjectDataModel/RimSummaryCalculation.h @@ -67,6 +67,8 @@ private: virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; + virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, + caf::PdmUiEditorAttribute* attribute) override; RimSummaryCalculationVariable* findByName(const QString& name) const; RimSummaryCalculationVariable* addVariable(const QString& name); void deleteVariable(RimSummaryCalculationVariable* calcVariable);