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

whitespace

Browse source
This commit is contained in:
Thomas "elfprince13" Dickerson 2017-01-11 23:34:46 -05:00
parent 6164f36c47
commit bcc5459818
50 changed files with 2111 additions and 2111 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gui/containers/guiFormCtrl.cpp
View file

@ -158,7 +158,7 @@ void GuiFormCtrl::addObject(SimObject *newObj )
GuiControl* parent = getParent();
if ( parent )
parent->addObject( newObj );
parent->addObject( newObj );
return;
}

16
Engine/source/gui/containers/guiPaneCtrl.cpp
View file

@ -108,7 +108,7 @@ bool GuiPaneControl::onWake()
}
if(mCaptionID && *mCaptionID != 0)
setCaptionID(mCaptionID);
setCaptionID(mCaptionID);
mProfile->constructBitmapArray();
if(mProfile->mUseBitmapArray && mProfile->mBitmapArrayRects.size())
@ -131,19 +131,19 @@ bool GuiPaneControl::onWake()
void GuiPaneControl::setCaptionID(const char *id)
{
S32 n = Con::getIntVariable(id, -1);
if(n != -1)
{
mCaptionID = StringTable->insert(id);
setCaptionID(n);
}
S32 n = Con::getIntVariable(id, -1);
if(n != -1)
{
mCaptionID = StringTable->insert(id);
setCaptionID(n);
}
}
//-----------------------------------------------------------------------------
void GuiPaneControl::setCaptionID(S32 id)
{
mCaption = getGUIString(id);
mCaption = getGUIString(id);
}
//-----------------------------------------------------------------------------

14
Engine/source/gui/containers/guiRolloutCtrl.cpp
View file

@ -462,9 +462,9 @@ void GuiRolloutCtrl::processTick()
newHeight -= mAnimateStep;
if( !mIsAnimating )
{
{
mIsExpanded = false;
}
}
}
else // We're expanding ourself (Showing our contents)
{
@ -559,13 +559,13 @@ void GuiRolloutCtrl::onRender( Point2I offset, const RectI &updateRect )
if ( pChild )
{
if ( !mIsExpanded && !mIsAnimating && pChild->isVisible() )
{
{
pChild->setVisible( false );
}
}
else if ( (mIsExpanded || mIsAnimating) && !pChild->isVisible() )
{
{
pChild->setVisible( true );
}
}
}
renderChildControls( offset, updateRect );
@ -614,7 +614,7 @@ DefineEngineMethod( GuiRolloutCtrl, toggleCollapse, void, (),,
if( object->isExpanded() )
object->collapse();
else
object->expand();
object->expand();
}
//-----------------------------------------------------------------------------

16
Engine/source/gui/containers/guiWindowCtrl.cpp
View file

@ -231,7 +231,7 @@ void GuiWindowCtrl::moveFromCollapseGroup()
parent->mCollapseGroupVec[groupVec].first()->mCollapseGroupNum = -1;
parent->mCollapseGroupVec[groupVec].erase(U32(0));
parent->mCollapseGroupVec[groupVec].setSize(groupVecCount - 1);
parent->mCollapseGroupVec.erase(groupVec);
parent->mCollapseGroupVec.erase(groupVec);
}
}
@ -381,7 +381,7 @@ void GuiWindowCtrl::refreshCollapseGroups()
if( !parent )
return;
CollapseGroupNumVec collapseGroupNumVec;
CollapseGroupNumVec collapseGroupNumVec;
// iterate through the collided array, renumbering the windows pointers
S32 assignGroupNum = 0;
@ -463,7 +463,7 @@ void GuiWindowCtrl::handleCollapseGroup()
if( !parent )
return;
CollapseGroupNumVec collapseGroupNumVec;
CollapseGroupNumVec collapseGroupNumVec;
if( mIsCollapsed ) // minimize window up to its header bar
{
@ -529,7 +529,7 @@ void GuiWindowCtrl::handleCollapseGroup()
if((*iter)->mCollapseGroupNum > mCollapseGroupNum)
{
Point2I newChildPosition = (*iter)->getPosition();
newChildPosition.y += moveChildYBy;
newChildPosition.y += moveChildYBy;
(*iter)->resize(newChildPosition, (*iter)->getExtent());
}
}
@ -547,7 +547,7 @@ bool GuiWindowCtrl::resizeCollapseGroup(bool resizeX, bool resizeY, Point2I resi
if( !parent )
return false;
CollapseGroupNumVec collapseGroupNumVec;
CollapseGroupNumVec collapseGroupNumVec;
bool canResize = true;
CollapseGroupNumVec::iterator iter = parent->mCollapseGroupVec[mCollapseGroup].begin();
@ -980,7 +980,7 @@ void GuiWindowCtrl::onMouseDragged(const GuiEvent &event)
moveWithCollapseGroup(newPosition);
if(mCanCollapse && mCollapseGroup >= 0 && mResizeWindow == true )
{
{
// Resize the window if allowed
if( newExtent.y >= getMinExtent().y && newExtent.x >= getMinExtent().x)
{
@ -1212,7 +1212,7 @@ void GuiWindowCtrl::onMouseUp(const GuiEvent &event)
// We're either moving out of a collapse group or moving to another one
// Not valid for windows not previously in a group
if( mCollapseGroup >= 0 &&
(snapType == -1 || (hitWindow && snapType >= 0 && mCollapseGroup != hitWindow->mCollapseGroup)))
(snapType == -1 || (hitWindow && snapType >= 0 && mCollapseGroup != hitWindow->mCollapseGroup)))
moveFromCollapseGroup();
// No window to connect to
@ -1830,7 +1830,7 @@ void GuiWindowCtrl::parentResized(const RectI &oldParentRect, const RectI &newPa
// Only for collpasing groups, if were not, then do it like normal windows
if( mCanCollapse && mCollapseGroup >= 0 )
{
{
bool resizeMe = false;
// Only the group window should control positioning