luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-18 10:45:27 +02:00
Code Activity

Formspecs: Allow setting alpha value for the box[] element

Browse Source
This commit is contained in:
Thomas--S
2018-04-23 19:50:50 +02:00
committed by rubenwardy
parent 12a8f8826d
commit 9577a4396a
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/util/string.cpp
View File

@@ -43,7 +43,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define BSD_ICONV_USED
#endif
static bool parseHexColorString(const std::string &value, video::SColor &color);
static bool parseHexColorString(const std::string &value, video::SColor &color,
unsigned char default_alpha = 0xff);
static bool parseNamedColorString(const std::string &value, video::SColor &color);
#ifndef _WIN32
@@ -464,12 +465,13 @@ u64 read_seed(const char *str)
return num;
}
bool parseColorString(const std::string &value, video::SColor &color, bool quiet)
bool parseColorString(const std::string &value, video::SColor &color, bool quiet,
unsigned char default_alpha)
{
bool success;
if (value[0] == '#')
success = parseHexColorString(value, color);
success = parseHexColorString(value, color, default_alpha);
else
success = parseNamedColorString(value, color);
@@ -479,9 +481,10 @@ bool parseColorString(const std::string &value, video::SColor &color, bool quiet
return success;
}
static bool parseHexColorString(const std::string &value, video::SColor &color)
static bool parseHexColorString(const std::string &value, video::SColor &color,
unsigned char default_alpha)
{
unsigned char components[] = { 0x00, 0x00, 0x00, 0xff }; // R,G,B,A
unsigned char components[] = { 0x00, 0x00, 0x00, default_alpha }; // R,G,B,A
if (value[0] != '#')
return false;

3
src/util/string.h
View File

@@ -85,7 +85,8 @@ std::string writeFlagString(u32 flags, const FlagDesc *flagdesc, u32 flagmask);
size_t mystrlcpy(char *dst, const char *src, size_t size);
char *mystrtok_r(char *s, const char *sep, char **lasts);
u64 read_seed(const char *str);
bool parseColorString(const std::string &value, video::SColor &color, bool quiet);
bool parseColorString(const std::string &value, video::SColor &color, bool quiet,
unsigned char default_alpha = 0xff);
/**