summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2017-11-04 03:48:05 +0100
committermonsta <[email protected]>2017-11-12 23:26:33 +0300
commitb7eac84c00bcfb41e066f0d2c538f8d3b17054e0 (patch)
tree0e0b217ee22abce59f5838430aa76a919600d5cc /src
parentc28e749f4bd1260ab019655e7f2f5f4320650ea5 (diff)
downloadcaja-b7eac84c00bcfb41e066f0d2c538f8d3b17054e0.tar.bz2
caja-b7eac84c00bcfb41e066f0d2c538f8d3b17054e0.tar.xz
Fix: wrong behavior with key "enter" while renaming files in list view
Fixes https://github.com/mate-desktop/caja/issues/698
Diffstat (limited to 'src')
-rw-r--r--src/file-manager/fm-list-view.c31
1 files changed, 21 insertions, 10 deletions
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index bb1df041..12fa8e5b 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -1100,6 +1100,7 @@ static gboolean
key_press_callback (GtkWidget *widget, GdkEventKey *event, gpointer callback_data)
{
FMDirectoryView *view;
+ FMListView *listview;
GdkEventButton button_event = { 0 };
gboolean handled;
GtkTreeView *tree_view;
@@ -1108,6 +1109,7 @@ key_press_callback (GtkWidget *widget, GdkEventKey *event, gpointer callback_dat
tree_view = GTK_TREE_VIEW (widget);
view = FM_DIRECTORY_VIEW (callback_data);
+ listview = FM_LIST_VIEW (view);
handled = FALSE;
switch (event->keyval)
@@ -1168,17 +1170,26 @@ key_press_callback (GtkWidget *widget, GdkEventKey *event, gpointer callback_dat
break;
case GDK_KEY_Return:
case GDK_KEY_KP_Enter:
- if ((event->state & GDK_SHIFT_MASK) != 0)
- {
- activate_selected_items_alternate (FM_LIST_VIEW (view), NULL, TRUE);
- }
- else
- {
- activate_selected_items (FM_LIST_VIEW (view));
- }
- handled = TRUE;
+ if (GTK_IS_CELL_EDITABLE (listview->details->editable_widget) &&
+ ((event->state & GDK_SHIFT_MASK) || (event->state & GDK_CONTROL_MASK)))
+ {
+ event->state = 0;
+ handled = FALSE;
+ }
+ else
+ {
+ if ((event->state & GDK_SHIFT_MASK) != 0)
+ {
+ activate_selected_items_alternate (FM_LIST_VIEW (view), NULL, TRUE);
+ }
+ else
+ {
+ activate_selected_items (FM_LIST_VIEW (view));
+ }
+ handled = TRUE;
+ }
break;
- case GDK_KEY_v:
+ case GDK_KEY_v:
/* Eat Control + v to not enable type ahead */
if ((event->state & GDK_CONTROL_MASK) != 0)
{