From 9fd0cb47083c6d2ee9236597004c0026c1ec74d1 Mon Sep 17 00:00:00 2001 From: Daniel Juyung Seo Date: Fri, 15 Feb 2013 19:32:05 +0000 Subject: [PATCH] elm test_panes.c, panes_example.c: refactoring. use the panes in a better way. 1. do not use unnecessary global variable. 2. remember the last left pane size and set it later when double clicked again. 3. do not call elm_panes_content_left_size_get() twice. SVN revision: 83963 --- legacy/elementary/src/bin/test_panes.c | 14 +++++++------- legacy/elementary/src/examples/panes_example.c | 10 ++++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/legacy/elementary/src/bin/test_panes.c b/legacy/elementary/src/bin/test_panes.c index 0304518099..b8bf17430f 100644 --- a/legacy/elementary/src/bin/test_panes.c +++ b/legacy/elementary/src/bin/test_panes.c @@ -4,8 +4,6 @@ #include #ifndef ELM_LIB_QUICKLAUNCH -static double size = 0.0; - static void _press(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { @@ -27,14 +25,16 @@ _clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __ static void _clicked_double(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { + static double size = 0.0; + double tmp_size = 0.0; + + tmp_size = elm_panes_content_left_size_get(obj); printf("clicked double\n"); - if (elm_panes_content_left_size_get(obj) > 0) - { - size = elm_panes_content_left_size_get(obj); - elm_panes_content_left_size_set(obj, 0.0); - } + if (tmp_size > 0) + elm_panes_content_left_size_set(obj, 0.0); else elm_panes_content_left_size_set(obj, size); + size = tmp_size; } void diff --git a/legacy/elementary/src/examples/panes_example.c b/legacy/elementary/src/examples/panes_example.c index b8314ca76e..9347d046f7 100644 --- a/legacy/elementary/src/examples/panes_example.c +++ b/legacy/elementary/src/examples/panes_example.c @@ -19,8 +19,6 @@ _on_done(void *data, elm_exit(); } -static double size = 0.0; - static void _press(void *data, Evas_Object *obj, void *event_info) { @@ -42,9 +40,12 @@ _clicked(void *data, Evas_Object *obj, void *event_info) static void _clicked_double(void *data, Evas_Object *obj, void *event_info) { - if (elm_panes_content_left_size_get(obj) > 0) + static double size = 0.0; + double tmp_size = 0.0; + + tmp_size = elm_panes_content_left_size_get(obj); + if (tmp_size > 0) { - size = elm_panes_content_left_size_get(obj); elm_panes_content_left_size_set(obj, 0.0); printf("Double clicked, hidding.\n"); } @@ -53,6 +54,7 @@ _clicked_double(void *data, Evas_Object *obj, void *event_info) elm_panes_content_left_size_set(obj, size); printf("Double clicked, restoring size.\n"); } + size = tmp_size; } EAPI_MAIN int