summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary/efl_ui_win.c')
-rw-r--r--src/lib/elementary/efl_ui_win.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 8e1b357..95fa430 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -852,15 +852,14 @@ _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; 855 Eina_Size2D min, max;
856 Eina_Size2D max;
857 856
858 efl_gfx_size_hint_combined_min_get(win, &minw, &minh); 857 min = efl_gfx_size_hint_combined_min_get(win);
859 max = efl_gfx_size_hint_max_get(win); 858 max = efl_gfx_size_hint_max_get(win);
860 if (max.w < 1) max.w = -1; 859 if (max.w < 1) max.w = -1;
861 if (max.h < 1) max.h = -1; 860 if (max.h < 1) max.h = -1;
862 861
863 TRAP(sd, size_min_set, minw, minh); 862 TRAP(sd, size_min_set, min.w, min.h);
864 TRAP(sd, size_max_set, max.w, max.h); 863 TRAP(sd, size_max_set, max.w, max.h);
865} 864}
866 865
@@ -3453,7 +3452,7 @@ _elm_win_resize_objects_eval(Evas_Object *obj, Eina_Bool force_resize)
3453 Eina_Bool unresizable; 3452 Eina_Bool unresizable;
3454 double wx, wy; 3453 double wx, wy;
3455 3454
3456 efl_gfx_size_hint_combined_min_get(sd->legacy.edje, &minw, &minh); 3455 evas_object_size_hint_combined_min_get(sd->legacy.edje, &minw, &minh);
3457 if ((!minw) && (!minh)) return; 3456 if ((!minw) && (!minh)) return;
3458 3457
3459 // If content has a weight, make resizable 3458 // If content has a weight, make resizable
@@ -8065,7 +8064,7 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data)
8065 8064
8066 ELM_WIN_DATA_GET(data, sd); 8065 ELM_WIN_DATA_GET(data, sd);
8067 if (sd->main_menu && efl_gfx_visible_get(sd->main_menu)) 8066 if (sd->main_menu && efl_gfx_visible_get(sd->main_menu))
8068 efl_gfx_size_hint_combined_min_get(sd->main_menu, &menuw, NULL); 8067 evas_object_size_hint_combined_min_get(sd->main_menu, &menuw, NULL);
8069 8068
8070 EINA_LIST_FOREACH(p->children, l, opt) 8069 EINA_LIST_FOREACH(p->children, l, opt)
8071 { 8070 {
@@ -8074,7 +8073,7 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data)
8074 if (EINA_DBL_EQ(wx, 0.0)) weight_x = 0; 8073 if (EINA_DBL_EQ(wx, 0.0)) weight_x = 0;
8075 if (EINA_DBL_EQ(wy, 0.0)) weight_y = 0; 8074 if (EINA_DBL_EQ(wy, 0.0)) weight_y = 0;
8076 8075
8077 efl_gfx_size_hint_combined_min_get(child, &w, &h); 8076 evas_object_size_hint_combined_min_get(child, &w, &h);
8078 if (w > minw) minw = w; 8077 if (w > minw) minw = w;
8079 if (h > minh) minh = h; 8078 if (h > minh) minh = h;
8080 } 8079 }