TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Tabs&Spaces

Browse source
This commit is contained in:
Areloch 2018-02-08 16:04:50 -06:00
parent 40fff8ef50
commit 4d10f02890
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,7 @@ GuiCanvas::GuiCanvas(): GuiControl(),
mPlatformWindow(NULL),
mDisplayWindow(true),
mMenuBarCtrl(nullptr),
mMenuBackground(nullptr)
mMenuBackground(nullptr)
{
setBounds(0, 0, 640, 480);
mAwake = true;
@ -297,11 +297,11 @@ void GuiCanvas::setMenuBar(SimObject *obj)
mMenuBarCtrl = dynamic_cast<GuiControl*>(obj);
//remove old menubar
if (oldMenuBar)
{
Parent::removeObject(oldMenuBar);
Parent::removeObject(mMenuBackground); //also remove the modeless wrapper
}
if (oldMenuBar)
{
Parent::removeObject(oldMenuBar);
Parent::removeObject(mMenuBackground); //also remove the modeless wrapper
}
// set new menubar
if (mMenuBarCtrl)
@ -316,15 +316,15 @@ void GuiCanvas::setMenuBar(SimObject *obj)
return;
}
if (mMenuBackground == nullptr)
{
mMenuBackground = new GuiControl();
mMenuBackground->registerObject();
if (mMenuBackground == nullptr)
{
mMenuBackground = new GuiControl();
mMenuBackground->registerObject();
mMenuBackground->setControlProfile(profile);
}
mMenuBackground->setControlProfile(profile);
}
mMenuBackground->addObject(mMenuBarCtrl);
mMenuBackground->addObject(mMenuBarCtrl);
Parent::addObject(mMenuBackground);
}