summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <[email protected]>2015-09-16 15:26:01 +0200
committerinfirit <[email protected]>2015-09-16 15:26:01 +0200
commit599bc816e0dca82f921e6d77c2018d7818e7b7b2 (patch)
tree68d7ed4ad4006e1bcbf6766ad866415854f5fd4d
parentca6e8d35f029cc22dba9ff0a9be8a873e30aa7d2 (diff)
downloadmate-screensaver-599bc816e0dca82f921e6d77c2018d7818e7b7b2.tar.bz2
mate-screensaver-599bc816e0dca82f921e6d77c2018d7818e7b7b2.tar.xz
manager: fade out explicitly locks more quickly
If the screensaver is explicitly asked to lock (as opposed to locking because of idle), then we should do it very quickly. 1 second is too long. This commit changes the fade to 60 steps per second and a quarter of second long (put another way, about 15 fade increments). Taken from gnome-screensaver, commit:44edc03104f9757f4d866f24df8793f064b6ce70 And applied to MATE by infirit
-rw-r--r--src/gs-fade.c2
-rw-r--r--src/gs-manager.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gs-fade.c b/src/gs-fade.c
index 566078d..e8d52b7 100644
--- a/src/gs-fade.c
+++ b/src/gs-fade.c
@@ -729,7 +729,7 @@ static void
gs_fade_start (GSFade *fade,
guint timeout)
{
- guint steps_per_sec = 30;
+ guint steps_per_sec = 60;
guint msecs_per_step;
struct GSFadeScreenPrivate *screen_priv;
gboolean active_fade, res;
diff --git a/src/gs-manager.c b/src/gs-manager.c
index dc3bce5..7e66925 100644
--- a/src/gs-manager.c
+++ b/src/gs-manager.c
@@ -116,7 +116,7 @@ enum
PROP_THROTTLED,
};
-#define FADE_TIMEOUT 1000
+#define FADE_TIMEOUT 250
static guint signals [LAST_SIGNAL] = { 0, };