projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug #2652974. Reverts revision r2326 to previous state.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
synfigapp
/
inputdevice.cpp
diff --git
a/synfig-studio/trunk/src/synfigapp/inputdevice.cpp
b/synfig-studio/trunk/src/synfigapp/inputdevice.cpp
index
7d6f882
..
4a513a6
100644
(file)
--- a/
synfig-studio/trunk/src/synfigapp/inputdevice.cpp
+++ b/
synfig-studio/trunk/src/synfigapp/inputdevice.cpp
@@
-35,6
+35,8
@@
#include <ETL/stringf>
#include "main.h"
#include <ETL/stringf>
#include "main.h"
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-85,6
+87,13
@@
public:
return true;
}
return true;
}
+ if(key=="bgcolor")
+ {
+ Color c(input_device->get_background_color());
+ value=strprintf("%f %f %f %f",(float)c.get_r(),(float)c.get_g(),(float)c.get_b(),(float)c.get_a());
+
+ return true;
+ }
return Settings::get_value(key, value);
}
return Settings::get_value(key, value);
}
@@
-119,6
+128,14
@@
public:
input_device->set_foreground_color(synfig::Color(r,g,b,a));
return true;
}
input_device->set_foreground_color(synfig::Color(r,g,b,a));
return true;
}
+ if(key=="bgcolor")
+ {
+ float r=0,g=0,b=0,a=1;
+ if(!strscanf(value,"%f %f %f %f",&r,&g,&b,&a))
+ return false;
+ input_device->set_background_color(synfig::Color(r,g,b,a));
+ return true;
+ }
return Settings::set_value(key, value);
}
return Settings::set_value(key, value);
}
@@
-127,6
+144,7
@@
public:
{
KeyList ret(Settings::get_key_list());
ret.push_back("color");
{
KeyList ret(Settings::get_key_list());
ret.push_back("color");
+ ret.push_back("bgcolor");
ret.push_back("state");
ret.push_back("bline_width");
ret.push_back("blend_method");
ret.push_back("state");
ret.push_back("bline_width");
ret.push_back("blend_method");