[EGIT] [tools/enventor] master 01/01: status: code refactoring.

[Hermet Park]

hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=bb81be9901a657e48d4cd615f93e548d0c55fb32

commit bb81be9901a657e48d4cd615f93e548d0c55fb32
Author: Hermet Park <her...@hermet.pe.kr>
Date:   Fri Feb 5 17:58:01 2016 +0900

    status: code refactoring.
    
    we don't need a disabled function but just unfocusable buttons.
---
 src/bin/menu.c          | 4 ----
 src/bin/statusbar.c     | 8 +-------
 src/include/statusbar.h | 1 -
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/bin/menu.c b/src/bin/menu.c
index b46d2a7..5cc8dfa 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -61,7 +61,6 @@ menu_close(menu_data *md)
    if (!md->menu_layout) return;
    elm_object_signal_emit(md->menu_layout, "elm,state,dismiss", "");
 
-   stats_disabled_set(EINA_FALSE);
    tools_menu_update(EINA_FALSE);
 }
 
@@ -637,7 +636,6 @@ menu_open(menu_data *md)
    elm_object_part_content_set(layout, "elm.swallow.exit_btn", btn);
 
    tools_menu_update(EINA_TRUE);
-   stats_disabled_set(EINA_TRUE);
 
    md->menu_layout = layout;
    md->active_request++;
@@ -792,7 +790,6 @@ menu_deactivate_request(void)
    if (md->active_request == 0)
      {
         enventor_object_focus_set(base_enventor_get(), EINA_TRUE);
-        stats_disabled_set(EINA_FALSE);
      }
    if (!md->menu_layout) return;
    elm_object_disabled_set(md->menu_layout, EINA_FALSE);
@@ -804,6 +801,5 @@ menu_activate_request(void)
 {
    menu_data *md = g_md;
    if (md->menu_layout) elm_object_disabled_set(md->menu_layout, EINA_TRUE);
-   stats_disabled_set(EINA_TRUE);
    md->active_request++;
 }
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index 6a2e413..c1ca617 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -116,6 +116,7 @@ create_statusbar_btn(Evas_Object *layout, const char *image,
    Evas_Object *box = elm_box_add(layout);
 
    Evas_Object *btn = elm_button_add(box);
+   elm_object_focus_allow_set(btn, EINA_FALSE);
    evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_object_scale_set(btn, 0.5);
@@ -263,10 +264,3 @@ stats_ctxpopup_dismiss(void)
      }
    return EINA_FALSE;
 }
-
-void
-stats_disabled_set(Eina_Bool disabled)
-{
-   stats_data *sd = g_sd;
-   elm_object_disabled_set(sd->layout, disabled);
-}
diff --git a/src/include/statusbar.h b/src/include/statusbar.h
index ae54c19..8732ccb 100644
--- a/src/include/statusbar.h
+++ b/src/include/statusbar.h
@@ -9,4 +9,3 @@ Evas_Object *stats_obj_get(void);
 void stats_edc_group_update(const char *group_name);
 Eina_Stringshare *stats_group_name_get(void);
 Eina_Bool stats_ctxpopup_dismiss(void);
-void stats_disabled_set(Eina_Bool disabled);

--