TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 05:50:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

check wether or not mBitmapArrayRects.empty(). not simply if size()

Browse source 
(cherry picked from commit fea81a4d57edff9c05bf397a5b21d8422838cc1c)
This commit is contained in:
AzaezelX 2023-03-06 15:22:11 -06:00
parent f1d42d3867
commit d6480cb63c
7 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Engine/source/gui/controls/guiPopUpCtrl.cpp
View file

@ -879,7 +879,7 @@ void GuiPopUpMenuCtrl::onRender( Point2I offset, const RectI &updateRect )
S32 top = baseRect.point.y, bottom = baseRect.point.y + baseRect.extent.y - 1;
// Do we render a bitmap border or lines?
if ( mProfile->getChildrenProfile() && mProfile->mBitmapArrayRects.size() )
if ( mProfile->getChildrenProfile() && !mProfile->mBitmapArrayRects.empty())
{
if (mProfile->mBitmapArrayRects[0].extent.y < baseRect.extent.y)
{
@ -912,7 +912,7 @@ void GuiPopUpMenuCtrl::onRender( Point2I offset, const RectI &updateRect )
}
// Do we render a bitmap border or lines?
if ( !( mProfile->getChildrenProfile() && mProfile->mBitmapArrayRects.size() ) )
if (!mProfile->getChildrenProfile() && !mProfile->mBitmapArrayRects.empty())
{
drawUtil->drawLine(left, top, left, bottom, colorWhite );
drawUtil->drawLine(left, top, right, top, colorWhite );
@ -930,7 +930,7 @@ void GuiPopUpMenuCtrl::onRender( Point2I offset, const RectI &updateRect )
S32 top = baseRect.point.y, bottom = baseRect.point.y + baseRect.extent.y - 1;
// Do we render a bitmap border or lines?
if ( mProfile->getChildrenProfile() && mProfile->mBitmapArrayRects.size() )
if ( mProfile->getChildrenProfile() && !mProfile->mBitmapArrayRects.empty())
{
if (mProfile->mBitmapArrayRects[0].extent.y < baseRect.extent.y)
{
@ -956,7 +956,7 @@ void GuiPopUpMenuCtrl::onRender( Point2I offset, const RectI &updateRect )
}
// Do we render a bitmap border or lines?
if ( !( mProfile->getChildrenProfile() && mProfile->mBitmapArrayRects.size() ) )
if (!mProfile->getChildrenProfile() && !mProfile->mBitmapArrayRects.empty())
{
drawUtil->drawLine(left, top, left, bottom, colorWhite);
drawUtil->drawLine(left, top, right, top, colorWhite);
@ -967,7 +967,7 @@ void GuiPopUpMenuCtrl::onRender( Point2I offset, const RectI &updateRect )
else
{
// Do we render a bitmap border or lines?
if ( mProfile->getChildrenProfile() && mProfile->mBitmapArrayRects.size() )
if ( mProfile->getChildrenProfile() && !mProfile->mBitmapArrayRects.empty())
{
if (mProfile->mBitmapArrayRects[0].extent.y < baseRect.extent.y)
{
@ -992,7 +992,7 @@ void GuiPopUpMenuCtrl::onRender( Point2I offset, const RectI &updateRect )
}
// Do we render a bitmap border or lines?
if ( !( mProfile->getChildrenProfile() && mProfile->mBitmapArrayRects.size() ) )
if (!mProfile->getChildrenProfile() && !mProfile->mBitmapArrayRects.empty())
{
if (mProfile->mBitmapArrayRects[0].extent.y < baseRect.extent.y)
{
@ -1013,7 +1013,7 @@ void GuiPopUpMenuCtrl::onRender( Point2I offset, const RectI &updateRect )
switch (mProfile->mAlignment)
{
case GuiControlProfile::RightJustify:
if ( mProfile->getChildrenProfile() && mProfile->mBitmapArrayRects.size() )
if ( mProfile->getChildrenProfile() && !mProfile->mBitmapArrayRects.empty())
{
// We're making use of a bitmap border, so take into account the
// right cap of the border.
@ -1026,7 +1026,7 @@ void GuiPopUpMenuCtrl::onRender( Point2I offset, const RectI &updateRect )
}
break;
case GuiControlProfile::CenterJustify:
if ( mProfile->getChildrenProfile() && mProfile->mBitmapArrayRects.size() )
if ( mProfile->getChildrenProfile() && !mProfile->mBitmapArrayRects.empty())
{
// We're making use of a bitmap border, so take into account the
// right cap of the border.
@ -1045,7 +1045,7 @@ void GuiPopUpMenuCtrl::onRender( Point2I offset, const RectI &updateRect )
// The width of the text is greater than the width of the control.
// In this case we will right justify the text and leave some space
// for the down arrow.
if ( mProfile->getChildrenProfile() && mProfile->mBitmapArrayRects.size() )
if ( mProfile->getChildrenProfile() && !mProfile->mBitmapArrayRects.empty())
{
// We're making use of a bitmap border, so take into account the
// right cap of the border.
@ -1097,7 +1097,7 @@ void GuiPopUpMenuCtrl::onRender( Point2I offset, const RectI &updateRect )
// Draw the second column to the right
getColumn( mText, buff, 1, "\t" );
S32 colTxt_w = mProfile->mFont->getStrWidth( buff );
if ( mProfile->getChildrenProfile() && mProfile->mBitmapArrayRects.size() )
if ( mProfile->getChildrenProfile() && !mProfile->mBitmapArrayRects.empty())
{
// We're making use of a bitmap border, so take into account the
// right cap of the border.
@ -1117,7 +1117,7 @@ void GuiPopUpMenuCtrl::onRender( Point2I offset, const RectI &updateRect )
}
// If we're rendering a bitmap border, then it will take care of the arrow.
if ( !(mProfile->getChildrenProfile() && mProfile->mBitmapArrayRects.size()) )
if (!mProfile->getChildrenProfile() && !mProfile->mBitmapArrayRects.empty())
{
if (mProfile->mBitmapArrayRects[0].extent.y < baseRect.extent.y)
{

8
Engine/source/gui/controls/guiPopUpCtrlEx.cpp
View file

@ -1088,7 +1088,7 @@ void GuiPopUpMenuCtrlEx::onRender(Point2I offset, const RectI &updateRect)
}
// Do we render a bitmap border or lines?
if ( !( mProfile->getChildrenProfile() && mProfile->mBitmapArrayRects.size() ) )
if (!mProfile->getChildrenProfile() && !mProfile->mBitmapArrayRects.empty())
{
drawUtil->drawLine( l, t, l, b, colorWhite );
drawUtil->drawLine( l, t, r2, t, colorWhite );
@ -1126,7 +1126,7 @@ void GuiPopUpMenuCtrlEx::onRender(Point2I offset, const RectI &updateRect)
}
// Do we render a bitmap border or lines?
if ( !( mProfile->getChildrenProfile() && mProfile->mBitmapArrayRects.size() ) )
if (!mProfile->getChildrenProfile() && !mProfile->mBitmapArrayRects.empty())
{
drawUtil->drawLine( l, t, l, b, colorWhite );
drawUtil->drawLine( l, t, r2, t, colorWhite );
@ -1156,7 +1156,7 @@ void GuiPopUpMenuCtrlEx::onRender(Point2I offset, const RectI &updateRect)
}
// Do we render a bitmap border or lines?
if ( !( mProfile->getChildrenProfile() && mProfile->mBitmapArrayRects.size() ) )
if (!mProfile->getChildrenProfile() && !mProfile->mBitmapArrayRects.empty())
{
drawUtil->drawRect( r, mProfile->mBorderColorNA );
}
@ -1275,7 +1275,7 @@ void GuiPopUpMenuCtrlEx::onRender(Point2I offset, const RectI &updateRect)
}
// If we're rendering a bitmap border, then it will take care of the arrow.
if ( !(mProfile->getChildrenProfile() && mProfile->mBitmapArrayRects.size()) )
if (!mProfile->getChildrenProfile() && !mProfile->mBitmapArrayRects.empty())
{
// Draw a triangle (down arrow)
S32 left = r.point.x + r.extent.x - 12;