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

Small fixes to the inspector, and added the ability for the variableInspector to process command and filename field types.

Browse source
This commit is contained in:
Areloch 2018-01-28 15:12:02 -06:00
parent 6563f46242
commit 73b81a8246
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/gui/editor/guiInspector.cpp
View file

@ -54,7 +54,8 @@ GuiInspector::GuiInspector()
mOverDivider( false ), mOverDivider( false ),
mMovingDivider( false ), mMovingDivider( false ),
mHLField( NULL ), mHLField( NULL ),
mShowCustomFields( true ) mShowCustomFields( true ),
mComponentGroupTargetId(-1)
{ {
mPadding = 1; mPadding = 1;
} }
@ -620,7 +621,10 @@ void GuiInspector::refresh()
else else
compName = comp->getComponentName(); compName = comp->getComponentName();
GuiInspectorGroup *compGroup = new GuiInspectorComponentGroup(compName, this, comp); StringBuilder captionString;
captionString.format("%s [%i]", compName.c_str(), comp->getId());
GuiInspectorGroup *compGroup = new GuiInspectorComponentGroup(captionString.data(), this, comp);
if (compGroup != NULL) if (compGroup != NULL)
{ {
compGroup->registerObject(); compGroup->registerObject();

5
Engine/source/gui/editor/inspector/variableInspector.cpp
View file

@ -167,6 +167,10 @@ void GuiVariableInspector::addField(const char* name, const char* label, const c
fieldTypeMask = TypeColorF; fieldTypeMask = TypeColorF;
else if (newField.mFieldTypeName == StringTable->insert("ease")) else if (newField.mFieldTypeName == StringTable->insert("ease"))
fieldTypeMask = TypeEaseF; fieldTypeMask = TypeEaseF;
else if (newField.mFieldTypeName == StringTable->insert("command"))
fieldTypeMask = TypeCommand;
else if (newField.mFieldTypeName == StringTable->insert("filename"))
fieldTypeMask = TypeStringFilename;
else else
fieldTypeMask = -1; fieldTypeMask = -1;
@ -192,6 +196,7 @@ void GuiVariableInspector::addCallbackField(const char* name, const char* label,
void GuiVariableInspector::clearFields() void GuiVariableInspector::clearFields()
{ {
mFields.clear(); mFields.clear();
clearGroups();
update(); update();
} }