[evolution] Bug 792480 - Delete key press should not create new event in Calendar views
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Bug 792480 - Delete key press should not create new event in Calendar views
- Date: Tue, 16 Jan 2018 08:55:25 +0000 (UTC)
commit 62997e939b3996d5755ce87f9badc5ae674253f4
Author: Milan Crha <mcrha redhat com>
Date: Tue Jan 16 09:52:55 2018 +0100
Bug 792480 - Delete key press should not create new event in Calendar views
src/calendar/gui/e-day-view.c | 7 ++++---
src/calendar/gui/e-week-view.c | 4 +++-
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/src/calendar/gui/e-day-view.c b/src/calendar/gui/e-day-view.c
index 1ab8cfe..63c0161 100644
--- a/src/calendar/gui/e-day-view.c
+++ b/src/calendar/gui/e-day-view.c
@@ -6486,7 +6486,9 @@ e_day_view_do_key_press (GtkWidget *widget,
&& (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)))
|| (event->length == 0)
|| (keyval == GDK_KEY_Tab)
- || (keyval == GDK_KEY_Escape))) {
+ || (keyval == GDK_KEY_Escape)
+ || (keyval == GDK_KEY_Delete)
+ || (keyval == GDK_KEY_KP_Delete))) {
return FALSE;
}
@@ -7222,8 +7224,7 @@ e_day_view_start_editing_event (EDayView *day_view,
if (key_event) {
if (gtk_im_context_filter_keypress (((EText *)(event->canvas_item))->im_context, key_event)) {
((EText *)(event->canvas_item))->need_im_reset = TRUE;
- }
- else {
+ } else if (key_event->keyval != GDK_KEY_Return && key_event->keyval != GDK_KEY_KP_Enter) {
gchar *initial_text;
initial_text = e_utf8_from_gtk_event_key (GTK_WIDGET (day_view), key_event->keyval,
key_event->string);
diff --git a/src/calendar/gui/e-week-view.c b/src/calendar/gui/e-week-view.c
index 33300f0..04503d6 100644
--- a/src/calendar/gui/e-week-view.c
+++ b/src/calendar/gui/e-week-view.c
@@ -5072,7 +5072,9 @@ e_week_view_do_key_press (GtkWidget *widget,
&& (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)))
|| (event->length == 0)
|| (event->keyval == GDK_KEY_Tab)
- || (event->keyval == GDK_KEY_Escape)) {
+ || (event->keyval == GDK_KEY_Escape)
+ || (event->keyval == GDK_KEY_Delete)
+ || (event->keyval == GDK_KEY_KP_Delete)) {
return FALSE;
} else
initial_text = e_utf8_from_gtk_event_key (widget, event->keyval, event->string);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]