Permalink
Browse files

Inspector Fixes

The Inspector control was having some problems with separation anxiety with one of the removed buttons.
  • Loading branch information...
greenfire27 committed Jan 30, 2019
1 parent 28806e6 commit ef8a2ce264c2a7814af32a08c3aefc613ec988c6
@@ -619,11 +619,8 @@
<ClCompile Include="..\..\source\string\stringTable.cc" />
<ClCompile Include="..\..\source\string\stringUnit.cpp" />
<ClCompile Include="..\..\source\string\unicode.cc" />
<ClCompile Include="..\..\source\gui\buttons\guiBitmapButtonCtrl.cc" />
<ClCompile Include="..\..\source\gui\buttons\guiButtonBaseCtrl.cc" />
<ClCompile Include="..\..\source\gui\buttons\guiButtonCtrl.cc" />
<ClCompile Include="..\..\source\gui\buttons\guiCheckBoxCtrl.cc" />
<ClCompile Include="..\..\source\gui\buttons\guiIconButtonCtrl.cc" />
<ClCompile Include="..\..\source\gui\buttons\guiRadioCtrl.cc" />
<ClCompile Include="..\..\source\gui\containers\guiAutoScrollCtrl.cc" />
<ClCompile Include="..\..\source\gui\containers\guiCtrlArrayCtrl.cc" />
@@ -1211,11 +1208,8 @@
<ClInclude Include="..\..\source\string\stringUnit.h" />
<ClInclude Include="..\..\source\string\stringUnit_ScriptBinding.h" />
<ClInclude Include="..\..\source\string\unicode.h" />
<ClInclude Include="..\..\source\gui\buttons\guiBitmapButtonCtrl.h" />
<ClInclude Include="..\..\source\gui\buttons\guiButtonBaseCtrl.h" />
<ClInclude Include="..\..\source\gui\buttons\guiButtonCtrl.h" />
<ClInclude Include="..\..\source\gui\buttons\guiCheckBoxCtrl.h" />
<ClInclude Include="..\..\source\gui\buttons\guiIconButtonCtrl.h" />
<ClInclude Include="..\..\source\gui\buttons\guiRadioCtrl.h" />
<ClInclude Include="..\..\source\gui\containers\guiAutoScrollCtrl.h" />
<ClInclude Include="..\..\source\gui\containers\guiCtrlArrayCtrl.h" />
@@ -450,21 +450,12 @@
<ClCompile Include="..\..\source\platformWin32\threads\thread.cc">
<Filter>platformWin32\threads</Filter>
</ClCompile>
<ClCompile Include="..\..\source\gui\buttons\guiBitmapButtonCtrl.cc">
<Filter>gui\buttons</Filter>
</ClCompile>
<ClCompile Include="..\..\source\gui\buttons\guiButtonBaseCtrl.cc">
<Filter>gui\buttons</Filter>
</ClCompile>
<ClCompile Include="..\..\source\gui\buttons\guiButtonCtrl.cc">
<Filter>gui\buttons</Filter>
</ClCompile>
<ClCompile Include="..\..\source\gui\buttons\guiCheckBoxCtrl.cc">
<Filter>gui\buttons</Filter>
</ClCompile>
<ClCompile Include="..\..\source\gui\buttons\guiIconButtonCtrl.cc">
<Filter>gui\buttons</Filter>
</ClCompile>
<ClCompile Include="..\..\source\gui\buttons\guiRadioCtrl.cc">
<Filter>gui\buttons</Filter>
</ClCompile>
@@ -1698,21 +1689,12 @@
<ClInclude Include="..\..\source\platformWin32\nativeDialogs\win32DirectoryResolver.h">
<Filter>platformWin32\nativeDialogs</Filter>
</ClInclude>
<ClInclude Include="..\..\source\gui\buttons\guiBitmapButtonCtrl.h">
<Filter>gui\buttons</Filter>
</ClInclude>
<ClInclude Include="..\..\source\gui\buttons\guiButtonBaseCtrl.h">
<Filter>gui\buttons</Filter>
</ClInclude>
<ClInclude Include="..\..\source\gui\buttons\guiButtonCtrl.h">
<Filter>gui\buttons</Filter>
</ClInclude>
<ClInclude Include="..\..\source\gui\buttons\guiCheckBoxCtrl.h">
<Filter>gui\buttons</Filter>
</ClInclude>
<ClInclude Include="..\..\source\gui\buttons\guiIconButtonCtrl.h">
<Filter>gui\buttons</Filter>
</ClInclude>
<ClInclude Include="..\..\source\gui\buttons\guiRadioCtrl.h">
<Filter>gui\buttons</Filter>
</ClInclude>
@@ -20,7 +20,7 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
#include "gui/editor/guiInspector.h"
#include "gui/buttons/guiIconButtonCtrl.h"
#include "gui/buttons/guiButtonCtrl.h"
#include "memory/frameAllocator.h"

//////////////////////////////////////////////////////////////////////////
@@ -782,9 +782,9 @@ bool GuiInspectorDynamicGroup::createContent()
return false;

// add a button that lets us add new dynamic fields.
GuiIconButtonCtrl* addFieldBtn = new GuiIconButtonCtrl();
GuiButtonCtrl* addFieldBtn = new GuiButtonCtrl();
{
addFieldBtn->setBitmap("tools/gui/images/iconAdd");
//addFieldBtn->setBitmap("tools/gui/images/iconAdd");

SimObject* profilePtr = Sim::findObject("EditorButton");
if( profilePtr != NULL )
@@ -1086,7 +1086,7 @@ GuiControl* GuiInspectorDynamicField::constructRenameControl()
mEdit->resize(valueRect.point, valueRect.extent);

// Finally, add a delete button for this field
GuiIconButtonCtrl * delButt = new GuiIconButtonCtrl();
GuiButtonCtrl * delButt = new GuiButtonCtrl();
if( delButt != NULL )
{
dSprintf(szBuffer, 512, "%d.%s = \"\";%d.inspectGroup();", mTarget->getId(), getFieldName(), mParent->getId());
@@ -54,8 +54,8 @@
#include "gui/guiTextEditCtrl.h"
#endif

#ifndef _GUIBITMAPBUTTON_H_
#include "gui/buttons/guiBitmapButtonCtrl.h"
#ifndef _GUIBUTTONCTRL_H_
#include "gui/buttons/guiButtonCtrl.h"
#endif

#ifndef _GUIPOPUPCTRL_H_

0 comments on commit ef8a2ce

Please sign in to comment.