vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix up screensaver timeout if less than bl fade timeout. 

SVN revision: 80539
This commit is contained in:
Carsten Haitzler 2012-12-09 07:44:30 +00:00
parent f0c9f5121c
commit f16bdcb3ad
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/conf_display/e_int_config_dpms.c
View File

@ -86,7 +86,9 @@ _apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
e_backlight_mode_set(NULL, E_BACKLIGHT_MODE_NORMAL);
e_backlight_level_set(NULL, e_config->backlight.normal, -1.0);
if (cfdata->backlight_timeout > (e_config->screensaver_timeout))
if ((e_config->backlight.idle_dim) &&
(e_config->backlight.timer > (e_config->screensaver_timeout)))
{
e_config->screensaver_timeout = cfdata->backlight_timeout;
e_config->dpms_standby_timeout = e_config->screensaver_timeout;

9
src/modules/conf_display/e_int_config_screensaver.c
View File

@ -115,6 +115,15 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
// e_config->dpms_off_timeout = e_config->screensaver_timeout;
e_config->screensaver_interval = 0;
if ((e_config->backlight.idle_dim) &&
(e_config->backlight.timer > (e_config->screensaver_timeout)))
{
e_config->screensaver_timeout = e_config->backlight.timer;
e_config->dpms_standby_timeout = e_config->screensaver_timeout;
e_config->dpms_suspend_timeout = e_config->screensaver_timeout;
e_config->dpms_off_timeout = e_config->screensaver_timeout;
}
/* Apply settings */
e_screensaver_update();