raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8b66dc0e7c27984e9118e966cafe141de15cdf46
commit 8b66dc0e7c27984e9118e966cafe141de15cdf46
Author: Maksym Volodin <m.volo...@samsung.com>
Date: Thu Jul 3 17:15:10 2014 +0900
edje_edit: Add edje_edit_part_item_position_get/set.
Summary: Edje_edit_part_item_position_set/get operates with column/row
part`s item position, only for "TABLE" type part.
Reviewers: seoz, raster, cedric, Hermet, reutskiy.v.v
CC: reutskiy.v.v, cedric, c
Differential Revision: https://phab.enlightenment.org/D1078
---
src/lib/edje/Edje_Edit.h | 26 +++++++++++++++++++++
src/lib/edje/edje_edit.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 84 insertions(+), 2 deletions(-)
diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h
index b21f459..39058d6 100644
--- a/src/lib/edje/Edje_Edit.h
+++ b/src/lib/edje/Edje_Edit.h
@@ -2057,6 +2057,32 @@ EAPI double edje_edit_part_item_align_y_get(Evas_Object
*obj, const char *part,
*/
EAPI Eina_Bool edje_edit_part_item_align_y_set(Evas_Object *obj, const char
*part, const char *item, double align_y);
+/** Get column/row position of the part's item.
+ *
+ * @param obj Object being edited.
+ * @param part Part that contain item.
+ * @param item_name The name of the item.
+ * @param col Column item position.
+ * @param row Row item position.
+ *
+ * @return @c EINA_TRUE If successfull, @c EINA_FALSE otherwise.
+ * @since 1.11
+ */
+EAPI Eina_Bool edje_edit_part_item_position_get(Evas_Object *obj, const char
*part, const char *item_name, unsigned short *col, unsigned short *row);
+
+/** Set column/row position of a new part's item.
+ *
+ * @param obj Object being edited.
+ * @param part Part that contain item.
+ * @param item_name The name of the item.
+ * @param col Column item position.
+ * @param row Row item position.
+ *
+ * @return @c EINA_TRUE If successfull, @c EINA_FALSE otherwise.
+ * @since 1.11
+ */
+EAPI Eina_Bool edje_edit_part_item_position_set(Evas_Object *obj, const char
*part, const char *item_name, unsigned short col, unsigned short row);
+
//@}
/******************************************************************************/
/************************** STATES API
************************************/
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index bb34cc1..8f4e526 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -4427,6 +4427,61 @@ FUNC_PART_ITEM_DOUBLE(align_y, align.y);
#undef FUNC_PART_ITEM_DOUBLE
+EAPI Eina_Bool
+edje_edit_part_item_position_get(Evas_Object *obj, const char *part,
+ const char *item_name,
+ unsigned short *col,
+ unsigned short *row)
+ {
+ Edje_Part *ep;
+ unsigned int i;
+ Edje_Pack_Element *item = NULL;
+ if ((!obj) || (!part) || (!item_name))
+ return EINA_FALSE;
+ GET_RP_OR_RETURN(EINA_FALSE);
+ ep = rp->part;
+ for (i = 0; i < ep->items_count; ++i)
+ {
+ if (ep->items[i]->name && (!strcmp(ep->items[i]->name, item_name)))
+ {
+ item = ep->items[i];
+ break;
+ }
+ }
+ if (!item) return EINA_FALSE;
+ *col = item->col;
+ *row = item->row;
+ return EINA_TRUE;
+ }
+EAPI Eina_Bool
+edje_edit_part_item_position_set(Evas_Object *obj, const char *part,
+ const char *item_name,
+ unsigned short col,
+ unsigned short row)
+ {
+ Edje_Part *ep;
+ unsigned int i;
+ Edje_Pack_Element *item = NULL;
+ if ((!obj) || (!part) || (!item_name))
+ return EINA_FALSE;
+ GET_RP_OR_RETURN(EINA_FALSE);
+ ep = rp->part;
+ if (rp->part->type != EDJE_PART_TYPE_TABLE)
+ return EINA_FALSE;
+ for (i = 0; i < ep->items_count; ++i)
+ {
+ if (ep->items[i]->name && (!strcmp(ep->items[i]->name, item_name)))
+ {
+ item = ep->items[i];
+ break;
+ }
+ }
+ if (!item) return EINA_FALSE;
+ item->col = col;
+ item->row = row;
+ return EINA_TRUE;
+ }
+
/*********************/
/* PART STATES API */
/*********************/
@@ -10054,10 +10109,11 @@ _edje_generate_source_of_part(Evas_Object *obj,
Edje_Part *ep, Eina_Strbuf *buf)
if (TO_DOUBLE(item->align.x) != 0.5 ||
TO_DOUBLE(item->align.y) != 0.5)
BUF_APPENDF(I7"align: %g %g;\n", TO_DOUBLE(item->align.x),
TO_DOUBLE(item->align.y));
+
+ if (edje_edit_part_type_get(obj, part) ==
EDJE_PART_TYPE_TABLE)
+ BUF_APPENDF(I7"position: %d %d;\n", item->col, item->row);
//TODO weight
//TODO options
- //TODO col
- //TODO row
//TODO colspan
//TODO rowspan
BUF_APPEND(I6"}\n");
--
