summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-18 14:07:56 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-18 14:20:03 +0900
commitd24dcb3c24d619d7f268d227b3fb5eac44993cdd (patch)
treed1b7656a3433fcf52d9d4e663b08384f7b20b35b /src/lib
parent994d32f2a8338654e3e985ef5cecdebbcd7b8e62 (diff)
efl: Use Eina.Size2D for size hint max
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/efl/interfaces/efl_gfx_size_hint.eo4
-rw-r--r--src/lib/elementary/efl_ui_box_layout.c46
-rw-r--r--src/lib/elementary/efl_ui_win.c29
-rw-r--r--src/lib/evas/canvas/evas_object_main.c40
-rw-r--r--src/lib/evas/include/evas_private.h3
5 files changed, 62 insertions, 60 deletions
diff --git a/src/lib/efl/interfaces/efl_gfx_size_hint.eo b/src/lib/efl/interfaces/efl_gfx_size_hint.eo
index 4b2882a..acf6f37 100644
--- a/src/lib/efl/interfaces/efl_gfx_size_hint.eo
+++ b/src/lib/efl/interfaces/efl_gfx_size_hint.eo
@@ -87,8 +87,8 @@ interface Efl.Gfx.Size.Hint
87 the size of smart objects. 87 the size of smart objects.
88 ]] 88 ]]
89 values { 89 values {
90 w: int; [[Integer to use as the maximum width hint.]] 90 sz: Eina.Size2D; [[Maximum size (hint) in pixels, (-1, -1) by
91 h: int; [[Integer to use as the maximum height hint.]] 91 default for canvas objects).]]
92 } 92 }
93 } 93 }
94 @property hint_min { 94 @property hint_min {
diff --git a/src/lib/elementary/efl_ui_box_layout.c b/src/lib/elementary/efl_ui_box_layout.c
index 8d3e1cc..40f6be6 100644
--- a/src/lib/elementary/efl_ui_box_layout.c
+++ b/src/lib/elementary/efl_ui_box_layout.c
@@ -12,7 +12,7 @@ struct _Item_Calc
12 Evas_Object *obj; 12 Evas_Object *obj;
13 double weight[2]; 13 double weight[2];
14 double align[2]; 14 double align[2];
15 int max[2]; 15 Eina_Size2D max;
16 int pad[4]; 16 int pad[4];
17 int want[2]; 17 int want[2];
18 Efl_Gfx_Size_Hint_Aspect aspect_type; 18 Efl_Gfx_Size_Hint_Aspect aspect_type;
@@ -78,7 +78,7 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd)
78 efl_gfx_size_hint_weight_get(o, &item->weight[0], &item->weight[1]); 78 efl_gfx_size_hint_weight_get(o, &item->weight[0], &item->weight[1]);
79 efl_gfx_size_hint_align_get(o, &item->align[0], &item->align[1]); 79 efl_gfx_size_hint_align_get(o, &item->align[0], &item->align[1]);
80 efl_gfx_size_hint_margin_get(o, &item->pad[0], &item->pad[1], &item->pad[2], &item->pad[3]); 80 efl_gfx_size_hint_margin_get(o, &item->pad[0], &item->pad[1], &item->pad[2], &item->pad[3]);
81 efl_gfx_size_hint_max_get(o, &item->max[0], &item->max[1]); 81 item->max = efl_gfx_size_hint_max_get(o);
82 efl_gfx_size_hint_combined_min_get(o, &item->want[0], &item->want[1]); 82 efl_gfx_size_hint_combined_min_get(o, &item->want[0], &item->want[1]);
83 efl_gfx_size_hint_aspect_get(o, &item->aspect_type, &item->aspect[0], &item->aspect[1]); 83 efl_gfx_size_hint_aspect_get(o, &item->aspect_type, &item->aspect[0], &item->aspect[1]);
84 84
@@ -107,10 +107,10 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd)
107 if ((item->align[1] < 0) && (h < boxh)) 107 if ((item->align[1] < 0) && (h < boxh))
108 { 108 {
109 double w1, h1; 109 double w1, h1;
110 h1 = item->max[1] > 0 ? MIN(boxh, item->max[1]) : boxh; 110 h1 = item->max.h > 0 ? MIN(boxh, item->max.h) : boxh;
111 h1 = MAX(h, h1); 111 h1 = MAX(h, h1);
112 w1 = h1 * item->aspect[0] / item->aspect[1]; 112 w1 = h1 * item->aspect[0] / item->aspect[1];
113 w = item->max[0] > 0 ? MIN(w1, item->max[0]) : w1; 113 w = item->max.w > 0 ? MIN(w1, item->max.w) : w1;
114 } 114 }
115 } 115 }
116 else 116 else
@@ -118,10 +118,10 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd)
118 if ((item->align[0] < 0) && (w < boxw)) 118 if ((item->align[0] < 0) && (w < boxw))
119 { 119 {
120 double w1, h1; 120 double w1, h1;
121 w1 = item->max[0] > 0 ? MIN(boxw, item->max[0]) : boxw; 121 w1 = item->max.w > 0 ? MIN(boxw, item->max.w) : boxw;
122 w1 = MAX(w, w1); 122 w1 = MAX(w, w1);
123 h1 = w1 * item->aspect[1] / item->aspect[0]; 123 h1 = w1 * item->aspect[1] / item->aspect[0];
124 h = item->max[1] > 0 ? MIN(h1, item->max[1]) : h1; 124 h = item->max.h > 0 ? MIN(h1, item->max.h) : h1;
125 } 125 }
126 } 126 }
127 item->want[0] = w; 127 item->want[0] = w;
@@ -139,10 +139,10 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd)
139 if (item->want[0] < 0) item->want[0] = 0; 139 if (item->want[0] < 0) item->want[0] = 0;
140 if (item->want[1] < 0) item->want[1] = 0; 140 if (item->want[1] < 0) item->want[1] = 0;
141 141
142 if (item->max[0] < 0) item->max[0] = INT_MAX; 142 if (item->max.w < 0) item->max.w = INT_MAX;
143 if (item->max[1] < 0) item->max[1] = INT_MAX; 143 if (item->max.h < 0) item->max.h = INT_MAX;
144 if (item->max[0] < item->want[0]) item->max[0] = item->want[0]; 144 if (item->max.w < item->want[0]) item->max.w = item->want[0];
145 if (item->max[1] < item->want[1]) item->max[1] = item->want[1]; 145 if (item->max.h < item->want[1]) item->max.h = item->want[1];
146 146
147 item->want[0] += item->pad[0] + item->pad[1]; 147 item->want[0] += item->pad[0] + item->pad[1];
148 item->want[1] += item->pad[2] + item->pad[3]; 148 item->want[1] += item->pad[2] + item->pad[3];
@@ -286,36 +286,36 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd)
286 } 286 }
287 } 287 }
288 288
289 if ((item->max[0] != INT_MAX) && (item->max[1] != INT_MAX)) 289 if ((item->max.w != INT_MAX) && (item->max.h != INT_MAX))
290 { 290 {
291 double mar, ar; 291 double mar, ar;
292 mar = item->max[0] / (double)item->max[1]; 292 mar = item->max.w / (double)item->max.h;
293 ar = item->aspect[0] / (double)item->aspect[1]; 293 ar = item->aspect[0] / (double)item->aspect[1];
294 if (ar < mar) 294 if (ar < mar)
295 { 295 {
296 if (h > item->max[1]) 296 if (h > item->max.h)
297 { 297 {
298 h = item->max[1]; 298 h = item->max.h;
299 w = h * item->aspect[0] / item->aspect[1]; 299 w = h * item->aspect[0] / item->aspect[1];
300 } 300 }
301 } 301 }
302 else 302 else
303 { 303 {
304 if (w > item->max[0]) 304 if (w > item->max.w)
305 { 305 {
306 w = item->max[0]; 306 w = item->max.w;
307 h = w * item->aspect[1] / item->aspect[0]; 307 h = w * item->aspect[1] / item->aspect[0];
308 } 308 }
309 } 309 }
310 } 310 }
311 else if (item->max[0] != INT_MAX) 311 else if (item->max.w != INT_MAX)
312 { 312 {
313 w = MIN(w, MAX(item->want[0], item->max[0])); 313 w = MIN(w, MAX(item->want[0], item->max.w));
314 h = w * item->aspect[1] / item->aspect[0]; 314 h = w * item->aspect[1] / item->aspect[0];
315 } 315 }
316 else 316 else
317 { 317 {
318 h = MIN(h, MAX(item->want[1], item->max[1])); 318 h = MIN(h, MAX(item->want[1], item->max.h));
319 w = h * item->aspect[0] / item->aspect[1]; 319 w = h * item->aspect[0] / item->aspect[1];
320 } 320 }
321 w = w - item->pad[0] - item->pad[1]; 321 w = w - item->pad[0] - item->pad[1];
@@ -334,9 +334,9 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd)
334 else 334 else
335 { 335 {
336 // horizontally 336 // horizontally
337 if (item->max[0] < INT_MAX) 337 if (item->max.w < INT_MAX)
338 { 338 {
339 w = MIN(MAX(item->want[0] - item->pad[0] - item->pad[1], item->max[0]), cw); 339 w = MIN(MAX(item->want[0] - item->pad[0] - item->pad[1], item->max.w), cw);
340 if (item->align[0] < 0) 340 if (item->align[0] < 0)
341 { 341 {
342 // bad case: fill+max are not good together 342 // bad case: fill+max are not good together
@@ -361,9 +361,9 @@ _efl_ui_box_custom_layout(Efl_Ui_Box *ui_box, Evas_Object_Box_Data *bd)
361 } 361 }
362 362
363 // vertically 363 // vertically
364 if (item->max[1] < INT_MAX) 364 if (item->max.h < INT_MAX)
365 { 365 {
366 h = MIN(MAX(item->want[1] - item->pad[2] - item->pad[3], item->max[1]), ch); 366 h = MIN(MAX(item->want[1] - item->pad[2] - item->pad[3], item->max.h), ch);
367 if (item->align[1] < 0) 367 if (item->align[1] < 0)
368 { 368 {
369 // bad case: fill+max are not good together 369 // bad case: fill+max are not good together
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 275d33f..c32754e 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -852,15 +852,16 @@ _elm_win_obj_intercept_layer_set(void *data, Evas_Object *obj EINA_UNUSED, int l
852static void 852static void
853_elm_win_size_hints_update(Efl_Ui_Win *win, Efl_Ui_Win_Data *sd) 853_elm_win_size_hints_update(Efl_Ui_Win *win, Efl_Ui_Win_Data *sd)
854{ 854{
855 Evas_Coord minw, minh, maxw, maxh; 855 Evas_Coord minw, minh;
856 Eina_Size2D max;
856 857
857 efl_gfx_size_hint_combined_min_get(win, &minw, &minh); 858 efl_gfx_size_hint_combined_min_get(win, &minw, &minh);
858 efl_gfx_size_hint_max_get(win, &maxw, &maxh); 859 max = efl_gfx_size_hint_max_get(win);
859 if (maxw < 1) maxw = -1; 860 if (max.w < 1) max.w = -1;
860 if (maxh < 1) maxh = -1; 861 if (max.h < 1) max.h = -1;
861 862
862 TRAP(sd, size_min_set, minw, minh); 863 TRAP(sd, size_min_set, minw, minh);
863 TRAP(sd, size_max_set, maxw, maxh); 864 TRAP(sd, size_max_set, max.w, max.h);
864} 865}
865 866
866static void 867static void
@@ -1614,7 +1615,7 @@ _elm_win_state_change(Ecore_Evas *ee)
1614 if (ch_wm_rotation) 1615 if (ch_wm_rotation)
1615 { 1616 {
1616 efl_gfx_size_hint_restricted_min_set(obj, -1, -1); 1617 efl_gfx_size_hint_restricted_min_set(obj, -1, -1);
1617 efl_gfx_size_hint_max_set(obj, -1, -1); 1618 efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(-1, -1));
1618#ifdef HAVE_ELEMENTARY_X 1619#ifdef HAVE_ELEMENTARY_X
1619 ELM_WIN_DATA_ALIVE_CHECK(obj, sd); 1620 ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
1620 _elm_win_xwin_update(sd); 1621 _elm_win_xwin_update(sd);
@@ -3495,7 +3496,7 @@ _elm_win_resize_objects_eval(Evas_Object *obj, Eina_Bool force_resize)
3495 3496
3496 sd->tmp_updating_hints = 1; 3497 sd->tmp_updating_hints = 1;
3497 efl_gfx_size_hint_restricted_min_set(obj, minw, minh); 3498 efl_gfx_size_hint_restricted_min_set(obj, minw, minh);
3498 efl_gfx_size_hint_max_set(obj, maxw, maxh); 3499 efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(maxw, maxh));
3499 sd->tmp_updating_hints = 0; 3500 sd->tmp_updating_hints = 0;
3500 _elm_win_size_hints_update(obj, sd); 3501 _elm_win_size_hints_update(obj, sd);
3501 3502
@@ -5992,18 +5993,18 @@ _efl_ui_win_efl_gfx_size_hint_hint_step_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data
5992} 5993}
5993 5994
5994EOLIAN static void 5995EOLIAN static void
5995_efl_ui_win_efl_gfx_size_hint_hint_max_set(Eo *obj, Efl_Ui_Win_Data *sd, int w, int h) 5996_efl_ui_win_efl_gfx_size_hint_hint_max_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Size2D sz)
5996{ 5997{
5997 if (sd->tmp_updating_hints) 5998 if (sd->tmp_updating_hints)
5998 { 5999 {
5999 efl_gfx_size_hint_max_set(efl_super(obj, MY_CLASS), w, h); 6000 efl_gfx_size_hint_max_set(efl_super(obj, MY_CLASS), sz);
6000 } 6001 }
6001 else 6002 else
6002 { 6003 {
6003 if (w < 1) w = -1; 6004 if (sz.w < 1) sz.w = -1;
6004 if (h < 1) h = -1; 6005 if (sz.h < 1) sz.h = -1;
6005 sd->max_w = w; 6006 sd->max_w = sz.w;
6006 sd->max_h = h; 6007 sd->max_h = sz.h;
6007 _elm_win_resize_objects_eval(obj, EINA_FALSE); 6008 _elm_win_resize_objects_eval(obj, EINA_FALSE);
6008 } 6009 }
6009} 6010}
@@ -6079,7 +6080,7 @@ _win_rotate(Evas_Object *obj, Efl_Ui_Win_Data *sd, int rotation, Eina_Bool resiz
6079 if (resize) TRAP(sd, rotation_with_resize_set, rotation); 6080 if (resize) TRAP(sd, rotation_with_resize_set, rotation);
6080 else TRAP(sd, rotation_set, rotation); 6081 else TRAP(sd, rotation_set, rotation);
6081 efl_gfx_size_hint_restricted_min_set(obj, -1, -1); 6082 efl_gfx_size_hint_restricted_min_set(obj, -1, -1);
6082 efl_gfx_size_hint_max_set(obj, -1, -1); 6083 efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(-1, -1));
6083 _elm_win_resize_objects_eval(obj, EINA_FALSE); 6084 _elm_win_resize_objects_eval(obj, EINA_FALSE);
6084#ifdef HAVE_ELEMENTARY_X 6085#ifdef HAVE_ELEMENTARY_X
6085 _elm_win_xwin_update(sd); 6086 _elm_win_xwin_update(sd);
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 948df29..ba8835d 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1441,33 +1441,30 @@ _efl_canvas_object_efl_gfx_size_hint_hint_combined_min_get(Eo *eo_obj EINA_UNUSE
1441 if (h) *h = MAX(obj->size_hints->min.h, obj->size_hints->user_min.h); 1441 if (h) *h = MAX(obj->size_hints->min.h, obj->size_hints->user_min.h);
1442} 1442}
1443 1443
1444EOLIAN static void 1444EOLIAN static Eina_Size2D
1445_efl_canvas_object_efl_gfx_size_hint_hint_max_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h) 1445_efl_canvas_object_efl_gfx_size_hint_hint_max_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
1446{ 1446{
1447 if ((!obj->size_hints) || obj->delete_me) 1447 if ((!obj->size_hints) || obj->delete_me)
1448 { 1448 return EINA_SIZE2D(-1, -1);
1449 if (w) *w = -1; 1449
1450 if (h) *h = -1; 1450 return obj->size_hints->max;
1451 return;
1452 }
1453 if (w) *w = obj->size_hints->max.w;
1454 if (h) *h = obj->size_hints->max.h;
1455} 1451}
1456 1452
1457EOLIAN static void 1453EOLIAN static void
1458_efl_canvas_object_efl_gfx_size_hint_hint_max_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h) 1454_efl_canvas_object_efl_gfx_size_hint_hint_max_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Size2D sz)
1459{ 1455{
1460 if (obj->delete_me) 1456 if (obj->delete_me)
1461 return; 1457 return;
1458
1462 evas_object_async_block(obj); 1459 evas_object_async_block(obj);
1463 if (EINA_UNLIKELY(!obj->size_hints)) 1460 if (EINA_UNLIKELY(!obj->size_hints))
1464 { 1461 {
1465 if ((w == -1) && (h == -1)) return; 1462 if ((sz.w == -1) && (sz.h == -1)) return;
1466 _evas_object_size_hint_alloc(eo_obj, obj); 1463 _evas_object_size_hint_alloc(eo_obj, obj);
1467 } 1464 }
1468 if ((obj->size_hints->max.w == w) && (obj->size_hints->max.h == h)) return; 1465 if ((obj->size_hints->max.w == sz.w) && (obj->size_hints->max.h == sz.h)) return;
1469 obj->size_hints->max.w = w; 1466 obj->size_hints->max.w = sz.w;
1470 obj->size_hints->max.h = h; 1467 obj->size_hints->max.h = sz.h;
1471 1468
1472 evas_object_inform_call_changed_size_hints(eo_obj); 1469 evas_object_inform_call_changed_size_hints(eo_obj);
1473} 1470}
@@ -2051,8 +2048,8 @@ _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Dat
2051 int r, g, b, a; 2048 int r, g, b, a;
2052 //int requestw, requesth; 2049 //int requestw, requesth;
2053 int minw, minh; 2050 int minw, minh;
2054 int maxw, maxh;
2055 Eina_Rect geom; 2051 Eina_Rect geom;
2052 Eina_Size2D max;
2056 short layer; 2053 short layer;
2057 Eina_Bool focus; 2054 Eina_Bool focus;
2058 Eina_Bool visible; 2055 Eina_Bool visible;
@@ -2067,7 +2064,7 @@ _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Dat
2067 geom = efl_gfx_geometry_get(eo_obj); 2064 geom = efl_gfx_geometry_get(eo_obj);
2068 scale = efl_canvas_object_scale_get(eo_obj); 2065 scale = efl_canvas_object_scale_get(eo_obj);
2069 efl_gfx_size_hint_restricted_min_get(eo_obj, &minw, &minh); 2066 efl_gfx_size_hint_restricted_min_get(eo_obj, &minw, &minh);
2070 efl_gfx_size_hint_max_get(eo_obj, &maxw, &maxh); 2067 max = efl_gfx_size_hint_max_get(eo_obj);
2071 //efl_gfx_size_hint_request_get(eo_obj, &requestw, &requesth); 2068 //efl_gfx_size_hint_request_get(eo_obj, &requestw, &requesth);
2072 efl_gfx_size_hint_align_get(eo_obj, &dblx, &dbly); 2069 efl_gfx_size_hint_align_get(eo_obj, &dblx, &dbly);
2073 efl_gfx_size_hint_weight_get(eo_obj, &dblw, &dblh); 2070 efl_gfx_size_hint_weight_get(eo_obj, &dblw, &dblh);
@@ -2101,8 +2098,8 @@ _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Dat
2101 EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, minh); 2098 EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, minh);
2102 2099
2103 node = EFL_DBG_INFO_LIST_APPEND(group, "Max size"); 2100 node = EFL_DBG_INFO_LIST_APPEND(group, "Max size");
2104 EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, maxw); 2101 EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, max.w);
2105 EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, maxh); 2102 EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, max.h);
2106 2103
2107 //node = EFL_DBG_INFO_LIST_APPEND(group, "Request size"); 2104 //node = EFL_DBG_INFO_LIST_APPEND(group, "Request size");
2108 //EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, requestw); 2105 //EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, requestw);
@@ -2569,13 +2566,16 @@ evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *as
2569EAPI void 2566EAPI void
2570evas_object_size_hint_max_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h) 2567evas_object_size_hint_max_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
2571{ 2568{
2572 efl_gfx_size_hint_max_set(obj, w, h); 2569 efl_gfx_size_hint_max_set(obj, EINA_SIZE2D(w, h));
2573} 2570}
2574 2571
2575EAPI void 2572EAPI void
2576evas_object_size_hint_max_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h) 2573evas_object_size_hint_max_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
2577{ 2574{
2578 efl_gfx_size_hint_max_get(obj, w, h); 2575 Eina_Size2D sz;
2576 sz = efl_gfx_size_hint_max_get(obj);
2577 if (w) *w = sz.w;
2578 if (h) *h = sz.h;
2579} 2579}
2580 2580
2581EAPI void 2581EAPI void
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 8b31dca..7a35e37 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1019,7 +1019,8 @@ struct _Evas_Double_Pair
1019 1019
1020struct _Evas_Size_Hints 1020struct _Evas_Size_Hints
1021{ 1021{
1022 Evas_Size min, max, user_min, request; 1022 Evas_Size min, user_min, request;
1023 Eina_Size2D max;
1023 Evas_Aspect aspect; 1024 Evas_Aspect aspect;
1024 Evas_Double_Pair align, weight; 1025 Evas_Double_Pair align, weight;
1025 Evas_Border padding; 1026 Evas_Border padding;