From 4e31deb94d77b63d084447d1f7dc64f36096495d Mon Sep 17 00:00:00 2001 From: Areloch Date: Sat, 23 Feb 2019 16:08:47 -0600 Subject: [PATCH] Allows special inspectorFields to override the height they use in the rollouts --- Engine/source/gui/editor/inspector/field.cpp | 15 ++++++++++++--- Engine/source/gui/editor/inspector/field.h | 4 ++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Engine/source/gui/editor/inspector/field.cpp b/Engine/source/gui/editor/inspector/field.cpp index 2808ee140..02046f7a9 100644 --- a/Engine/source/gui/editor/inspector/field.cpp +++ b/Engine/source/gui/editor/inspector/field.cpp @@ -50,7 +50,9 @@ GuiInspectorField::GuiInspectorField( GuiInspector* inspector, mField( field ), mFieldArrayIndex( NULL ), mEdit( NULL ), - mTargetObject(NULL) + mTargetObject(NULL), + mUseHeightOverride(false), + mHeightOverride(18) { if( field != NULL ) mCaption = field->pFieldname; @@ -77,7 +79,9 @@ GuiInspectorField::GuiInspectorField() mTargetObject(NULL), mVariableName(StringTable->EmptyString()), mCallbackName(StringTable->EmptyString()), - mSpecialEditField(false) + mSpecialEditField(false), + mUseHeightOverride(false), + mHeightOverride(18) { setCanSave( false ); } @@ -112,7 +116,12 @@ bool GuiInspectorField::onAdd() if ( mEdit == NULL ) return false; - setBounds(0,0,100,18); + S32 fieldHeight = 18; + + if (mUseHeightOverride) + fieldHeight = mHeightOverride; + + setBounds(0,0,100, fieldHeight); // Add our edit as a child addObject( mEdit ); diff --git a/Engine/source/gui/editor/inspector/field.h b/Engine/source/gui/editor/inspector/field.h index cb1210b53..3df9f5ece 100644 --- a/Engine/source/gui/editor/inspector/field.h +++ b/Engine/source/gui/editor/inspector/field.h @@ -84,6 +84,10 @@ class GuiInspectorField : public GuiControl /// bool mHighlighted; + //These are so we can special-case our height for additional room on certain field-types + bool mUseHeightOverride; + U32 mHeightOverride; + //An override that lets us bypass inspector-dependent logic for setting/getting variables/fields bool mSpecialEditField; //An override to make sure this field is associated to an object that isn't expressly