1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
From 0fa8f53c89b84a47fac33eb923a5fb196ca564ee Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Fri, 25 Feb 2011 20:11:46 +0000
Subject: list-view: make sure not to select the extension on rename
Delay calling gtk_editable_select_region() until after
gtk_tree_view_set_cursor()
https://bugzilla.gnome.org/show_bug.cgi?id=627110
(cherry picked from commit 5e2edee2e8dc6b4eababdff993176d591cc2a6e6)
---
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 3f59959..cde5ac6 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -1172,7 +1172,6 @@ cell_renderer_editing_started_cb (GtkCellRenderer *renderer,
FMListView *list_view)
{
GtkEntry *entry;
- gint start_offset, end_offset;
entry = GTK_ENTRY (editable);
list_view->details->editable_widget = editable;
@@ -1181,9 +1180,6 @@ cell_renderer_editing_started_cb (GtkCellRenderer *renderer,
g_free (list_view->details->original_name);
list_view->details->original_name = g_strdup (gtk_entry_get_text (entry));
- eel_filename_get_rename_region (list_view->details->original_name,
- &start_offset, &end_offset);
- gtk_editable_select_region (GTK_EDITABLE (entry), start_offset, end_offset);
nautilus_clipboard_set_up_editable
(GTK_EDITABLE (entry),
@@ -2644,6 +2640,7 @@ fm_list_view_start_renaming_file (FMDirectoryView *view,
FMListView *list_view;
GtkTreeIter iter;
GtkTreePath *path;
+ gint start_offset, end_offset;
list_view = FM_LIST_VIEW (view);
@@ -2679,6 +2676,15 @@ fm_list_view_start_renaming_file (FMDirectoryView *view,
list_view->details->file_name_column,
TRUE);
+ /* set cursor also triggers editing-started, where we save the editable widget */
+ if (list_view->details->editable_widget != NULL) {
+ eel_filename_get_rename_region (list_view->details->original_name,
+ &start_offset, &end_offset);
+
+ gtk_editable_select_region (GTK_EDITABLE (list_view->details->editable_widget),
+ start_offset, end_offset);
+ }
+
gtk_tree_path_free (path);
}
--
cgit v0.9
|
