**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 Chris Moore
+** Copyright (c) 2008 Paul Wise
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
#include <gtkmm/notebook.h>
#include <gtkmm/box.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
/* === M A C R O S ========================================================= */
-#define use_colorspace_gamma() App::use_colorspace_gamma
-#define colorspace_gamma() (2.2f)
-#define gamma_in(x) ((x>=0)?pow((float)x,1.0f/colorspace_gamma()):-pow((float)-x,1.0f/colorspace_gamma()))
-#define gamma_out(x) ((x>=0)?pow((float)x,colorspace_gamma()):-pow((float)-x,colorspace_gamma()))
+#define SPINBUTTON_WIDTH 100
/* === G L O B A L S ======================================================= */
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)] =
{
}
bool
-ColorSlider::redraw(GdkEventExpose*bleh)
+ColorSlider::redraw(GdkEventExpose */*bleh*/)
{
Color color(color_);
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);
}
}
bool
ColorSlider::on_event(GdkEvent *event)
{
- float pos(event->button.x/(float)get_width());
- if(pos<0 || event->button.x<=0)pos=0;
+ const int width(get_width());
+ float x = 0;
+ if( GDK_SCROLL == event->type ){
+ Color color(color_);
+ float amount;
+ switch(type)
+ {
+ case TYPE_R: amount=color.get_r(); break;
+ case TYPE_G: amount=color.get_g(); break;
+ case TYPE_B: amount=color.get_b(); break;
+ case TYPE_Y: amount=color.get_y(); break;
+ case TYPE_U: amount=color.get_u()+0.5; break;
+ case TYPE_V: amount=color.get_v()+0.5; break;
+ case TYPE_HUE: amount=Angle::rot(color.get_uv_angle()).get(); amount-=floor(amount); break;
+ case TYPE_SAT: amount=color.get_s()*2.0; break;
+ case TYPE_A: amount=color.get_a(); break;
+ default: amount=0; break;
+ }
+ if(use_colorspace_gamma() && (type<TYPE_U))
+ amount=gamma_in(amount);
+ x = amount*width;
+ switch(event->scroll.direction){
+ case GDK_SCROLL_UP:
+ case GDK_SCROLL_RIGHT:
+ x+=1.0;
+ break;
+ case GDK_SCROLL_DOWN:
+ case GDK_SCROLL_LEFT:
+ x-=1.0;
+ break;
+ }
+ } else {
+ x = float(event->button.x);
+ }
+
+ float pos(x/width);
+ if(pos<0 || x<=0)pos=0;
if(pos>1)pos=1;
if(use_colorspace_gamma() && (type<TYPE_U))
switch(event->type)
{
+ case GDK_SCROLL:
+ signal_slider_moved_(type,pos);
+ queue_draw();
+ signal_activated_();
+ return true;
+
case GDK_BUTTON_RELEASE:
signal_activated_();
return true;
+ case GDK_BUTTON_PRESS:
case GDK_MOTION_NOTIFY:
// adjust_color(type,color_,pos);
signal_slider_moved_(type,pos);
color=Color(0,0,0,0);
- set_size_request(150,-1);
+ set_size_request(200,-1);
hold_signals=true;
Gtk::Label *label;
#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)
show_all_children();
+ set_digits(1);
set_value(color);
hold_signals=false;
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
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
projects / synfig.git / blobdiff