|
 |
ecdf9b |
From 775c5d479d47c96a1a0e78a852ec31418809c0dc Mon Sep 17 00:00:00 2001
|
|
|
ecdf9b |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
ecdf9b |
Date: Tue, 11 Jun 2013 12:51:09 +0200
|
|
|
ecdf9b |
Subject: [PATCH 21/35] cheese-window: Fix de-activation of effects button
|
|
|
ecdf9b |
|
|
|
ecdf9b |
So that the user does not need to click twice on the effect button to change
|
|
|
ecdf9b |
the effect (after the first time the effect was changed).
|
|
|
ecdf9b |
|
|
|
ecdf9b |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
ecdf9b |
---
|
|
|
ecdf9b |
src/cheese-window.vala | 6 ++----
|
|
|
ecdf9b |
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
ecdf9b |
|
|
|
ecdf9b |
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
|
|
|
ecdf9b |
index 70293aa..9ebb5e1 100644
|
|
|
ecdf9b |
--- a/src/cheese-window.vala
|
|
|
ecdf9b |
+++ b/src/cheese-window.vala
|
|
|
ecdf9b |
@@ -895,7 +895,7 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
|
|
|
ecdf9b |
else
|
|
|
ecdf9b |
if (is_effects_selector_active)
|
|
|
ecdf9b |
{
|
|
|
ecdf9b |
- // FIXME: Set the effects action to be inactive.
|
|
|
ecdf9b |
+ effects_toggle_button.set_active (false);
|
|
|
ecdf9b |
}
|
|
|
ecdf9b |
}
|
|
|
ecdf9b |
return false;
|
|
|
ecdf9b |
@@ -1031,7 +1031,6 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
|
|
|
ecdf9b |
public void set_effects (bool effects)
|
|
|
ecdf9b |
{
|
|
|
ecdf9b |
toggle_effects_selector (effects);
|
|
|
ecdf9b |
- // FIXME: Set the mode action to be inverse sensitivity to effects.
|
|
|
ecdf9b |
}
|
|
|
ecdf9b |
|
|
|
ecdf9b |
/**
|
|
|
ecdf9b |
@@ -1045,12 +1044,11 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow
|
|
|
ecdf9b |
Clutter.ButtonEvent event)
|
|
|
ecdf9b |
{
|
|
|
ecdf9b |
/* Disable the effects selector after selecting an effect. */
|
|
|
ecdf9b |
- toggle_effects_selector(false);
|
|
|
ecdf9b |
+ effects_toggle_button.set_active (false);
|
|
|
ecdf9b |
|
|
|
ecdf9b |
selected_effect = source.get_data ("effect");
|
|
|
ecdf9b |
camera.set_effect (selected_effect);
|
|
|
ecdf9b |
settings.set_string ("selected-effect", selected_effect.name);
|
|
|
ecdf9b |
- // FIXME: Set the effects action to be inactive.
|
|
|
ecdf9b |
return false;
|
|
|
ecdf9b |
}
|
|
|
ecdf9b |
|
|
|
ecdf9b |
--
|
|
|
ecdf9b |
1.8.2.1
|
|
|
ecdf9b |
|