summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2014-12-03 16:49:52 +0200
committerYakov Goldberg <yakov.g@samsung.com>2014-12-03 16:50:07 +0200
commit843f0dbdbfecc5f77ca848a81b07418c88b701e7 (patch)
tree59ad24d013816c5a28749e87e733eba2f0b1374a /src/bin
parent9c520da6ba26fd1f957e1f9496e02ae01b321c09 (diff)
...even more fix to prev commit.
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/egui_gui/editor.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index 93c7f5d..f98da96 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -465,7 +465,7 @@ _iter_widget_delete(Gui_Widget *wdg)
465 } 465 }
466 466
467 /* If widget is Win, look for its frame and unset content, but don't delete frame. */ 467 /* If widget is Win, look for its frame and unset content, but don't delete frame. */
468 Eo *win_inlined_image = NULL, *optional_win = NULL; 468 Eo *optional_win = NULL;
469 /* Each time we iterate over widgets in order to delete them, we set window's frame invisible. 469 /* Each time we iterate over widgets in order to delete them, we set window's frame invisible.
470 * DUring creation it will be visible again. Frame deleted only when project is closed. */ 470 * DUring creation it will be visible again. Frame deleted only when project is closed. */
471 if (IS_MAIN(wdg)) 471 if (IS_MAIN(wdg))
@@ -481,15 +481,21 @@ _iter_widget_delete(Gui_Widget *wdg)
481 Eo *fr = main_wdg_info_frame_get(wi); 481 Eo *fr = main_wdg_info_frame_get(wi);
482 if (fr) 482 if (fr)
483 { 483 {
484 win_inlined_image = elm_object_content_get(fr); 484 /* Inlined image is created right on a evas and not connected to it's win.
485 * So when win is deleted, image stays.
486 * During next creation of Eo for wdg new image will be created and the old one will be unter it.
487 * Anyhow, let's hide it.
488 * It will be deleted together with it's evas*/
489 Eo *win_inlined_image = elm_object_content_get(fr);
490 eo_do(win_inlined_image, evas_obj_visibility_set(EINA_FALSE));
485 eo_do(fr, evas_obj_visibility_set(EINA_FALSE)); 491 eo_do(fr, evas_obj_visibility_set(EINA_FALSE));
486 } 492 }
487 } 493 }
488 } 494 }
489 manager_widget_delete(session, wdg, MODE_EDITOR, NULL); 495 manager_widget_delete(session, wdg, MODE_EDITOR, NULL);
490 496
491 /* Delete window's inline image */ 497 /* Delete window's optinal win. */
492 if (win_inlined_image) 498 if (optional_win)
493 { 499 {
494 eo_del(optional_win); 500 eo_del(optional_win);
495 } 501 }