fix issues k-s reported:

SVN revision: 60369
This commit is contained in:
Carsten Haitzler 2011-06-16 03:26:21 +00:00
parent b38f0e4f26
commit 2b7b0b6082
3 changed files with 15 additions and 3 deletions

View File

@ -2647,7 +2647,15 @@ ACT_FN_GO_ACPI(undim_screen, __UNUSED__)
ACT_FN_GO(backlight_set, )
{
E_Zone *zone = _e_actions_zone_get(obj);
int v = atoi(params);
int v;
if (params)
v = atoi(params);
else
{
v = e_backlight_level_get(zone) * 100.0;
if (v == 0) v = 100;
else v = 0;
}
e_backlight_mode_set(zone, E_BACKLIGHT_MODE_NORMAL);
e_backlight_level_set(zone, ((double)v / 100.0), -1.0);
}
@ -2655,7 +2663,9 @@ ACT_FN_GO(backlight_set, )
ACT_FN_GO(backlight_adjust, )
{
E_Zone *zone = _e_actions_zone_get(obj);
int v = atoi(params);
int v;
if (!params) return;
v = atoi(params);
e_backlight_mode_set(zone, E_BACKLIGHT_MODE_NORMAL);
e_backlight_level_set(zone, e_backlight_level_get(zone) + ((double)v / 100.0), -1.0);
}

View File

@ -236,7 +236,7 @@ _backlight_popup_new(Instance *inst)
inst->o_table = e_widget_table_add(evas, 0);
o = e_widget_slider_add(evas, 0, 0, NULL, 0.0, 1.0, 0.0, 0, &(inst->val), NULL, 200);
o = e_widget_slider_add(evas, 0, 0, NULL, 0.0, 1.0, 0.0, 0, &(inst->val), NULL, 100);
evas_object_smart_callback_add(o, "changed", _slider_cb, inst);
inst->o_slider = o;
e_widget_table_object_align_append(inst->o_table, o,
@ -369,6 +369,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
inst = gcc->data;
if (inst->menu)
{
e_menu_post_deactivate_callback_set(inst->menu, NULL, NULL);
_backlight_input_win_del(inst);
e_object_del(E_OBJECT(inst->menu));
inst->menu = NULL;

View File

@ -487,6 +487,7 @@ _gc_shutdown(E_Gadcon_Client *gcc)
inst = gcc->data;
if (inst->menu)
{
e_menu_post_deactivate_callback_set(inst->menu, NULL, NULL);
e_object_del(E_OBJECT(inst->menu));
inst->menu = NULL;
}