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

diff --git a/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp b/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
index 2d7940e..da0da91 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp
@@ -40,6 +40,8 @@
 #include <gtkmm/notebook.h>
 #include <gtkmm/box.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -51,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 ================================================= */
@@ -70,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)] =
 	{
@@ -224,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);
@@ -261,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;
@@ -298,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)
 
@@ -351,6 +356,7 @@ Widget_ColorEdit::Widget_ColorEdit():
 
 	show_all_children();
 
+	set_digits(1);
 	set_value(color);
 
 	hold_signals=false;
@@ -426,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
@@ -439,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