mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Implement the "coloralpha" automation control type

Browse source
This commit is contained in:
Thomas Goyne 2013-01-13 11:20:44 -08:00
parent 0b5674e6aa
commit 9e37e0897f
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
aegisub/src/auto4_lua_dialog.cpp
View file

@ -210,6 +210,7 @@ namespace Automation4 {
/// A color-picker button
class Color : public LuaDialogControl {
wxString text;
bool alpha;
struct ColorValidator : public wxValidator {
wxString *text;
@ -225,9 +226,10 @@ namespace Automation4 {
}
};
public:
Color(lua_State *L)
Color(lua_State *L, bool alpha)
: LuaDialogControl(L)
, text(get_field(L, "value"))
, alpha(alpha)
{
}
@ -246,7 +248,7 @@ namespace Automation4 {
wxControl *Create(wxWindow *parent)
{
agi::Color colour(from_wx(text));
wxControl *cw = new ColourButton(parent, wxSize(50*width,10*height), false, colour, ColorValidator(&text));
wxControl *cw = new ColourButton(parent, wxSize(50*width,10*height), alpha, colour, ColorValidator(&text));
cw->SetToolTip(hint);
return cw;
}
@ -526,10 +528,9 @@ namespace Automation4 {
} else if (controlclass == "checkbox") {
ctl = new LuaControl::Checkbox(L);
} else if (controlclass == "color") {
ctl = new LuaControl::Color(L);
ctl = new LuaControl::Color(L, false);
} else if (controlclass == "coloralpha") {
// FIXME
ctl = new LuaControl::Edit(L);
ctl = new LuaControl::Color(L, true);
} else if (controlclass == "alpha") {
// FIXME
ctl = new LuaControl::Edit(L);