X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_coloredit.cpp;h=da0da916ee386437973793ad463f6d7d9d5cb599;hb=5ebb2e2459eee96a4cee0c62eee33480b95ba503;hp=fc87e3c247f46d1e455d1fa1d7836c75a12562cb;hpb=b91eda58d66676742f25df2d277c04d8341033b3;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp b/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp index fc87e3c..da0da91 100644 --- 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 #include +#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,41 +158,32 @@ ColorSlider::redraw(GdkEventExpose */*bleh*/) Glib::RefPtr 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() && typeset_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); } } @@ -232,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); @@ -269,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; @@ -306,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) @@ -359,6 +356,7 @@ Widget_ColorEdit::Widget_ColorEdit(): show_all_children(); + set_digits(1); set_value(color); hold_signals=false; @@ -434,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 @@ -447,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