X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fsrc%2Fgtkmm%2Fdialog_color.cpp;fp=synfig-studio%2Fsrc%2Fgtkmm%2Fdialog_color.cpp;h=9d984cf9e0ac635ba75d0f59abeea7be09ffc308;hb=c30255b1eb705a49ad4e4c7425789d8d17d56caa;hp=6953a75488338f6f7b1e2d9f669fc6a6114e92c0;hpb=bb9c690a67e36a1afae6c2bac8bc945c078db031;p=synfig.git

diff --git a/synfig-studio/src/gtkmm/dialog_color.cpp b/synfig-studio/src/gtkmm/dialog_color.cpp
index 6953a75..9d984cf 100644
--- a/synfig-studio/src/gtkmm/dialog_color.cpp
+++ b/synfig-studio/src/gtkmm/dialog_color.cpp
@@ -80,8 +80,9 @@ Dialog_Color::~Dialog_Color()
 void
 Dialog_Color::create_color_edit_widget()
 {
-	color_edit_widget = manage(new Widget_ColorEdit());
-	color_edit_widget->signal_value_changed().connect(sigc::mem_fun(*this,
+	color_edit_widget = manage(new Gtk::ColorSelection());
+	color_edit_widget->set_has_opacity_control(true);
+	color_edit_widget->signal_color_changed().connect(sigc::mem_fun(*this,
 			&studio::Dialog_Color::on_color_changed));
 	get_vbox()->pack_start(*color_edit_widget);
 }
@@ -149,6 +150,19 @@ Dialog_Color::on_close_pressed()
 }
 
 void
+Dialog_Color::set_color(const synfig::Color& color)
+{
+		color_edit_widget->set_current_color(studio::colorconv_synfig2gdk(color));
+		color_edit_widget->set_current_alpha(color.get_a());
+}
+
+synfig::Color
+Dialog_Color::get_color() const
+{
+		return studio::colorconv_gdk2synfig(color_edit_widget->get_current_color(), color_edit_widget->get_current_alpha() / 65535.0);
+}
+
+void
 Dialog_Color::reset()
 {
 	signal_edited_.clear();