projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Color::is_straight(). Also, re-enable the optimization for straight blending...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
widget_coloredit.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
b/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
index
2d7940e
..
81ccf3a
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
@@
-40,6
+40,8
@@
#include <gtkmm/notebook.h>
#include <gtkmm/box.h>
#include <gtkmm/notebook.h>
#include <gtkmm/box.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-70,29
+72,29
@@
void
ColorSlider::set_type(Type x) { type=x; queue_draw(); }
void
ColorSlider::set_type(Type x) { type=x; queue_draw(); }
void
-ColorSlider::set_color(Color x) { color_=x; queue_draw(); }
+ColorSlider::set_color(
synfig::
Color x) { color_=x; queue_draw(); }
void
void
-ColorSlider::slider_color_TYPE_R(Color &color, float amount) { color.set_r(amount); }
+ColorSlider::slider_color_TYPE_R(
synfig::
Color &color, float amount) { color.set_r(amount); }
void
void
-ColorSlider::slider_color_TYPE_G(Color &color, float amount) { color.set_g(amount); }
+ColorSlider::slider_color_TYPE_G(
synfig::
Color &color, float amount) { color.set_g(amount); }
void
void
-ColorSlider::slider_color_TYPE_B(Color &color, float amount) { color.set_b(amount); }
+ColorSlider::slider_color_TYPE_B(
synfig::
Color &color, float amount) { color.set_b(amount); }
void
void
-ColorSlider::slider_color_TYPE_Y(Color &color, float amount) { color.set_y(amount); }
+ColorSlider::slider_color_TYPE_Y(
synfig::
Color &color, float amount) { color.set_y(amount); }
void
void
-ColorSlider::slider_color_TYPE_U(Color &color, float amount) { color.set_u(amount-0.5f); }
+ColorSlider::slider_color_TYPE_U(
synfig::
Color &color, float amount) { color.set_u(amount-0.5f); }
void
void
-ColorSlider::slider_color_TYPE_V(Color &color, float amount) { color.set_v(amount-0.5f); }
+ColorSlider::slider_color_TYPE_V(
synfig::
Color &color, float amount) { color.set_v(amount-0.5f); }
void
void
-ColorSlider::slider_color_TYPE_HUE(Color &color, float amount) { color.set_uv_angle(Angle::rot(amount)); }
+ColorSlider::slider_color_TYPE_HUE(
synfig::
Color &color, float amount) { color.set_uv_angle(Angle::rot(amount)); }
void
void
-ColorSlider::slider_color_TYPE_SAT(Color &color, float amount) { color.set_s(amount*0.5f); }
+ColorSlider::slider_color_TYPE_SAT(
synfig::
Color &color, float amount) { color.set_s(amount*0.5f); }
void
void
-ColorSlider::slider_color_TYPE_A(Color &color, float amount) { color.set_a(amount); }
+ColorSlider::slider_color_TYPE_A(
synfig::
Color &color, float amount) { color.set_a(amount); }
void
void
-ColorSlider::adjust_color(Type type, Color &color, float amount)
+ColorSlider::adjust_color(Type type,
synfig::
Color &color, float amount)
{
static const slider_color_func jump_table[int(TYPE_END)] =
{
{
static const slider_color_func jump_table[int(TYPE_END)] =
{