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

Fix uninit vars in gui

Browse source
This commit is contained in:
Ben Payne 2014-11-07 10:25:10 -05:00
parent 81e7dafb94
commit 2fc1ac4816
4 changed files with 12 additions and 3 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() 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); mExpanded.set(0,0,200,60);
mCaption = StringTable->EmptyString(); mCaption = StringTable->EmptyString();
@ -70,6 +74,7 @@ GuiRolloutCtrl::GuiRolloutCtrl()
mIsContainer = true; mIsContainer = true;
mCanCollapse = true; mCanCollapse = true;
mAutoCollapseSiblings = false; mAutoCollapseSiblings = false;
mHasTexture = false;
// Make sure we receive our ticks. // Make sure we receive our ticks.
setProcessTicks(); setProcessTicks();
} }

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

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

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

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

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

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