[EGIT] [tools/erigo] master 05/05: Refactoring background behavior

[Yakov Goldberg]

yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=60c929361969de414671b817a33776c444e59251

commit 60c929361969de414671b817a33776c444e59251
Author: Yakov Goldberg <yako...@samsung.com>
Date:   Sun Apr 19 18:34:54 2015 +0300

    Refactoring background behavior
---
 src/bin/egui_gui/egui_layout.json | 18 ++----------------
 src/bin/egui_gui/egui_logic.c     | 29 -----------------------------
 2 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/src/bin/egui_gui/egui_layout.json 
b/src/bin/egui_gui/egui_layout.json
index 3a42411..98882aa 100644
--- a/src/bin/egui_gui/egui_layout.json
+++ b/src/bin/egui_gui/egui_layout.json
@@ -830,7 +830,7 @@
       {
         "Elm_Win.constructor":[null, "ELM_WIN_BASIC"]
       },
-      "Contains":["main_bg", "main_box"]
+      "Contains":["canvas_bg", "main_box"]
     },
     "main_logo":
     {
@@ -845,20 +845,6 @@
         "Efl.Gfx.Base.visible":[true]
       }
     },
-    "main_bg":
-    {
-      "Desc":
-      {
-        "parent":"main_win",
-        "class":"Elm_Bg"
-      },
-      "Properties":
-      {
-        "Elm_Bg.color":[90, 90, 90, 255],
-        "Evas.Object.size_hint_weight":[1, 1],
-        "Efl.Gfx.Base.visible":[true]
-      }
-    },
     "canvas_bg":
     {
       "Desc":
@@ -3783,4 +3769,4 @@
       }
     }
   }
- }
\ No newline at end of file
+ }
diff --git a/src/bin/egui_gui/egui_logic.c b/src/bin/egui_gui/egui_logic.c
index 4abc7ac..5001ee1 100644
--- a/src/bin/egui_gui/egui_logic.c
+++ b/src/bin/egui_gui/egui_logic.c
@@ -33,8 +33,6 @@ static Egui_Layout_Fs_Win_Widgets *fs_win = NULL;
 
 static GuiLogicCbs *_guilogic_cbs = NULL;
 
-static Ecore_Idle_Enterer *_idle_enterer = NULL;
-
 GuiLogicCbs *guilogic_cbs_get()
 {
    if (!_guilogic_cbs) _guilogic_cbs = calloc(1, sizeof(*_guilogic_cbs));
@@ -876,30 +874,6 @@ _objtree_filter_entry_changed_cb(void *data EINA_UNUSED, 
Evas_Object *obj, void
    objtree_build(_active_context_get());
 }
 
-Eina_Bool
-_canvas_bg_show_on_idle(void *data EINA_UNUSED)
-{
-   Evas_Coord cv_x, cv_y, cv_w, cv_h, tmp;
-
-   eo_do(g_main_wdgs->main_win->left_panes, efl_gfx_size_get(&cv_x, NULL));
-   cv_x = (double)cv_x * 
elm_panes_content_left_size_get(g_main_wdgs->main_win->left_panes);
-   cv_x += 7;
-
-   eo_do(g_main_wdgs->main_win->right_panes, efl_gfx_position_get(&cv_w, 
NULL));
-   eo_do(g_main_wdgs->main_win->right_panes, efl_gfx_size_get(&tmp, NULL));
-   tmp = (double)tmp * 
elm_panes_content_left_size_get(g_main_wdgs->main_win->right_panes);
-   cv_w += tmp;
-   cv_w -= (cv_x + 7);
-   eo_do(g_main_wdgs->main_win->toolbar, efl_gfx_size_get(NULL, &cv_y));
-   eo_do(g_main_wdgs->main_win->main_win, efl_gfx_size_get(NULL, &cv_h));
-   cv_h -= cv_y;
-
-   eo_do(g_main_wdgs->main_win->canvas_bg,
-         efl_gfx_position_set(cv_x, cv_y),
-         efl_gfx_size_set(cv_w, cv_h));
-   return ECORE_CALLBACK_RENEW;
-}
-
 static void
 _key_binding_save_cb(void *data)
 {
@@ -959,7 +933,6 @@ egui_start()
 
    evas_object_smart_callback_add(g_main_wdgs->main_win->objtree_filter_entry, 
"changed,user", _objtree_filter_entry_changed_cb, NULL);
 
-   _idle_enterer = ecore_idle_enterer_add(_canvas_bg_show_on_idle, NULL);
    /* Toolbar */
    Eo *menu;
    elm_toolbar_item_selected_set(g_main_wdgs->main_win->toolbar_project_it, 
EINA_FALSE);
@@ -1081,8 +1054,6 @@ egui_stop()
 {
    editor_shutdown();
    key_bindings_shutdown();
-   ecore_idle_enterer_del(_idle_enterer);
-   _idle_enterer = NULL;
 }
 
 void

--