From 9299566707e6b022ac2c326a25b9ed526b0c120c Mon Sep 17 00:00:00 2001 From: Boris Faure Date: Mon, 5 Aug 2019 22:26:48 +0200 Subject: [PATCH 1/2] options_behavior: avoid eo message I have no idea why this fixes anything --- src/bin/options_behavior.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bin/options_behavior.c b/src/bin/options_behavior.c index 5e30a9b9..9e92cc95 100644 --- a/src/bin/options_behavior.c +++ b/src/bin/options_behavior.c @@ -567,16 +567,14 @@ options_behavior(Evas_Object *opbox, Evas_Object *term) evas_object_show(o); o = elm_slider_add(bx); - evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0); - elm_slider_span_size_set(o, 40); - elm_slider_step_set(o, 1); - elm_slider_units_format_function_set(o, - sback_units_format, - (void(*)(char*))eina_stringshare_del); elm_slider_indicator_format_function_set(o, sback_indicator_units_format, (void(*)(char*))eina_stringshare_del); + elm_slider_units_format_function_set(o, + sback_units_format, + (void(*)(char*))eina_stringshare_del); + elm_slider_span_size_set(o, 40); + elm_slider_step_set(o, 1); /* http://graphics.stanford.edu/~seander/bithacks.html#IntegerLogFloat */ union { float v; @@ -586,6 +584,8 @@ options_behavior(Evas_Object *opbox, Evas_Object *term) u.c = (u.c >> 23) - 127; elm_slider_min_max_set(o, 0.0, 17.0); elm_slider_value_set(o, u.c); + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0); elm_box_pack_end(bx, o); evas_object_show(o); evas_object_smart_callback_add(o, "delay,changed", From fcfd797a3846afccf74c9e799197d7d465a7add5 Mon Sep 17 00:00:00 2001 From: Boris Faure Date: Tue, 6 Aug 2019 22:56:48 +0200 Subject: [PATCH 2/2] options_keys: force delete of genlist to avoid races --- src/bin/options_keys.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/options_keys.c b/src/bin/options_keys.c index 1eea682c..3d784776 100644 --- a/src/bin/options_keys.c +++ b/src/bin/options_keys.c @@ -224,6 +224,7 @@ _parent_del_cb(void *data, ctx->frame = NULL; _hover_del(ctx); + evas_object_del(ctx->gl); free(ctx); }