From 31c99d6127fbc21acd4e3644cda1ae64b97df3cf Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Thu, 2 Jan 2014 15:54:46 +0900 Subject: [PATCH] make wallpaper (and other options) apply to current term (splits/tabs) --- src/bin/options.c | 17 +++++++++++++++++ src/bin/options_wallpaper.c | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/bin/options.c b/src/bin/options.c index 2829a910..f0e55f60 100644 --- a/src/bin/options.c +++ b/src/bin/options.c @@ -92,6 +92,20 @@ _cb_opdt_hide_done(void *data, Evas_Object *obj EINA_UNUSED, const char *sig EIN edje_object_signal_emit(saved_bg, "optdetails,show", "terminology"); } +static void +_cb_opdt_hide_done2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED) +{ + if (op_del_timer) + { + ecore_timer_del(op_del_timer); + op_del_timer = NULL; + } + _cb_op_del_delay(NULL); + edje_object_signal_callback_del(saved_bg, "optdetails,hide,done", + "terminology", + _cb_opdt_hide_done2); +} + void options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term, void (*donecb) (void *data), void *donedata) @@ -209,6 +223,9 @@ options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term, edje_object_signal_callback_del(bg, "optdetails,hide,done", "terminology", _cb_opdt_hide_done); + edje_object_signal_callback_add(bg, "optdetails,hide,done", + "terminology", + _cb_opdt_hide_done2, term); elm_object_focus_set(op_frame, EINA_FALSE); elm_object_focus_set(op_opbox, EINA_FALSE); elm_object_focus_set(op_toolbar, EINA_FALSE); diff --git a/src/bin/options_wallpaper.c b/src/bin/options_wallpaper.c index 7b9afccf..5a66fa82 100644 --- a/src/bin/options_wallpaper.c +++ b/src/bin/options_wallpaper.c @@ -438,7 +438,7 @@ _renew_gengrid_backgrounds(Evas_Object *term) } void -options_wallpaper(Evas_Object *opbox, Evas_Object *term EINA_UNUSED) +options_wallpaper(Evas_Object *opbox, Evas_Object *term) { Evas_Object *frame, *o;