aboutsummaryrefslogtreecommitdiff
path: root/src/mainwindow.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2011-06-01 18:35:40 +0200
committerThomas White <taw@physics.org>2011-06-01 18:35:49 +0200
commitbcc9f89407ed1e632da249623fd63e493439ec39 (patch)
tree1d604ab225156548592165d01ef531c88ab623a9 /src/mainwindow.c
parent247a81c6e1b78d91fc6126d03f4018eabba43119 (diff)
Make escape in main window also exit slideshow
Diffstat (limited to 'src/mainwindow.c')
-rw-r--r--src/mainwindow.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 1997951..289e875 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -322,6 +322,11 @@ static gboolean key_press_sig(GtkWidget *da, GdkEventKey *event,
next_slide_sig(NULL, p);
break;
+ case GDK_KEY_Escape :
+ if ( p->slideshow != NULL ) end_slideshow(p);
+ p->editing_object = NULL;
+ break;
+
}
/* FIXME: Invalidate only the necessary region */