aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/table/e-cell-text.c23
-rw-r--r--widgets/table/e-table-selection-model.c9
2 files changed, 23 insertions, 9 deletions
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 8d7d94deac..7da73b4792 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -681,6 +681,15 @@ ect_edit_select_all (ECellTextView *text_view)
text_view->edit->selection_end = strlen (text_view->edit->cell.text);
}
+static gboolean
+key_begins_editing (GdkEventKey *event)
+{
+ if (event->length == 0)
+ return FALSE;
+
+ return TRUE;
+}
+
/*
* ECell::event method
*/
@@ -725,8 +734,10 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col,
return_val = TRUE;
break;
}
-
- if ((!edit_display) && e_table_model_is_cell_editable (ecell_view->e_table_model, model_col, row)) {
+
+ if ((!edit_display) &&
+ e_table_model_is_cell_editable (ecell_view->e_table_model, model_col, row) &&
+ key_begins_editing (&event->key)) {
e_table_item_enter_edit (text_view->cell_view.e_table_item_view, view_col, row);
ect_edit_select_all (text_view);
edit = text_view->edit;
@@ -1995,13 +2006,15 @@ e_cell_text_view_command (ETextEventProcessor *tep, ETextEventProcessorCommand *
#endif
}
-static void _invisible_destroy (GtkInvisible *invisible,
- CellEdit *edit)
+static void
+_invisible_destroy (GtkInvisible *invisible,
+ CellEdit *edit)
{
edit->invisible = NULL;
}
-static GtkWidget *e_cell_text_view_get_invisible (CellEdit *edit)
+static GtkWidget *
+e_cell_text_view_get_invisible (CellEdit *edit)
{
GtkWidget *invisible;
if (edit->invisible) {
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index 05f549c92a..a1001438ac 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -447,10 +447,11 @@ etsm_move_selection_end (ETableSelectionModel *selection, int row)
e_table_selection_model_signals [SELECTION_CHANGED]);
}
-void e_table_selection_model_do_something (ETableSelectionModel *selection,
- guint row,
- guint col,
- GdkModifierType state)
+void
+e_table_selection_model_do_something (ETableSelectionModel *selection,
+ guint row,
+ guint col,
+ GdkModifierType state)
{
gint shift_p = state & GDK_SHIFT_MASK;
gint ctrl_p = state & GDK_CONTROL_MASK;