enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Revert "mixer: lock up the slider for the case a drag is in progress" 

This reverts commit eed35d3c4f.

This is a bad workaround, I have fixed the issue so we don't need it
anymore.
This commit is contained in:
Michaël Bouchaud (yoz) 2016-10-27 22:38:46 +02:00
parent b65cb5df92
commit b2d67bd68a
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/mixer/e_mod_main.c
View File

@ -143,8 +143,7 @@ static void
_mixer_popup_update(Instance *inst, int mute, int vol)
{
elm_check_state_set(inst->check, !!mute);
if (!evas_object_data_del(inst->slider, "__lock"))
elm_slider_value_set(inst->slider, vol);
elm_slider_value_set(inst->slider, vol);
}
static void _popup_del(Instance *inst);
@ -500,14 +499,6 @@ _slider_drag_stop_cb(void *data EINA_UNUSED, Evas_Object *obj,
Emix_Sink *s = (Emix_Sink *)mixer_context->sink_default;
int val = s->volume.volumes[0];
elm_slider_value_set(obj, val);
evas_object_data_del(obj, "__lock");
}
static void
_slider_drag_start_cb(void *data EINA_UNUSED, Evas_Object *obj,
void *event EINA_UNUSED)
{
evas_object_data_set(obj, "__lock", (void*)1);
}
static void
@ -575,7 +566,6 @@ _popup_new(Instance *inst)
elm_slider_min_max_set(slider, 0.0, emix_max_volume_get());
evas_object_smart_callback_add(slider, "changed", _slider_changed_cb, NULL);
evas_object_smart_callback_add(slider, "slider,drag,stop", _slider_drag_stop_cb, NULL);
evas_object_smart_callback_add(slider, "slider,drag,start", _slider_drag_start_cb, NULL);
elm_slider_value_set(slider, volume);
elm_box_pack_end(bx, slider);
evas_object_show(slider);