[EGIT] [tools/erigo] master 01/01: Refactoring _canvas_name_update()

[Yakov Goldberg]

yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=8b31b534c85f0f300609a88b8715de4f866c743e

commit 8b31b534c85f0f300609a88b8715de4f866c743e
Author: Yakov Goldberg <yako...@samsung.com>
Date:   Tue Nov 17 13:10:00 2015 +0200

    Refactoring _canvas_name_update()
    
    In order to properly update name on context switch
---
 src/bin/gui/editor.c             | 18 +++++++++---------
 src/bin/gui/egui_logic_private.h |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index b8a6ba9..ff3f16a 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -92,13 +92,20 @@ _active_context_get()
 }
 
 void
-_canvas_name_update(const Gui_Context *ctx, Eina_Bool editing)
+_canvas_name_update(const Gui_Context *ctx, Eina_Bool force_name_change)
 {
    static Eina_Bool prev_editing;
    static const Gui_Context *prev_ctx;
    char name[200];
    char win_title[300];
 
+   Eina_Bool editing = EINA_FALSE;
+   if (context_current_memento_get(ctx) != context_saved_memento_get(ctx) ||
+       force_name_change)
+     {
+        editing = EINA_TRUE;
+     }
+
    if ((prev_editing == editing) && (ctx == prev_ctx)) return;
    prev_editing = editing;
    prev_ctx = ctx;
@@ -4253,14 +4260,7 @@ _context_changed_cb(void *data EINA_UNUSED, Memento *mem 
EINA_UNUSED, Eina_Bool
    const Gui_Context *ctx = _active_context_get();
    eo_do(g->main_win->toolbar_redo_it, 
elm_wdg_item_disabled_set(context_can_redo(ctx) ? EINA_FALSE : EINA_TRUE));
    eo_do(g->main_win->toolbar_undo_it, 
elm_wdg_item_disabled_set(context_can_undo(ctx) ? EINA_FALSE : EINA_TRUE));
-   if (context_current_memento_get(ctx) != context_saved_memento_get(ctx))
-     {
-        _canvas_name_update(ctx, EINA_TRUE);
-     }
-   else
-     {
-        _canvas_name_update(ctx, EINA_FALSE);
-     }
+   _canvas_name_update(ctx, EINA_FALSE);
 }
 
 void
diff --git a/src/bin/gui/egui_logic_private.h b/src/bin/gui/egui_logic_private.h
index 863cc14..84a0e77 100644
--- a/src/bin/gui/egui_logic_private.h
+++ b/src/bin/gui/egui_logic_private.h
@@ -28,7 +28,7 @@ Gui_Context *
 _active_context_get();
 
 void
-_canvas_name_update(const Gui_Context *ctx, Eina_Bool not_saved);
+_canvas_name_update(const Gui_Context *ctx, Eina_Bool force_name_change);
 
 Eo *
 canvas_get();

--