bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Save memory related to size hints. 

Size hints are useful, but wasting 36 bytes for it on every object is a bit
too much: clippers and lots of other objects will have no need for it.

Now it's a pointer to a struct that will be allocated just when some value
is set, wasting 4/8 bytes more for the pointer when it is used, but saving
32/28 bytes when it is not.

This will also help to have alignment properties in future, that can come
as hints, without too much impact on memory consumption.


SVN revision: 34412
This commit is contained in:
Gustavo Sverzut Barbieri 2008-04-30 22:51:08 +00:00
parent 54c06677b4
commit b46fc2a2f4
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
legacy/evas/src/lib/canvas/evas_object_main.c
View File

@ -67,6 +67,7 @@ evas_object_free(Evas_Object *obj, int clean_layer)
free(node); free(node);
} }
obj->magic = 0; obj->magic = 0;
if (obj->size_hints) free(obj->size_hints);
free(obj); free(obj);
} }
@ -697,13 +698,13 @@ evas_object_size_hint_min_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord
if (w) *w = 0; if (h) *h = 0; if (w) *w = 0; if (h) *h = 0;
return; return;
MAGIC_CHECK_END(); MAGIC_CHECK_END();
if (obj->delete_me) if ((!obj->size_hints) || obj->delete_me)
{ {
if (w) *w = 0; if (h) *h = 0; if (w) *w = 0; if (h) *h = 0;
return; return;
} }
if (w) *w = obj->size_hints.min.w; if (w) *w = obj->size_hints->min.w;
if (h) *h = obj->size_hints.min.h; if (h) *h = obj->size_hints->min.h;
} }
/** /**
@ -725,9 +726,11 @@ evas_object_size_hint_min_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
MAGIC_CHECK_END(); MAGIC_CHECK_END();
if (obj->delete_me) if (obj->delete_me)
return; return;
if (obj->size_hints)
obj->size_hints = calloc(1, sizeof(*obj->size_hints));
obj->size_hints.min.w = w; obj->size_hints->min.w = w;
obj->size_hints.min.h = h; obj->size_hints->min.h = h;
evas_object_inform_call_changed_size_hints(obj); evas_object_inform_call_changed_size_hints(obj);
} }
@ -753,13 +756,13 @@ evas_object_size_hint_max_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord
if (w) *w = 0; if (h) *h = 0; if (w) *w = 0; if (h) *h = 0;
return; return;
MAGIC_CHECK_END(); MAGIC_CHECK_END();
if (obj->delete_me) if ((!obj->size_hints) || obj->delete_me)
{ {
if (w) *w = 0; if (h) *h = 0; if (w) *w = 0; if (h) *h = 0;
return; return;
} }
if (w) *w = obj->size_hints.max.w; if (w) *w = obj->size_hints->max.w;
if (h) *h = obj->size_hints.max.h; if (h) *h = obj->size_hints->max.h;
} }
/** /**
@ -781,9 +784,11 @@ evas_object_size_hint_max_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
MAGIC_CHECK_END(); MAGIC_CHECK_END();
if (obj->delete_me) if (obj->delete_me)
return; return;
if (obj->size_hints)
obj->size_hints = calloc(1, sizeof(*obj->size_hints));
obj->size_hints.max.w = w; obj->size_hints->max.w = w;
obj->size_hints.max.h = h; obj->size_hints->max.h = h;
evas_object_inform_call_changed_size_hints(obj); evas_object_inform_call_changed_size_hints(obj);
} }
@ -809,13 +814,13 @@ evas_object_size_hint_request_get(const Evas_Object *obj, Evas_Coord *w, Evas_Co
if (w) *w = 0; if (h) *h = 0; if (w) *w = 0; if (h) *h = 0;
return; return;
MAGIC_CHECK_END(); MAGIC_CHECK_END();
if (obj->delete_me) if ((!obj->size_hints) || obj->delete_me)
{ {
if (w) *w = 0; if (h) *h = 0; if (w) *w = 0; if (h) *h = 0;
return; return;
} }
if (w) *w = obj->size_hints.request.w; if (w) *w = obj->size_hints->request.w;
if (h) *h = obj->size_hints.request.h; if (h) *h = obj->size_hints->request.h;
} }
/** /**
@ -837,9 +842,10 @@ evas_object_size_hint_request_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
MAGIC_CHECK_END(); MAGIC_CHECK_END();
if (obj->delete_me) if (obj->delete_me)
return; return;
if (obj->size_hints) obj->size_hints = calloc(1, sizeof(*obj->size_hints));
obj->size_hints.request.w = w; obj->size_hints->request.w = w;
obj->size_hints.request.h = h; obj->size_hints->request.h = h;
evas_object_inform_call_changed_size_hints(obj); evas_object_inform_call_changed_size_hints(obj);
} }
@ -867,15 +873,15 @@ evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *as
if (w) *w = 0; if (h) *h = 0; if (w) *w = 0; if (h) *h = 0;
return; return;
MAGIC_CHECK_END(); MAGIC_CHECK_END();
if (obj->delete_me) if ((!obj->size_hints) || obj->delete_me)
{ {
if (aspect) *aspect = EVAS_ASPECT_CONTROL_NONE; if (aspect) *aspect = EVAS_ASPECT_CONTROL_NONE;
if (w) *w = 0; if (h) *h = 0; if (w) *w = 0; if (h) *h = 0;
return; return;
} }
if (aspect) *aspect = obj->size_hints.aspect.mode; if (aspect) *aspect = obj->size_hints->aspect.mode;
if (w) *w = obj->size_hints.aspect.size.w; if (w) *w = obj->size_hints->aspect.size.w;
if (h) *h = obj->size_hints.aspect.size.h; if (h) *h = obj->size_hints->aspect.size.h;
} }
/** /**
@ -898,10 +904,12 @@ evas_object_size_hint_aspect_set(Evas_Object *obj, Evas_Aspect_Control aspect, E
MAGIC_CHECK_END(); MAGIC_CHECK_END();
if (obj->delete_me) if (obj->delete_me)
return; return;
if (obj->size_hints)
obj->size_hints = calloc(1, sizeof(*obj->size_hints));
obj->size_hints.aspect.mode = aspect; obj->size_hints->aspect.mode = aspect;
obj->size_hints.aspect.size.w = w; obj->size_hints->aspect.size.w = w;
obj->size_hints.aspect.size.h = h; obj->size_hints->aspect.size.h = h;
evas_object_inform_call_changed_size_hints(obj); evas_object_inform_call_changed_size_hints(obj);
} }

2
legacy/evas/src/lib/include/evas_private.h
View File

@ -460,7 +460,7 @@ struct _Evas_Object
unsigned char deletions_waiting : 1; unsigned char deletions_waiting : 1;
} smart; } smart;
Evas_Size_Hints size_hints; Evas_Size_Hints *size_hints;
int last_mouse_down_counter; int last_mouse_down_counter;
int last_mouse_up_counter; int last_mouse_up_counter;