X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_coloredit.cpp;h=2d7940ef6402e9bfadbcc1e53fef6598037f362f;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=1e6c7d2d2e11eb87acc9ae36845e434a9d30109b;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp b/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
index 1e6c7d2..2d7940e 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
@@ -50,11 +51,6 @@ using namespace studio;
 
 /* === 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()))
-
 /* === G L O B A L S ======================================================= */
 
 /* === P R O C E D U R E S ================================================= */
@@ -114,7 +110,7 @@ ColorSlider::adjust_color(Type type, Color &color, float amount)
 }
 
 bool
-ColorSlider::redraw(GdkEventExpose*bleh)
+ColorSlider::redraw(GdkEventExpose */*bleh*/)
 {
 	Color color(color_);
 
@@ -158,61 +154,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);
 		}
 	}
@@ -343,6 +310,17 @@ Widget_ColorEdit::Widget_ColorEdit():
 		ATTACH_SPIN_BUTTON(1,G);
 		SLIDER_ROW(2,B,_("Blue"));
 		ATTACH_SPIN_BUTTON(2,B);
+
+		hex_color_label = manage(new Gtk::Label(_("HTML code"), 0.0, 0.5));
+		hex_color_label->set_use_markup(false);
+		hex_color_label->set_use_underline(false);
+		hex_color_label->set_attributes(attr_list);
+		table->attach(*hex_color_label, 0, 1, 7, 8, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+
+		hex_color = manage(new Gtk::Entry());
+		hex_color->set_width_chars(8);
+		hex_color->signal_activate().connect(sigc::mem_fun(*this,&studio::Widget_ColorEdit::on_hex_edited));
+		table->attach(*hex_color, 0, 1, 8, 9, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
 	}
 	{
 		Gtk::Table* table(yuv_table);
@@ -408,6 +386,16 @@ Widget_ColorEdit::on_slider_moved(ColorSlider::Type type, float amount)
 }
 
 void
+Widget_ColorEdit::on_hex_edited()
+{
+	Color color(get_value_raw());
+	String s = hex_color->get_text();
+	color.set_hex(s);
+	set_value(color);
+	signal_value_changed_();
+}
+
+void
 Widget_ColorEdit::on_value_changed()
 {
 	if(hold_signals)
@@ -424,6 +412,7 @@ Widget_ColorEdit::on_value_changed()
 	slider_HUE->set_color(color);
 	slider_SAT->set_color(color);
 	slider_A->set_color(color);
+	hex_color->set_text(color.get_hex());
 	widget_color.set_value(color);
 
 	activate();
@@ -488,6 +477,7 @@ Widget_ColorEdit::set_value(const synfig::Color &data)
 	slider_HUE->set_color(color);
 	slider_SAT->set_color(color);
 	slider_A->set_color(color);
+	hex_color->set_text(color.get_hex());
 	widget_color.set_value(color);
 
 	hold_signals=false;
@@ -502,14 +492,12 @@ Widget_ColorEdit::get_value_raw()
 		color.set_r(gamma_out(R_adjustment.get_value()/100.0f));
 		color.set_g(gamma_out(G_adjustment.get_value()/100.0f));
 		color.set_b(gamma_out(B_adjustment.get_value()/100.0f));
-		assert(color.is_valid());
 	}
 	else
 	{
 		color.set_r(R_adjustment.get_value()/100);
 		color.set_g(G_adjustment.get_value()/100);
 		color.set_b(B_adjustment.get_value()/100);
-		assert(color.is_valid());
 	}
 	color.set_a(A_adjustment.get_value()/100);
 	assert(color.is_valid());