RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-08-05 00:14:31 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: RomanRom2:62e2f9c31c277b58ce98354c469b8440ef44b500
Branches Tags
RomanRom2:master
..
compare: RomanRom2:145a658c508e2b62bfff61e212df8845b367fab0
Branches Tags
RomanRom2:master

3 Commits
62e2f9c31c ... 145a658c50

Author SHA1 Message Date
Alex Tiernan-Berry
145a658c50
Merge 0573235a70 into 0163d91543 2026-07-24 13:29:54 -05:00
fallenoak
0163d91543 chore(util): tune up StringToDrawLayer
Some checks are pending
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:cl compiler_name:MSVC cxx:cl os:windows-latest system_name:Windows test_path:WhoaTest]) (push) Waiting to run
Details
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:clang compiler_name:Clang cxx:clang++ os:macos-latest system_name:macOS test_path:WhoaTest]) (push) Waiting to run
Details
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:gcc compiler_name:GCC cxx:g++ os:ubuntu-latest system_name:Linux test_path:WhoaTest]) (push) Waiting to run
Details
2026-07-24 13:29:07 -05:00
fallenoak
dd3a0f6a81 fix(util): fix improper handling of BOTTOM in StringToJustify 2026-07-24 13:21:36 -05:00
1 changed files with 9 additions and 9 deletions
Show Stats Expand all files Collapse all files

18
src/util/StringTo.cpp
View File

@ -112,12 +112,12 @@ bool StringToBOOL(lua_State* L, int32_t idx, int32_t def) {
}
int32_t StringToDrawLayer(const char* string, int32_t& layer) {
struct drawlayer {
struct LayerEntry {
int32_t layer;
const char* string;
};
static drawlayer array_drawlayer[5] = {
static LayerEntry layerMap[] = {
{ 0, "BACKGROUND" },
{ 1, "BORDER" },
{ 2, "ARTWORK" },
@ -125,9 +125,9 @@ int32_t StringToDrawLayer(const char* string, int32_t& layer) {
{ 4, "HIGHLIGHT" }
};
for (int32_t i = 0; i < 5; i++) {
if (!SStrCmpI(array_drawlayer[i].string, string, 0x7FFFFFFFu)) {
layer = array_drawlayer[i].layer;
for (const auto& entry : layerMap) {
if (!SStrCmpI(entry.string, string)) {
layer = entry.layer;
return 1;
}
}
@ -141,7 +141,7 @@ int32_t StringToJustify(const char* string, uint32_t& justify) {
const char* string;
};
static JustifyEntry justifyMap[6] = {
static JustifyEntry justifyMap[] = {
{ 0x1, "LEFT" },
{ 0x2, "CENTER" },
{ 0x4, "RIGHT" },
@ -150,9 +150,9 @@ int32_t StringToJustify(const char* string, uint32_t& justify) {
{ 0x20, "BOTTOM" }
};
for (int32_t i = 0; i < 5; i++) {
if (!SStrCmpI(justifyMap[i].string, string, 0x7FFFFFFFu)) {
justify = justifyMap[i].value;
for (const auto& entry : justifyMap) {
if (!SStrCmpI(entry.string, string)) {
justify = entry.value;
return 1;
}
}