diff options
author | Hans de Goede <hdegoede@redhat.com> | 2013-06-11 12:51:09 +0200 |
---|---|---|
committer | David King <amigadave@amigadave.com> | 2013-06-24 19:18:57 +0100 |
commit | ac1852761a30449fb1eb96325800cab34cd6df6c (patch) | |
tree | 9d1c648ff201e42e6024696d3f63fe9bd647fd56 | |
parent | b1cc8f4f8f3a7aebccebce9af1a3c63589db6ae0 (diff) | |
download | cheese-ac1852761a30449fb1eb96325800cab34cd6df6c.tar.gz |
Fix de-activation of effects button
So that the user does not need to click twice on the effect button to change
the effect (after the first time the effect was changed).
https://bugzilla.gnome.org/show_bug.cgi?id=698399
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r-- | src/cheese-window.vala | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/cheese-window.vala b/src/cheese-window.vala index fdca4138..e8994e96 100644 --- a/src/cheese-window.vala +++ b/src/cheese-window.vala @@ -811,10 +811,9 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow } action_cancelled = false; } - else - if (is_effects_selector_active) + else if (is_effects_selector_active) { - // FIXME: Set the effects action to be inactive. + effects_toggle_button.set_active (false); } } return false; @@ -950,7 +949,6 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow public void set_effects (bool effects) { toggle_effects_selector (effects); - // FIXME: Set the mode action to be inverse sensitivity to effects. } /** @@ -964,12 +962,11 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow Clutter.ButtonEvent event) { /* Disable the effects selector after selecting an effect. */ - toggle_effects_selector(false); + effects_toggle_button.set_active (false); selected_effect = source.get_data ("effect"); camera.set_effect (selected_effect); settings.set_string ("selected-effect", selected_effect.name); - // FIXME: Set the effects action to be inactive. return false; } |