Added ability for escape key to close editing box in Value column in the Parameters panel

synfig-studio/src/gui/cellrenderer/cellrenderer_value.cpp

@@ -75,12 +75,14 @@ class studio::ValueBase_Entry : public Gtk::CellEditable, public Gtk::EventBox
 	Widget_ValueBase *valuewidget;
 	Gtk::Widget      *parent;
 	bool              edit_done_called;
+	bool			  edit_canceled_called;
 public:
 	ValueBase_Entry():
 		Glib::ObjectBase(typeid(ValueBase_Entry))
 	{
 		parent           = nullptr;
 		edit_done_called = false;
+		edit_canceled_called = false;
 
 		valuewidget = manage(new class Widget_ValueBase());
 		valuewidget->inside_cellrenderer();
@@ -112,6 +114,21 @@ class studio::ValueBase_Entry : public Gtk::CellEditable, public Gtk::EventBox
 		}
 	}
 
+	void on_editing_canceled()
+	{
+		hide();
+		if (parent) parent->grab_focus();
+		if (!edit_done_called)
+		{
+			edit_canceled_called = true;
+			//Gtk::CellEditable::on_editing_canceled();
+		}
+		else
+		{
+			synfig::error("on_editing_cancelled(): Called twice!");
+		}
+	}
+
 	void set_parent(Gtk::Widget* x) { parent = x; }
 
 	void on_remove_widget()
@@ -127,6 +144,7 @@ class studio::ValueBase_Entry : public Gtk::CellEditable, public Gtk::EventBox
 		SYNFIG_EXCEPTION_GUARD_BEGIN()
 		if (valuewidget) {
 			valuewidget->signal_activate().connect(sigc::mem_fun(*this, &studio::ValueBase_Entry::editing_done));
+			valuewidget->signal_key_press_event().connect(sigc::mem_fun(*this, &studio::ValueBase_Entry::on_key_press_event));
 		}
 
 		// popup combobox menu if its is a enum editor
@@ -172,6 +190,18 @@ class studio::ValueBase_Entry : public Gtk::CellEditable, public Gtk::EventBox
 		SYNFIG_EXCEPTION_GUARD_END_BOOL(true)
 	}
 
+	bool on_key_press_event(GdkEventKey* key_event)
+	{
+		SYNFIG_EXCEPTION_GUARD_BEGIN()
+		if(key_event->keyval == GDK_KEY_Escape)
+		{
+			on_editing_canceled();
+			return true;
+		}
+		return Gtk::EventBox::on_key_press_event(key_event);
+		SYNFIG_EXCEPTION_GUARD_END_BOOL(true)
+	}
+
 	void on_grab_focus()
 	{
 		Gtk::EventBox::on_grab_focus();
@@ -249,6 +279,7 @@ CellRenderer_ValueBase::CellRenderer_ValueBase():
 	property_value_desc_      (*this, "value_desc",           synfigapp::ValueDesc()),
 	property_child_param_desc_(*this, "child_param_desc",        synfig::ParamDesc()),
 	edit_value_done_called    (false),
+	edit_value_canceled_called(false),
 	value_entry()
 {
 	CellRendererText::signal_edited().connect(sigc::mem_fun(*this,
@@ -586,6 +617,7 @@ CellRenderer_ValueBase::start_editing_vfunc(
 {
 	SYNFIG_EXCEPTION_GUARD_BEGIN()
 	edit_value_done_called = false;
+	edit_value_canceled_called = false;
 	// If we aren't editable, then there is nothing to do
 	if (!property_editable())
 		return nullptr;
@@ -662,6 +694,8 @@ CellRenderer_ValueBase::start_editing_vfunc(
 		value_entry->set_parent(&widget);
 		value_entry->show(); // in order to enable "instant"/"single-click" pop-up for enum comboboxes
 		value_entry->signal_editing_done().connect(sigc::mem_fun(*this, &CellRenderer_ValueBase::on_value_editing_done));
+		CellRenderer::signal_editing_canceled().connect(sigc::mem_fun(*this, &CellRenderer_ValueBase::on_value_editing_canceled));
+
 		return value_entry;
 	}
 
@@ -688,3 +722,14 @@ CellRenderer_ValueBase::on_value_editing_done()
 			signal_edited_(value_entry->get_path(), value);
 	}
 }
+
+void
+CellRenderer_ValueBase::on_value_editing_canceled()
+{
+	if (edit_value_canceled_called)
+	{
+		synfig::error("on_value_editing_canceled(): Called twice!");
+	}
+
+	edit_value_canceled_called = true;
+}

synfig-studio/src/gui/cellrenderer/cellrenderer_value.h

@@ -66,6 +66,7 @@ class CellRenderer_ValueBase : public Gtk::CellRendererText
 	void color_edited   (synfig::Color    color,     Glib::ustring path);
 
 	bool edit_value_done_called;
+	bool edit_value_canceled_called;
 
 	synfig::ValueBase saved_data; //Issues 659, 526, 520
 public:
@@ -93,6 +94,7 @@ class CellRenderer_ValueBase : public Gtk::CellRendererText
 	ValueBase_Entry *value_entry;
 
 	void on_value_editing_done();
+	void on_value_editing_canceled();
 
 protected:
 	virtual void