summaryrefslogtreecommitdiff
path: root/src/bin/controls.c
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2019-05-26 19:25:44 +0200
committerBoris Faure <billiob@gmail.com>2019-05-26 19:25:44 +0200
commitfff087bead746d77c1b442e9b558af9baa52bf51 (patch)
tree0d1ef86471c6f2f562a07ec25d07d293f143728d /src/bin/controls.c
parentb963622c5d7ca4d0170529c615447879e8184d40 (diff)
use layout api in controls/options
Diffstat (limited to 'src/bin/controls.c')
-rw-r--r--src/bin/controls.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bin/controls.c b/src/bin/controls.c
index c9cf83f..5aa2e62 100644
--- a/src/bin/controls.c
+++ b/src/bin/controls.c
@@ -61,10 +61,10 @@ _cb_hidden(void *data,
61 61
62 evas_object_del(frame); 62 evas_object_del(frame);
63 63
64 o = edje_object_part_swallow_get(ctx->base, "terminology.controls"); 64 o = elm_layout_content_get(ctx->base, "terminology.controls");
65 if (o) 65 if (o)
66 { 66 {
67 edje_object_part_unswallow(ctx->base, o); 67 elm_layout_content_unset(ctx->base, "terminology.controls");
68 } 68 }
69 69
70 elm_cache_all_flush(); 70 elm_cache_all_flush();
@@ -286,7 +286,7 @@ controls_hide(Controls_Ctx *ctx, Eina_Bool call_cb)
286 if (ctx->term) 286 if (ctx->term)
287 { 287 {
288 evas_object_event_callback_del(ctx->term, EVAS_CALLBACK_DEL, _cb_saved_del); 288 evas_object_event_callback_del(ctx->term, EVAS_CALLBACK_DEL, _cb_saved_del);
289 edje_object_signal_emit(ctx->base, "controls,hide", "terminology"); 289 elm_layout_signal_emit(ctx->base, "controls,hide", "terminology");
290 } 290 }
291 291
292 if (ctx->over) 292 if (ctx->over)
@@ -311,7 +311,7 @@ controls_show(Evas_Object *win, Evas_Object *base, Evas_Object *bg,
311 Controls_Ctx *ctx; 311 Controls_Ctx *ctx;
312 312
313 if (eina_hash_find(controls, &win) || 313 if (eina_hash_find(controls, &win) ||
314 edje_object_part_swallow_get(base, "terminology.controls")) 314 elm_layout_content_get(base, "terminology.controls"))
315 { 315 {
316 donecb(donedata); 316 donecb(donedata);
317 return; 317 return;
@@ -418,16 +418,16 @@ controls_show(Evas_Object *win, Evas_Object *base, Evas_Object *bg,
418 evas_object_smart_callback_add(win, "selection,off", _cb_sel_off, 418 evas_object_smart_callback_add(win, "selection,off", _cb_sel_off,
419 ctx); 419 ctx);
420 420
421 edje_object_part_swallow(base, "terminology.controls", ctx->frame); 421 elm_layout_content_set(base, "terminology.controls", ctx->frame);
422 evas_object_show(ctx->frame); 422 evas_object_show(ctx->frame);
423 ctx->over = o = evas_object_rectangle_add(evas_object_evas_get(win)); 423 ctx->over = o = evas_object_rectangle_add(evas_object_evas_get(win));
424 evas_object_color_set(o, 0, 0, 0, 0); 424 evas_object_color_set(o, 0, 0, 0, 0);
425 edje_object_part_swallow(base, "terminology.dismiss", o); 425 elm_layout_content_set(base, "terminology.dismiss", o);
426 evas_object_show(o); 426 evas_object_show(o);
427 evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, 427 evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
428 _cb_mouse_down, ctx); 428 _cb_mouse_down, ctx);
429 429
430 edje_object_signal_emit(base, "controls,show", "terminology"); 430 elm_layout_signal_emit(base, "controls,show", "terminology");
431 elm_object_focus_set(ctx->frame, EINA_TRUE); 431 elm_object_focus_set(ctx->frame, EINA_TRUE);
432 evas_object_event_callback_add(ctx->win, EVAS_CALLBACK_DEL, _cb_saved_del, ctx); 432 evas_object_event_callback_add(ctx->win, EVAS_CALLBACK_DEL, _cb_saved_del, ctx);
433 evas_object_event_callback_add(ctx->term, EVAS_CALLBACK_DEL, _cb_saved_del, ctx); 433 evas_object_event_callback_add(ctx->term, EVAS_CALLBACK_DEL, _cb_saved_del, ctx);