No backlight dimming when in presentation mode. Backlight fade time only applies...

SVN revision: 82348

diff --git a/ChangeLog b/ChangeLog
index 1204191..d1541fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-07 Brian Miculcy
+        * No backlight dimming when in presentation mode.
+        * Backlight fade time only applies to dimming - undimming is fixed 0.5 .
+
 2013-01-07 Mike Blumenkrantz
 
         * Added option for disabling icons in menus

diff --git a/src/bin/e_backlight.c b/src/bin/e_backlight.c
index afddcb4..9813ea4 100644 (file)
--- a/src/bin/e_backlight.c
+++ b/src/bin/e_backlight.c
@@ -212,7 +212,10 @@ e_backlight_level_set(E_Zone *zone, double val, double tim)
    bl_now = bl_val;
    bl_val = val;
 //   if (e_config->backlight.mode != E_BACKLIGHT_MODE_NORMAL) return;
-   if (tim < 0.0) tim = e_config->backlight.transition;
+   if (e_config->backlight.mode == E_BACKLIGHT_MODE_NORMAL)
+      tim = 0.5;
+   else
+      if (tim < 0.0) tim = e_config->backlight.transition;
    ecore_event_add(E_EVENT_BACKLIGHT_CHANGE, NULL, NULL, NULL);
    if (tim == 0.0)
      {

diff --git a/src/bin/e_screensaver.c b/src/bin/e_screensaver.c
index fbf2b56..fa11212 100644 (file)
--- a/src/bin/e_screensaver.c
+++ b/src/bin/e_screensaver.c
@@ -35,7 +35,7 @@ e_screensaver_timeout_get(Eina_Bool use_idle)
        (!e_util_fullscreen_current_any()))
      timeout = e_config->screensaver_timeout * count;
    
-   if (use_idle)
+   if ((use_idle) && (!e_config->mode.presentation))
      {
         if (e_config->backlight.idle_dim)
           {