[EGIT] [tools/enventor] master 01/01: config: store/recover the editor panes position.

[ChunEon Park]

hermet pushed a commit to branch master.

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

commit 802d68ff833a32cfdd6521396772c1354f5f5ef8
Author: ChunEon Park <her...@hermet.pe.kr>
Date:   Tue Jun 23 14:39:48 2015 +0900

    config: store/recover the editor panes position.
---
 src/bin/config_data.c     | 21 +++++++++++++++++++--
 src/bin/panes.c           |  6 ++++--
 src/include/common.h      |  2 +-
 src/include/config_data.h |  2 ++
 src/include/panes.h       |  2 ++
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/bin/config_data.c b/src/bin/config_data.c
index 2a3d7ad..c7ce95c 100644
--- a/src/bin/config_data.c
+++ b/src/bin/config_data.c
@@ -21,6 +21,7 @@ typedef struct config_s
    unsigned int version;
    float font_scale;
    double view_scale;
+   double editor_size;
    double console_size;
 
    void (*update_cb)(void *data);
@@ -151,8 +152,9 @@ config_load(void)
         cd->edc_snd_path_list = NULL;
         cd->edc_fnt_path_list = NULL;
         cd->edc_dat_path_list = NULL;
-        cd->font_scale = 1.0f;
+        cd->font_scale = 1;
         cd->view_scale = 1;
+        cd->editor_size = DEFAULT_EDITOR_SIZE;
         cd->console_size = DEFAULT_CONSOLE_SIZE;
         cd->stats_bar = EINA_TRUE;
         cd->linenumber = EINA_TRUE;
@@ -237,6 +239,8 @@ eddc_init(void)
                                  EET_T_FLOAT);
    EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "view_scale",
                                  view_scale, EET_T_DOUBLE);
+   EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "editor_size",
+                                 editor_size, EET_T_DOUBLE);
    EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "console_size",
                                  console_size, EET_T_DOUBLE);
    EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "view_size_w",
@@ -301,7 +305,6 @@ config_init(const char *edc_path, const char *edj_path,
 
    if (edc_dat_path)
      g_cd->edc_dat_path_list = edc_dat_path;
-
 }
 
 void
@@ -784,6 +787,20 @@ config_view_size_configurable_get(void)
 }
 
 double
+config_editor_size_get(void)
+{
+   config_data *cd = g_cd;
+   return cd->editor_size;
+}
+
+void
+config_editor_size_set(double size)
+{
+   config_data *cd = g_cd;
+   cd->editor_size = size;
+}
+
+double
 config_console_size_get(void)
 {
    config_data *cd = g_cd;
diff --git a/src/bin/panes.c b/src/bin/panes.c
index 138de8f..59e9c3b 100644
--- a/src/bin/panes.c
+++ b/src/bin/panes.c
@@ -87,6 +87,7 @@ h_unpress_cb(void *data, Evas_Object *obj, void *event_info 
EINA_UNUSED)
     panes_data *pd = data;
     double size = elm_panes_content_right_size_get(obj);
     if (pd->horiz.last_size[0] != size) pd->horiz.last_size[1] = size;
+    config_editor_size_set(size);
 }
 
 static void
@@ -309,9 +310,10 @@ panes_init(Evas_Object *parent)
 
    pd->horiz.obj = panes_h;
    pd->horiz.state = PANES_SPLIT_VIEW;
-   pd->horiz.last_size[0] = 0.5;
-   pd->horiz.last_size[1] = 0.5;
+   pd->horiz.last_size[0] = config_editor_size_get();
+   pd->horiz.last_size[1] = config_editor_size_get();
 
+   elm_panes_content_right_size_set(panes_h, config_editor_size_get());
    elm_panes_content_right_size_set(panes_v, config_console_size_get());
 
    return panes_v;
diff --git a/src/include/common.h b/src/include/common.h
index 9f38c36..0217277 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -55,7 +55,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
 #define REL2_X 0.75f
 #define REL2_Y 0.75f
 
-#define ENVENTOR_CONFIG_VERSION 1
+#define ENVENTOR_CONFIG_VERSION 2
 
 #define ENVENTOR_BETA_API_SUPPORT 1
 #include <Enventor.h>
diff --git a/src/include/config_data.h b/src/include/config_data.h
index bd984ce..dc236d6 100644
--- a/src/include/config_data.h
+++ b/src/include/config_data.h
@@ -53,6 +53,8 @@ void config_config_set(Eina_Bool enabled);
 double config_console_size_get(void);
 void config_console_size_set(double size);
 Eina_Bool config_console_get(void);
+void config_editor_size_set(double size);
+double config_editor_size_get(void);
 void config_console_set(Eina_Bool enabled);
 void config_win_size_get(Evas_Coord *w, Evas_Coord *h);
 void config_win_size_set(Evas_Coord w, Evas_Coord h);
diff --git a/src/include/panes.h b/src/include/panes.h
index 7e6e706..b9f2e6f 100644
--- a/src/include/panes.h
+++ b/src/include/panes.h
@@ -1,3 +1,5 @@
+#define DEFAULT_EDITOR_SIZE 0.5
+
 Evas_Object *panes_init(Evas_Object *parent);
 void panes_term(void);
 void panes_text_editor_full_view(void);

--