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

Minor fixes for guiPopupMenuCtrl to get the submenu arrow to render, as well as a sanity check.

Browse source
This commit is contained in:
Areloch 2018-01-28 15:15:10 -06:00
parent cfe977584d
commit 398b00f0dd
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Engine/source/gui/editor/guiPopupMenuCtrl.cpp
View file

@ -59,7 +59,8 @@ void GuiPopupMenuBackgroundCtrl::onMouseDragged(const GuiEvent &event)
void GuiPopupMenuBackgroundCtrl::close()
{
getRoot()->removeObject(this);
if(getRoot())
getRoot()->removeObject(this);
mMenuBarCtrl = nullptr;
}
@ -151,16 +152,22 @@ void GuiPopupMenuTextListCtrl::onRenderCell(Point2I offset, Point2I cell, bool s
S32 bottom = top + 8;
S32 middle = top + 4;
PrimBuild::begin(GFXTriangleList, 3);
if (selected || mouseOver)
PrimBuild::color(mProfile->mFontColorHL);
else
PrimBuild::color(mProfile->mFontColor);
//PrimBuild::begin(GFXTriangleList, 3);
PrimBuild::vertex2i(left, top);
ColorI color = ColorI::BLACK;
if (selected || mouseOver)
color = mProfile->mFontColorHL;
else
color = mProfile->mFontColor;
GFX->getDrawUtil()->drawLine(Point2I(left, top), Point2I(right, middle), color);
GFX->getDrawUtil()->drawLine(Point2I(right, middle), Point2I(left, bottom), color);
GFX->getDrawUtil()->drawLine(Point2I(left, bottom), Point2I(left, top), color);
/*PrimBuild::vertex2i(left, top);
PrimBuild::vertex2i(right, middle);
PrimBuild::vertex2i(left, bottom);
PrimBuild::end();
PrimBuild::end();*/
}
}