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

Merge pull request #1647 from marauder2k9-torque/development
Some checks are pending
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Waiting to run
Details
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Waiting to run
Details
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Waiting to run
Details

Browse source 
Update guiPopUpCtrl.cpp
This commit is contained in:
Brian Roberts 2025-12-31 10:00:47 -06:00 committed by GitHub
parent 9ebbd638a0 26ae2f8420
commit 0f32c10a2c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -657,27 +657,33 @@ void GuiPopUpMenuCtrl::addEntry( const char *buf, S32 id, U32 scheme )
e.ascii = cp ? cp[1] : 0;
// See if there is a colour box defined with the text
char *cb = dStrchr( e.buf, '|' );
if ( cb )
char* firstBar = dStrchr(e.buf, '|');
if (firstBar)
{
e.usesColorBox = true;
cb[0] = '\0';
char* red = firstBar + 1;
char* secondBar = dStrchr(red, '|');
if (secondBar)
{
char* green = secondBar + 1;
char* thirdBar = dStrchr(green, '|');
if (thirdBar)
{
char* blue = thirdBar + 1;
char* red = &cb[1];
cb = dStrchr(red, '|');
cb[0] = '\0';
char* green = &cb[1];
cb = dStrchr(green, '|');
cb[0] = '\0';
char* blue = &cb[1];
// Now we know the format is valid: text|r|g|b
firstBar[0] = '\0';
secondBar[0] = '\0';
thirdBar[0] = '\0';
U32 r = dAtoi(red);
U32 g = dAtoi(green);
U32 b = dAtoi(blue);
U32 r = dAtoi(red);
U32 g = dAtoi(green);
U32 b = dAtoi(blue);
e.colorbox = ColorI(r,g,b);
}
e.colorbox = ColorI(r, g, b);
e.usesColorBox = true;
}
}
}
else
{
e.usesColorBox = false;