summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorchr <chr>2017-05-23 19:48:27 +0000
committerchr <chr>2017-05-23 19:48:27 +0000
commit297d0a6bd45eb41e5105e1d06fc0ae4930e49e79 (patch)
tree32cce173ecd01d768e30b28cb68db8757eb60376 /src
parentobject panel: search function blocks too many keystrokes (diff)
downloadinkscape-297d0a6bd45eb41e5105e1d06fc0ae4930e49e79.tar.gz
inkscape-297d0a6bd45eb41e5105e1d06fc0ae4930e49e79.zip
object panel: don't block F2 key, use return to edit cell
(bzr r15698.1.9)
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/objects.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 003821796..95302387f 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -698,17 +698,19 @@ bool ObjectsPanel::_handleKeyEvent(GdkEventKey *event)
switch (Inkscape::UI::Tools::get_group0_keyval(event)) {
case GDK_KEY_Return:
case GDK_KEY_KP_Enter:
- case GDK_KEY_F2:
{
- Gtk::TreeModel::iterator iter = _tree.get_selection()->get_selected();
- if (iter && !_text_renderer->property_editable()) {
+ Gtk::TreeModel::Path path;
+ Gtk::TreeViewColumn *focus_column = 0;
+
+ _tree.get_cursor(path, focus_column);
+ if (focus_column == _name_column && !_text_renderer->property_editable()) {
//Rename item
- Gtk::TreeModel::Path *path = new Gtk::TreeModel::Path(iter);
_text_renderer->property_editable() = true;
- _tree.set_cursor(*path, *_name_column, true);
+ _tree.set_cursor(path, *_name_column, true);
grab_focus();
return true;
}
+ return false;
}
break;
case GDK_KEY_Home: