discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=b3cda14e1b89db004d26f6ac66b8ff88e7e948d9
commit b3cda14e1b89db004d26f6ac66b8ff88e7e948d9
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Tue Mar 8 12:43:35 2016 -0500
add bryce autohide/size getters, pull related values into wizard
---
src/bin/e_bryce.c | 14 ++++++++++++++
src/bin/e_bryce.h | 4 ++--
src/bin/e_bryce_editor.c | 21 ++++++++++++++++++++-
3 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_bryce.c b/src/bin/e_bryce.c
index d3aba88..64b8961 100644
--- a/src/bin/e_bryce.c
+++ b/src/bin/e_bryce.c
@@ -944,6 +944,13 @@ e_bryce_site_get(Evas_Object *bryce)
return b->site;
}
+E_API Eina_Bool
+e_bryce_autosize_get(Evas_Object *bryce)
+{
+ BRYCE_GET(bryce);
+ return b->autosize;
+}
+
E_API void
e_bryce_autosize_set(Evas_Object *bryce, Eina_Bool set)
{
@@ -957,6 +964,13 @@ e_bryce_autosize_set(Evas_Object *bryce, Eina_Bool set)
_bryce_autosize(b);
}
+E_API Eina_Bool
+e_bryce_autohide_get(Evas_Object *bryce)
+{
+ BRYCE_GET(bryce);
+ return b->autohide;
+}
+
E_API void
e_bryce_autohide_set(Evas_Object *bryce, Eina_Bool set)
{
diff --git a/src/bin/e_bryce.h b/src/bin/e_bryce.h
index 3fa69b5..3f575a2 100644
--- a/src/bin/e_bryce.h
+++ b/src/bin/e_bryce.h
@@ -8,13 +8,13 @@ EINTERN void e_bryce_shutdown(void);
E_API Evas_Object *e_bryce_add(Evas_Object *parent, const char *name,
E_Gadget_Site_Orient orient, E_Gadget_Site_Anchor an);
E_API void e_bryce_orient(Evas_Object *bryce, E_Gadget_Site_Orient orient,
E_Gadget_Site_Anchor an);
E_API Evas_Object *e_bryce_site_get(Evas_Object *bryce);
+E_API Eina_Bool e_bryce_autosize_get(Evas_Object *bryce);
E_API void e_bryce_autosize_set(Evas_Object *bryce, Eina_Bool set);
+E_API Eina_Bool e_bryce_autohide_get(Evas_Object *bryce);
E_API void e_bryce_autohide_set(Evas_Object *bryce, Eina_Bool set);
E_API Eina_Bool e_bryce_exists(Evas_Object *parent, Evas_Object *bryce,
E_Gadget_Site_Orient orient, E_Gadget_Site_Anchor an);
E_API Eina_List *e_bryce_list(Evas_Object *parent);
E_API void e_bryce_style_set(Evas_Object *bryce, const char *style);
-E_API void e_bryce_autosize_set(Evas_Object *bryce, Eina_Bool set);
-E_API void e_bryce_autohide_set(Evas_Object *bryce, Eina_Bool set);
E_API Evas_Object *e_bryce_editor_add(Evas_Object *parent, Evas_Object *bryce);
E_API Evas_Object *e_bryce_edit(Evas_Object *bryce);
diff --git a/src/bin/e_bryce_editor.c b/src/bin/e_bryce_editor.c
index b07173a..6cd0f5a 100644
--- a/src/bin/e_bryce_editor.c
+++ b/src/bin/e_bryce_editor.c
@@ -134,13 +134,14 @@ _editor_style_click(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj, void *eve
const char *g;
char style[1024] = {0};
Bryce_Info *bi;
- Evas_Object *ly, *box, *ck, *button;
+ Evas_Object *ly, *box, *ck, *button, *bryce;
ly = elm_object_part_content_get(obj, "e.swallow.content");
elm_layout_file_get(ly, NULL, &g);
g += (sizeof("e/bryce/") - 1);
memcpy(style, g, MIN(sizeof(style) - 1, strchr(g, '/') - g));
+ bryce = evas_object_data_get(data, "__bryce_editor_bryce");
bi = evas_object_data_get(data, "__bryce_info");
bi->style = eina_stringshare_add(style);
e_theme_edje_object_set(data, NULL, "e/bryce/editor/finish");
@@ -149,24 +150,42 @@ _editor_style_click(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj, void *eve
elm_box_padding_set(box, 0, 20 * e_scale);
ck = elm_check_add(box);
+ elm_object_focus_allow_set(ck, 0);
E_ALIGN(ck, 0, 0.5);
evas_object_show(ck);
elm_object_text_set(ck, _("Automatically size based on contents"));
evas_object_smart_callback_add(ck, "changed", _editor_autosize, bi);
+ if (bryce)
+ {
+ bi->autosize = e_bryce_autosize_get(bryce);
+ elm_check_state_set(ck, bi->autosize);
+ }
elm_box_pack_end(box, ck);
ck = elm_check_add(box);
+ elm_object_focus_allow_set(ck, 0);
E_ALIGN(ck, 0, 0.5);
evas_object_show(ck);
elm_object_text_set(ck, _("Automatically hide"));
evas_object_smart_callback_add(ck, "changed", _editor_autohide, bi);
+ if (bryce)
+ {
+ bi->autohide = e_bryce_autohide_get(bryce);
+ elm_check_state_set(ck, bi->autohide);
+ }
elm_box_pack_end(box, ck);
ck = elm_check_add(box);
+ elm_object_focus_allow_set(ck, 0);
E_ALIGN(ck, 0, 0.5);
evas_object_show(ck);
elm_object_text_set(ck, _("Do not stack above windows"));
evas_object_smart_callback_add(ck, "changed", _editor_stacking, bi);
+ if (bryce)
+ {
+ bi->stack_under = evas_object_layer_get(bryce) == E_LAYER_DESKTOP;
+ elm_check_state_set(ck, bi->stack_under);
+ }
elm_box_pack_end(box, ck);
//ck = elm_check_add(box);
--
