iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Return a rgba string for coloralpha lua controls

This commit is contained in:
Thomas Goyne 2014-03-02 07:24:06 -08:00
parent 5029b5286f
commit 1dbe7dd5f9
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aegisub/libaegisub/common/color.cpp
View File

@ -43,7 +43,9 @@ std::string Color::GetSsaFormatted() const {
return boost::lexical_cast<std::string>((a << 24) + (b << 16) + (g << 8) + r); return boost::lexical_cast<std::string>((a << 24) + (b << 16) + (g << 8) + r);
} }
std::string Color::GetHexFormatted() const { std::string Color::GetHexFormatted(bool rgba) const {
if (rgba)
return str(boost::format("#%02X%02X%02X%02X") % (int)r % (int)g % (int)b % (int)a);
return str(boost::format("#%02X%02X%02X") % (int)r % (int)g % (int)b); return str(boost::format("#%02X%02X%02X") % (int)r % (int)g % (int)b);
} }

2
aegisub/libaegisub/include/libaegisub/color.h
View File

@ -33,7 +33,7 @@ namespace agi {
std::string GetAssStyleFormatted() const; std::string GetAssStyleFormatted() const;
std::string GetAssOverrideFormatted() const; std::string GetAssOverrideFormatted() const;
std::string GetSsaFormatted() const; std::string GetSsaFormatted() const;
std::string GetHexFormatted() const; std::string GetHexFormatted(bool rgba=false) const;
std::string GetRgbFormatted() const; std::string GetRgbFormatted() const;
operator std::string() const { return GetRgbFormatted(); } operator std::string() const { return GetRgbFormatted(); }

4
aegisub/src/auto4_lua_dialog.cpp
View File

@ -206,7 +206,7 @@ namespace Automation4 {
} }
bool CanSerialiseValue() const override { return true; } bool CanSerialiseValue() const override { return true; }
std::string SerialiseValue() const override { return inline_string_encode(color.GetHexFormatted()); } std::string SerialiseValue() const override { return inline_string_encode(color.GetHexFormatted(alpha)); }
void UnserialiseValue(const std::string &serialised) override { color = inline_string_decode(serialised); } void UnserialiseValue(const std::string &serialised) override { color = inline_string_decode(serialised); }
wxControl *Create(wxWindow *parent) override { wxControl *Create(wxWindow *parent) override {
@ -216,7 +216,7 @@ namespace Automation4 {
} }
void LuaReadBack(lua_State *L) override { void LuaReadBack(lua_State *L) override {
lua_pushstring(L, color.GetHexFormatted().c_str()); lua_pushstring(L, color.GetHexFormatted(alpha).c_str());
} }
}; };