forked from enlightenment/enlightenment
fix up screensaver timeout if less than bl fade timeout.
SVN revision: 80539
This commit is contained in:
parent
f0c9f5121c
commit
f16bdcb3ad
|
@ -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_mode_set(NULL, E_BACKLIGHT_MODE_NORMAL);
|
||||||
e_backlight_level_set(NULL, e_config->backlight.normal, -1.0);
|
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->screensaver_timeout = cfdata->backlight_timeout;
|
||||||
e_config->dpms_standby_timeout = e_config->screensaver_timeout;
|
e_config->dpms_standby_timeout = e_config->screensaver_timeout;
|
||||||
|
|
|
@ -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->dpms_off_timeout = e_config->screensaver_timeout;
|
||||||
|
|
||||||
e_config->screensaver_interval = 0;
|
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 */
|
/* Apply settings */
|
||||||
e_screensaver_update();
|
e_screensaver_update();
|
||||||
|
|
Loading…
Reference in New Issue