TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-26 06:45:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/GarageGames/Torque3D into andOrMaybe

Browse source 
Conflicts:
	Engine/source/T3D/staticShape.cpp
This commit is contained in:
Azaezel 2016-12-20 22:50:28 -06:00
commit dd071484da
517 changed files with 87707 additions and 178465 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -381,7 +381,7 @@ bool GuiContainer::anchorControl( GuiControl *control, const Point2I &deltaParen
Point2I minExtent = control->getMinExtent();
// Only resize if our minExtent is satisfied with it.
if( !( newRect.extent.x >= control->getMinExtent().x && newRect.extent.y >= control->getMinExtent().y ) )
if( !( newRect.extent.x >= minExtent.x && newRect.extent.y >= minExtent.y ) )
return false;
if( newRect.point == oldRect.point && newRect.extent == oldRect.extent )

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

@ -384,8 +384,6 @@ void GuiFormCtrl::onMouseUp(const GuiEvent &event)
mouseUnlock();
setUpdate();
Point2I localClick = globalToLocalCoord(event.mousePoint);
// If we're clicking in the header then resize
//if(localClick.y < mThumbSize.y && mDepressed)
// setCollapsed(!mCollapsed);

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

@ -176,7 +176,6 @@ void GuiRolloutCtrl::removeObject( SimObject *obj )
void GuiRolloutCtrl::onMouseDown( const GuiEvent &event )
{
Point2I localPoint = globalToLocalCoord( event.mousePoint );
mouseLock();
}