summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/elementary/efl_ui_panes.c15
-rw-r--r--src/lib/elementary/efl_ui_panes_private.h1
2 files changed, 4 insertions, 12 deletions
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index ef9f6d387d..e5640d1005 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -365,9 +365,7 @@ _on_resize(void *data,
365 Evas_Object *obj EINA_UNUSED, 365 Evas_Object *obj EINA_UNUSED,
366 void *event_info EINA_UNUSED) 366 void *event_info EINA_UNUSED)
367{ 367{
368 EFL_UI_PANES_DATA_GET(data, sd); 368 if (elm_widget_is_legacy(data)) _update_fixed_sides(data);
369
370 if (sd->legacy_use) _update_fixed_sides(data);
371 else _set_min_size_new(data); 369 else _set_min_size_new(data);
372} 370}
373 371
@@ -409,7 +407,7 @@ _efl_ui_panes_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UN
409 sd->left_min_size = 0; 407 sd->left_min_size = 0;
410 sd->right_min_relative_size = 0; 408 sd->right_min_relative_size = 0;
411 sd->left_min_relative_size = 0; 409 sd->left_min_relative_size = 0;
412 if (sd->legacy_use) _update_fixed_sides(obj); 410 if (elm_widget_is_legacy(obj)) _update_fixed_sides(obj);
413 else _set_min_size_new(obj); 411 else _set_min_size_new(obj);
414 412
415 elm_widget_can_focus_set(obj, EINA_FALSE); 413 elm_widget_can_focus_set(obj, EINA_FALSE);
@@ -435,12 +433,7 @@ EAPI Evas_Object *
435elm_panes_add(Evas_Object *parent) 433elm_panes_add(Evas_Object *parent)
436{ 434{
437 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 435 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
438 Evas_Object *obj = efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added)); 436 return efl_add(MY_CLASS, parent, efl_canvas_object_legacy_ctor(efl_added));
439 EFL_UI_PANES_DATA_GET(obj, sd);
440
441 sd->legacy_use = EINA_TRUE;
442
443 return obj;
444} 437}
445 438
446EOLIAN static Eo * 439EOLIAN static Eo *
@@ -530,7 +523,7 @@ _efl_ui_panes_efl_ui_direction_direction_set(Eo *obj, Efl_Ui_Panes_Data *sd, Efl
530 523
531 sd->dir = dir; 524 sd->dir = dir;
532 elm_obj_widget_theme_apply(obj); 525 elm_obj_widget_theme_apply(obj);
533 if (sd->legacy_use) _update_fixed_sides(obj); 526 if (elm_widget_is_legacy(obj)) _update_fixed_sides(obj);
534 else _set_min_size_new(obj); 527 else _set_min_size_new(obj);
535 528
536 elm_panes_content_left_size_set(obj, size); 529 elm_panes_content_left_size_set(obj, size);
diff --git a/src/lib/elementary/efl_ui_panes_private.h b/src/lib/elementary/efl_ui_panes_private.h
index 738eaee069..8ff8378d5e 100644
--- a/src/lib/elementary/efl_ui_panes_private.h
+++ b/src/lib/elementary/efl_ui_panes_private.h
@@ -49,7 +49,6 @@ struct _Efl_Ui_Panes_Data
49 Eina_Bool right_min_size_is_relative : 1; 49 Eina_Bool right_min_size_is_relative : 1;
50 Eina_Bool first_allow_user_hints : 1; 50 Eina_Bool first_allow_user_hints : 1;
51 Eina_Bool second_allow_user_hints : 1; 51 Eina_Bool second_allow_user_hints : 1;
52 Eina_Bool legacy_use : 1;
53}; 52};
54 53
55/** 54/**