projects / synfig.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Allow clicking on colour sliders to change the colour.
[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 37d4523..da0da91 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 =========================================================== */
@@ -50,6 +53,8 @@ using namespace studio;
 
 /* === M A C R O S ========================================================= */
 
+#define SPINBUTTON_WIDTH 100
+
 /* === G L O B A L S ======================================================= */
 
 /* === P R O C E D U R E S ================================================= */
@@ -69,29 +74,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,61 +158,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,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;
-               gushort g1;
-               gushort b1;
-               gushort r2;
-               gushort g2;
-               gushort b2;
-
-               if(use_colorspace_gamma() && (type<TYPE_U))
-               {
-                       r1=(256*App::gamma.r_F32_to_U8(gamma_out(c1.get_r())));
-                       g1=(256*App::gamma.g_F32_to_U8(gamma_out(c1.get_g())));
-                       b1=(256*App::gamma.b_F32_to_U8(gamma_out(c1.get_b())));
-                       r2=(256*App::gamma.r_F32_to_U8(gamma_out(c2.get_r())));
-                       g2=(256*App::gamma.g_F32_to_U8(gamma_out(c2.get_g())));
-                       b2=(256*App::gamma.b_F32_to_U8(gamma_out(c2.get_b())));
-               }
-               else
-               {
-                       r1=(256*App::gamma.r_F32_to_U8(c1.get_r()));
-                       g1=(256*App::gamma.g_F32_to_U8(c1.get_g()));
-                       b1=(256*App::gamma.b_F32_to_U8(c1.get_b()));
-                       r2=(256*App::gamma.r_F32_to_U8(c2.get_r()));
-                       g2=(256*App::gamma.g_F32_to_U8(c2.get_g()));
-                       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);
                }
        }
@@ -252,6 +228,7 @@ ColorSlider::on_event(GdkEvent *event)
                signal_activated_();
                return true;
 
+       case GDK_BUTTON_PRESS:
        case GDK_MOTION_NOTIFY:
 //             adjust_color(type,color_,pos);
                signal_slider_moved_(type,pos);
@@ -289,7 +266,7 @@ Widget_ColorEdit::Widget_ColorEdit():
 
        color=Color(0,0,0,0);
 
-       set_size_request(150,-1);
+       set_size_request(200,-1);
        hold_signals=true;
 
        Gtk::Label *label;
@@ -326,7 +303,7 @@ Widget_ColorEdit::Widget_ColorEdit():
 #define ATTACH_SPIN_BUTTON(i,n) \
        spinbutton_##n=manage(new class Gtk::SpinButton(n##_adjustment,1,0)); \
        spinbutton_##n->set_update_policy(Gtk::UPDATE_ALWAYS); \
-       spinbutton_##n->set_size_request(48,-1); \
+       spinbutton_##n->set_size_request(SPINBUTTON_WIDTH,-1); \
        spinbutton_##n->show(); \
        table->attach(*spinbutton_##n, 1, 2, 1+2*i, 3+2*i, Gtk::SHRINK, Gtk::EXPAND, 2, 0)
 
@@ -379,6 +356,7 @@ Widget_ColorEdit::Widget_ColorEdit():
 
        show_all_children();
 
+       set_digits(1);
        set_value(color);
 
        hold_signals=false;
@@ -454,10 +432,10 @@ Widget_ColorEdit::set_has_frame(bool x)
        spinbutton_G->set_has_frame(x);
        spinbutton_B->set_has_frame(x);
        spinbutton_A->set_has_frame(x);
-       spinbutton_R->set_size_request(48,-1);
-       spinbutton_G->set_size_request(48,-1);
-       spinbutton_B->set_size_request(48,-1);
-       spinbutton_A->set_size_request(48,-1);
+       spinbutton_R->set_size_request(SPINBUTTON_WIDTH,-1);
+       spinbutton_G->set_size_request(SPINBUTTON_WIDTH,-1);
+       spinbutton_B->set_size_request(SPINBUTTON_WIDTH,-1);
+       spinbutton_A->set_size_request(SPINBUTTON_WIDTH,-1);
 }
 
 void
@@ -467,10 +445,10 @@ Widget_ColorEdit::set_digits(int x)
        spinbutton_G->set_digits(x);
        spinbutton_B->set_digits(x);
        spinbutton_A->set_digits(x);
-       spinbutton_R->set_size_request(48,-1);
-       spinbutton_G->set_size_request(48,-1);
-       spinbutton_B->set_size_request(48,-1);
-       spinbutton_A->set_size_request(48,-1);
+       spinbutton_R->set_size_request(SPINBUTTON_WIDTH,-1);
+       spinbutton_G->set_size_request(SPINBUTTON_WIDTH,-1);
+       spinbutton_B->set_size_request(SPINBUTTON_WIDTH,-1);
+       spinbutton_A->set_size_request(SPINBUTTON_WIDTH,-1);
 }
 
 void
Synfig (Bombe’s repository)