TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2320 from Areloch/setFieldHeight

Browse source 
Allows special inspectorFields to override their height
This commit is contained in:
Areloch 2019-03-30 16:31:21 -05:00 • committed by GitHub
commit 9ae6a5bfa7
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Engine/source/gui/editor/inspector/field.cpp
View file

@ -50,7 +50,9 @@ GuiInspectorField::GuiInspectorField( GuiInspector* inspector,
mField( field ), mField( field ),
mFieldArrayIndex( NULL ), mFieldArrayIndex( NULL ),
mEdit( NULL ), mEdit( NULL ),
mTargetObject(NULL) mTargetObject(NULL),
mUseHeightOverride(false),
mHeightOverride(18)
{ {
if( field != NULL ) if( field != NULL )
mCaption = field->pFieldname; mCaption = field->pFieldname;
@ -77,7 +79,9 @@ GuiInspectorField::GuiInspectorField()
mTargetObject(NULL), mTargetObject(NULL),
mVariableName(StringTable->EmptyString()), mVariableName(StringTable->EmptyString()),
mCallbackName(StringTable->EmptyString()), mCallbackName(StringTable->EmptyString()),
mSpecialEditField(false) mSpecialEditField(false),
mUseHeightOverride(false),
mHeightOverride(18)
{ {
setCanSave( false ); setCanSave( false );
} }
@ -112,7 +116,12 @@ bool GuiInspectorField::onAdd()
if ( mEdit == NULL ) if ( mEdit == NULL )
return false; 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 // Add our edit as a child
addObject( mEdit ); addObject( mEdit );

4
Engine/source/gui/editor/inspector/field.h
View file

@ -84,6 +84,10 @@ class GuiInspectorField : public GuiControl
/// ///
bool mHighlighted; 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 //An override that lets us bypass inspector-dependent logic for setting/getting variables/fields
bool mSpecialEditField; bool mSpecialEditField;
//An override to make sure this field is associated to an object that isn't expressly //An override to make sure this field is associated to an object that isn't expressly