[cheese] ESC now takes you out of the effects selector
- From: Yuvaraj Pandian <yuvipanda src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cheese] ESC now takes you out of the effects selector
- Date: Fri, 20 Aug 2010 16:24:47 +0000 (UTC)
commit eb658e3abecc1c3b3da6cc2baf256c9aff014d7b
Author: Yuvaraj Pandian T <yuvipanda gmail com>
Date: Thu Aug 19 02:26:02 2010 +0530
ESC now takes you out of the effects selector
src/cheese-window.vala | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index 5b9fc0f..a1704a6 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -648,9 +648,9 @@ public class Cheese.MainWindow : Gtk.Window
string key;
key = Gdk.keyval_name (event.keyval);
- if ((current_countdown != null && current_countdown.running) || is_bursting || is_recording)
+ if (strcmp (key, "Escape") == 0)
{
- if (strcmp (key, "Escape") == 0)
+ if ((current_countdown != null && current_countdown.running) || is_bursting || is_recording)
{
action_cancelled = true;
if (current_mode == MediaMode.PHOTO)
@@ -672,6 +672,11 @@ public class Cheese.MainWindow : Gtk.Window
}
action_cancelled = false;
}
+ else
+ if (is_effects_selector_active)
+ {
+ effects_toggle_action.set_active (false);
+ }
}
return false;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]