Elm: Revert changes for framespace.
NB: These leaves elm broken in wayland until I sort out what happened in evas. SVN revision: 76174
This commit is contained in:
parent
0fce46076e
commit
59130d05ec
|
@ -526,7 +526,6 @@ test_gesture_layer2(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
|
|||
Evas_Object *win, *tb, *lb, *bx;
|
||||
Evas_Object *r; /* Gesture layer transparent object */
|
||||
Evas_Object *g; /* The Gesture Layer object */
|
||||
Evas_Coord fx = 0, fy = 0;
|
||||
|
||||
infra_data *infra = _infra_data_alloc();
|
||||
|
||||
|
@ -668,12 +667,9 @@ test_gesture_layer2(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
|
|||
evas_object_show(lb);
|
||||
/* END - Building icons table */
|
||||
|
||||
evas_output_framespace_get(evas_object_evas_get(win),
|
||||
&fx, &fy, NULL, NULL);
|
||||
|
||||
/* Gesture layer transparent object */
|
||||
r = evas_object_rectangle_add(evas_object_evas_get(win));
|
||||
evas_object_move(r, fx, fy);
|
||||
evas_object_move(r, 0, 0);
|
||||
evas_object_color_set(r, 0, 0, 0, 0);
|
||||
elm_win_resize_object_add(win, r);
|
||||
|
||||
|
|
|
@ -109,14 +109,12 @@ test_menu(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
|
|||
{
|
||||
Evas_Object *win, *rect;
|
||||
Elm_Object_Item *menu_it;
|
||||
Evas_Coord fx, fy;
|
||||
|
||||
win = elm_win_util_standard_add("menu", "Menu");
|
||||
elm_win_autodel_set(win, EINA_TRUE);
|
||||
|
||||
rect = evas_object_rectangle_add(evas_object_evas_get(win));
|
||||
evas_output_framespace_get(evas_object_evas_get(win), &fx, &fy, NULL, NULL);
|
||||
evas_object_move(rect, fx, fy);
|
||||
evas_object_move(rect, 0, 0);
|
||||
evas_object_resize(rect, 350, 200);
|
||||
evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_color_set(rect, 0, 0, 0, 0);
|
||||
|
|
|
@ -250,7 +250,7 @@ test_win_inline(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
|
|||
|
||||
create_handles(elm_win_inlined_image_object_get(win3));
|
||||
|
||||
evas_object_resize(win, 400, 600);
|
||||
evas_object_resize(win, 400, 400);
|
||||
evas_object_show(win);
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue