TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-21 15:43:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1035 from bpay/memfixes

Browse source 
Memfixes
This commit is contained in:
Luis Anton Rebollo 2015-01-25 13:42:32 +01:00
commit 6492028bb2
26 changed files with 79 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,6 +56,10 @@ IMPLEMENT_CALLBACK( GuiRolloutCtrl, onCollapsed, void, (), (),
//-----------------------------------------------------------------------------
GuiRolloutCtrl::GuiRolloutCtrl()
: mHeader(0,0,0,0),
mExpanded(0,0,0,0),
mChildRect(0,0,0,0),
mMargin(0,0,0,0)
{
mExpanded.set(0,0,200,60);
mCaption = StringTable->EmptyString();
@ -70,6 +74,7 @@ GuiRolloutCtrl::GuiRolloutCtrl()
mIsContainer = true;
mCanCollapse = true;
mAutoCollapseSiblings = false;
mHasTexture = false;
// Make sure we receive our ticks.
setProcessTicks();
}

5
Engine/source/gui/containers/guiScrollCtrl.cpp
View file

@ -72,8 +72,9 @@ GuiScrollCtrl::GuiScrollCtrl()
mAnimating( false ),
mScrollAnimSpeed( -1 ),
mScrollTargetPos( -1, -1 ),
mChildExt(0, 0),
mChildPos(0, 0)
mChildExt(0, 0),
mChildPos(0, 0),
mBaseThumbSize(0)
{
mIsContainer = true;
setExtent(200,200);

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

@ -98,10 +98,10 @@ GuiWindowCtrl::GuiWindowCtrl()
mMouseMovingWin = false;
mMouseResizeWidth = false;
mMouseResizeHeight = false;
setExtent(100, 200);
mMinimizeIndex = -1;
mTabIndex = -1;
mBitmapBounds = NULL;
setExtent(100, 200);
RectI closeRect(80, 2, 16, 16);
mCloseButton = closeRect;

3
Engine/source/gui/core/guiCanvas.cpp
View file

@ -95,9 +95,11 @@ extern InputModifiers convertModifierBits(const U32 in);
//-----------------------------------------------------------------------------
GuiCanvas::GuiCanvas(): GuiControl(),
mCurUpdateRect(0, 0, 0, 0),
mCursorEnabled(true),
mForceMouseToGUI(false),
mAlwaysHandleMouseButtons(false),
mCursorChanged(0),
mClampTorqueCursor(true),
mShowCursor(true),
mLastCursorEnabled(false),
@ -121,6 +123,7 @@ GuiCanvas::GuiCanvas(): GuiControl(),
mLeftMouseLast(false),
mMiddleMouseLast(false),
mRightMouseLast(false),
mMouseDownPoint(0.0f,0.0f),
mPlatformWindow(NULL),
mLastRenderMs(0),
mDisplayWindow(true)