Fix most of the warnings from doxygen for synfig-studio sources.

[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 fc87e3c..81ccf3a 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -39,6 +40,8 @@
 #include <gtkmm/notebook.h>
 #include <gtkmm/box.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -69,29 +72,29 @@ 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
-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
-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
-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
-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
-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
-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
-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
-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
-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
-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)] =
        {
@@ -153,41 +156,32 @@ ColorSlider::redraw(GdkEventExpose */*bleh*/)
        Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(get_window()));
        const Color bg1(0.75, 0.75, 0.75);
        const Color bg2(0.5, 0.5, 0.5);
-       Gdk::Color gdk_c;
        int i;
        for(i=width-1;i>=0;i--)
        {
-               color_func(color,gamma_out(float(i)/float(width)));
+               color_func(color,
+                                  (use_colorspace_gamma() && type<TYPE_U)
+                                  ? gamma_out(float(i)/float(width))
+                                  :              (float(i)/float(width)));
                const Color c1(Color::blend(color,bg1,1.0).clamped());
                const Color c2(Color::blend(color,bg2,1.0).clamped());
                assert(c1.is_valid());
                assert(c2.is_valid());
 
-               gushort r1=256*App::gamma.r_F32_to_U8(c1.get_r());
-               gushort g1=256*App::gamma.g_F32_to_U8(c1.get_g());
-               gushort b1=256*App::gamma.b_F32_to_U8(c1.get_b());
-               gushort r2=256*App::gamma.r_F32_to_U8(c2.get_r());
-               gushort g2=256*App::gamma.g_F32_to_U8(c2.get_g());
-               gushort b2=256*App::gamma.b_F32_to_U8(c2.get_b());
-
                if((i*2/height)&1)
                {
-                       gdk_c.set_rgb(r1,g1,b1);
-                       gc->set_rgb_fg_color(gdk_c);
+                       gc->set_rgb_fg_color(colorconv_synfig2gdk(c1));
                        get_window()->draw_rectangle(gc, true, ca.get_x()+i, ca.get_y(), 1, height/2);
 
-                       gdk_c.set_rgb(r2,g2,b2);
-                       gc->set_rgb_fg_color(gdk_c);
+                       gc->set_rgb_fg_color(colorconv_synfig2gdk(c2));
                        get_window()->draw_rectangle(gc, true, ca.get_x()+i, ca.get_y()+height/2, 1, height/2);
                }
                else
                {
-                       gdk_c.set_rgb(r2,g2,b2);
-                       gc->set_rgb_fg_color(gdk_c);
+                       gc->set_rgb_fg_color(colorconv_synfig2gdk(c2));
                        get_window()->draw_rectangle(gc, true, ca.get_x()+i, ca.get_y(), 1, height/2);
 
-                       gdk_c.set_rgb(r1,g1,b1);
-                       gc->set_rgb_fg_color(gdk_c);
+                       gc->set_rgb_fg_color(colorconv_synfig2gdk(c1));
                        get_window()->draw_rectangle(gc, true, ca.get_x()+i, ca.get_y()+height/2, 1, height/2);
                }
        }