X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcellrenderer_value.cpp;h=456dee77180fcd9fd8fcd9ddbd1ace7180299175;hb=39997fbd501b843f90178edfad577628f2ae7b20;hp=802a178da8a0c60e89b121419741976d970ba459;hpb=756c0d29ac1742f231e6615f9a577e574e35a4af;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp
index 802a178..456dee7 100644
--- a/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp
+++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp
@@ -372,7 +372,13 @@ CellRenderer_ValueBase::render_vfunc(
 			for(iter=enum_list.begin();iter!=enum_list.end();iter++)
 				if(iter->value==data.get(int()))
 				{
-					property_text()=(Glib::ustring)iter->local_name;
+					// don't show the key_board s_hortcut under_scores
+					String local_name = iter->local_name;
+					String::size_type pos = local_name.find_first_of('_');
+					if (pos != String::npos)
+						property_text() = local_name.substr(0,pos) + local_name.substr(pos+1);
+					else
+						property_text() = local_name;
 					break;
 				}
 		}
@@ -503,6 +509,7 @@ CellRenderer_ValueBase::start_editing_vfunc(
 	const Gdk::Rectangle& cell_area __attribute__ ((unused)),
 	Gtk::CellRendererState flags __attribute__ ((unused)))
 {
+	edit_value_done_called = false;
 	// If we aren't editable, then there is nothing to do
 	if(!property_editable())
 		return 0;
@@ -527,6 +534,7 @@ CellRenderer_ValueBase::start_editing_vfunc(
 				path
 			)
 		);
+		App::dialog_gradient->grab_button_set_sensitive(true);
 		App::dialog_gradient->present();
 
 		return NULL;
@@ -574,6 +582,14 @@ CellRenderer_ValueBase::start_editing_vfunc(
 void
 CellRenderer_ValueBase::on_value_editing_done()
 {
+	if (edit_value_done_called)
+	{
+		synfig::error("on_value_editing_done(): Called twice!");
+		return;
+	}
+
+	edit_value_done_called = true;
+
 	if(value_entry)
 	{
 		ValueBase old_value(property_value_.get_value());