From d6480cb63c880ba7a2e2ff4621b9eaa60fd3c435 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Mon, 6 Mar 2023 15:22:11 -0600 Subject: [PATCH] check wether or not mBitmapArrayRects.empty(). not simply if size() (cherry picked from commit fea81a4d57edff9c05bf397a5b21d8422838cc1c) --- Engine/source/gui/buttons/guiCheckBoxCtrl.cpp | 6 ++--- .../source/gui/buttons/guiIconButtonCtrl.cpp | 6 ++--- Engine/source/gui/containers/guiFormCtrl.cpp | 4 ++-- Engine/source/gui/containers/guiPaneCtrl.cpp | 2 +- Engine/source/gui/controls/guiPopUpCtrl.cpp | 22 +++++++++---------- Engine/source/gui/controls/guiPopUpCtrlEx.cpp | 8 +++---- Engine/source/gui/core/guiTypes.cpp | 4 ++-- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Engine/source/gui/buttons/guiCheckBoxCtrl.cpp b/Engine/source/gui/buttons/guiCheckBoxCtrl.cpp index 983709c7a..93e51168b 100644 --- a/Engine/source/gui/buttons/guiCheckBoxCtrl.cpp +++ b/Engine/source/gui/buttons/guiCheckBoxCtrl.cpp @@ -82,7 +82,7 @@ bool GuiCheckBoxCtrl::onWake() // make sure there is a bitmap array for this control type // if it is declared as such in the control - if( !mProfile->mBitmapArrayRects.size() && !mProfile->constructBitmapArray() ) + if(mProfile->mBitmapArrayRects.empty() && !mProfile->constructBitmapArray() ) { Con::errorf( "GuiCheckBoxCtrl::onWake - failed to create bitmap array from profile '%s'", mProfile->getName() ); return false; @@ -159,9 +159,9 @@ void GuiCheckBoxCtrl::autoSize() { mProfile->incLoadCount(); - if( !mProfile->mBitmapArrayRects.size() ) + if(mProfile->mBitmapArrayRects.empty()) mProfile->constructBitmapArray(); - if( mProfile->mBitmapArrayRects.size() ) + if(!mProfile->mBitmapArrayRects.empty()) bmpArrayRect0Width = mProfile->mBitmapArrayRects[ 0 ].extent.x; } diff --git a/Engine/source/gui/buttons/guiIconButtonCtrl.cpp b/Engine/source/gui/buttons/guiIconButtonCtrl.cpp index caee58921..00b7b5533 100644 --- a/Engine/source/gui/buttons/guiIconButtonCtrl.cpp +++ b/Engine/source/gui/buttons/guiIconButtonCtrl.cpp @@ -232,7 +232,7 @@ void GuiIconButtonCtrl::renderButton( Point2I &offset, const RectI& updateRect ) { // If there is a bitmap array then render using it. // Otherwise use a standard fill. - if(mProfile->mUseBitmapArray && mProfile->mBitmapArrayRects.size()) + if(mProfile->mUseBitmapArray && !mProfile->mBitmapArrayRects.empty()) renderBitmapArray(boundsRect, statePressed); else renderSlightlyLoweredBox(boundsRect, mProfile); @@ -241,7 +241,7 @@ void GuiIconButtonCtrl::renderButton( Point2I &offset, const RectI& updateRect ) { // If there is a bitmap array then render using it. // Otherwise use a standard fill. - if (mProfile->mUseBitmapArray && mProfile->mBitmapArrayRects.size()) + if (mProfile->mUseBitmapArray && !mProfile->mBitmapArrayRects.empty()) { renderBitmapArray(boundsRect, stateMouseOver); } @@ -257,7 +257,7 @@ void GuiIconButtonCtrl::renderButton( Point2I &offset, const RectI& updateRect ) { // If there is a bitmap array then render using it. // Otherwise use a standard fill. - if(mProfile->mUseBitmapArray && mProfile->mBitmapArrayRects.size()) + if(mProfile->mUseBitmapArray && !mProfile->mBitmapArrayRects.empty()) { if(mActive) renderBitmapArray(boundsRect, stateNormal); diff --git a/Engine/source/gui/containers/guiFormCtrl.cpp b/Engine/source/gui/containers/guiFormCtrl.cpp index c232b852a..3bf3289f4 100644 --- a/Engine/source/gui/containers/guiFormCtrl.cpp +++ b/Engine/source/gui/containers/guiFormCtrl.cpp @@ -135,7 +135,7 @@ bool GuiFormCtrl::onWake() mProfile->constructBitmapArray(); - if(mProfile->mUseBitmapArray && mProfile->mBitmapArrayRects.size()) + if(mProfile->mUseBitmapArray && !mProfile->mBitmapArrayRects.empty()) { mThumbSize.set( mProfile->mBitmapArrayRects[0].extent.x, mProfile->mBitmapArrayRects[0].extent.y ); mThumbSize.setMax( mProfile->mBitmapArrayRects[1].extent ); @@ -204,7 +204,7 @@ bool GuiFormCtrl::resize(const Point2I &newPosition, const Point2I &newExtent) if( !Parent::resize(newPosition, newExtent) ) return false; - if( !mAwake || !mProfile->mBitmapArrayRects.size() ) + if( !mAwake || mProfile->mBitmapArrayRects.empty()) return false; // Should the caption be modified because the title bar is too small? diff --git a/Engine/source/gui/containers/guiPaneCtrl.cpp b/Engine/source/gui/containers/guiPaneCtrl.cpp index ccb01ad2c..d646e2f44 100644 --- a/Engine/source/gui/containers/guiPaneCtrl.cpp +++ b/Engine/source/gui/containers/guiPaneCtrl.cpp @@ -112,7 +112,7 @@ bool GuiPaneControl::onWake() setCaptionID(mCaptionID); mProfile->constructBitmapArray(); - if(mProfile->mUseBitmapArray && mProfile->mBitmapArrayRects.size()) + if(mProfile->mUseBitmapArray && !mProfile->mBitmapArrayRects.empty()) { mThumbSize.set( mProfile->mBitmapArrayRects[0].extent.x, mProfile->mBitmapArrayRects[0].extent.y ); mThumbSize.setMax( mProfile->mBitmapArrayRects[1].extent ); diff --git a/Engine/source/gui/controls/guiPopUpCtrl.cpp b/Engine/source/gui/controls/guiPopUpCtrl.cpp index 695ddc3fb..ad4fafe4e 100644 --- a/Engine/source/gui/controls/guiPopUpCtrl.cpp +++ b/Engine/source/gui/controls/guiPopUpCtrl.cpp @@ -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) { diff --git a/Engine/source/gui/controls/guiPopUpCtrlEx.cpp b/Engine/source/gui/controls/guiPopUpCtrlEx.cpp index 8fb0edf3a..cacbc21c6 100644 --- a/Engine/source/gui/controls/guiPopUpCtrlEx.cpp +++ b/Engine/source/gui/controls/guiPopUpCtrlEx.cpp @@ -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; diff --git a/Engine/source/gui/core/guiTypes.cpp b/Engine/source/gui/core/guiTypes.cpp index 4bbb3d8d0..42d4d14a2 100644 --- a/Engine/source/gui/core/guiTypes.cpp +++ b/Engine/source/gui/core/guiTypes.cpp @@ -524,7 +524,7 @@ void GuiControlProfile::setChildrenProfile(GuiControlProfile *prof) RectI GuiControlProfile::getBitmapArrayRect(U32 i) { - if(!mBitmapArrayRects.size()) + if(mBitmapArrayRects.empty()) constructBitmapArray(); if( i >= mBitmapArrayRects.size()) @@ -535,7 +535,7 @@ RectI GuiControlProfile::getBitmapArrayRect(U32 i) S32 GuiControlProfile::constructBitmapArray() { - if(mBitmapArrayRects.size()) + if(!mBitmapArrayRects.empty()) return mBitmapArrayRects.size(); if( mBitmap.isNull() )