diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index b53766dade..04b61fdb6d 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -188,7 +188,6 @@ elm_private_eolian_files = \ elm_legacy_eolian_files = \ lib/elementary/efl_ui_radio_legacy.eo \ lib/elementary/efl_ui_video_legacy.eo \ - lib/elementary/efl_ui_panes_legacy.eo \ lib/elementary/efl_ui_win_legacy.eo \ lib/elementary/efl_ui_progressbar_legacy.eo \ lib/elementary/efl_ui_clock_legacy.eo \ @@ -326,6 +325,8 @@ lib/elementary/efl_ui_image_legacy_eo.c \ lib/elementary/efl_ui_image_zoomable_eo.legacy.c \ lib/elementary/efl_ui_image_zoomable_legacy_eo.c \ lib/elementary/efl_ui_layout_legacy_eo.c \ +lib/elementary/efl_ui_panes_eo.legacy.c \ +lib/elementary/efl_ui_panes_legacy_eo.c \ lib/elementary/elm_hoversel_eo.c \ lib/elementary/elm_hoversel_eo.legacy.c \ lib/elementary/elm_hoversel_item_eo.c \ @@ -354,6 +355,9 @@ lib/elementary/efl_ui_image_zoomable_legacy_eo.h \ lib/elementary/efl_ui_image_zoomable_legacy_eo.legacy.h \ lib/elementary/efl_ui_layout_legacy_eo.h \ lib/elementary/efl_ui_layout_legacy_eo.legacy.h \ +lib/elementary/efl_ui_panes_eo.legacy.h \ +lib/elementary/efl_ui_panes_legacy_eo.h \ +lib/elementary/efl_ui_panes_legacy_eo.legacy.h \ lib/elementary/elm_hoversel_eo.h \ lib/elementary/elm_hoversel_eo.legacy.h \ lib/elementary/elm_hoversel_item_eo.h \ diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c index f732a01a08..a221193803 100644 --- a/src/lib/elementary/efl_ui_panes.c +++ b/src/lib/elementary/efl_ui_panes.c @@ -716,8 +716,9 @@ ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(efl_ui_panes) ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_panes) #include "efl_ui_panes.eo.c" +#include "efl_ui_panes_eo.legacy.c" -#include "efl_ui_panes_legacy.eo.h" +#include "efl_ui_panes_legacy_eo.h" #define MY_CLASS_NAME_LEGACY "elm_panes" static void @@ -904,4 +905,4 @@ elm_panes_content_right_unset(Evas_Object *obj) return elm_layout_content_unset(obj, "right"); } -#include "efl_ui_panes_legacy.eo.c" +#include "efl_ui_panes_legacy_eo.c" diff --git a/src/lib/elementary/efl_ui_panes.eo b/src/lib/elementary/efl_ui_panes.eo index 110d299b15..ca24cd7357 100644 --- a/src/lib/elementary/efl_ui_panes.eo +++ b/src/lib/elementary/efl_ui_panes.eo @@ -2,7 +2,6 @@ class @beta Efl.Ui.Panes extends Efl.Ui.Layout_Base implements Efl.Ui.Direction, Efl.Ui.Clickable { [[Elementary panes class]] - legacy_prefix: elm_panes; event_prefix: elm_panes; methods { @property split_ratio { @@ -20,10 +19,8 @@ class @beta Efl.Ui.Panes extends Efl.Ui.Layout_Base implements Efl.Ui.Direction, Note: This ratio will change when user drags the panes bar.]] set { - legacy: null; } get { - legacy: null; } values { ratio: double; [[Value between 0.0 and 1.0 representing split ratio between panes first and second parts.]] diff --git a/src/lib/elementary/efl_ui_panes_eo.legacy.c b/src/lib/elementary/efl_ui_panes_eo.legacy.c new file mode 100644 index 0000000000..fde258805d --- /dev/null +++ b/src/lib/elementary/efl_ui_panes_eo.legacy.c @@ -0,0 +1,12 @@ + +EAPI void +elm_panes_fixed_set(Efl_Ui_Panes *obj, Eina_Bool fixed) +{ + efl_ui_panes_fixed_set(obj, fixed); +} + +EAPI Eina_Bool +elm_panes_fixed_get(const Efl_Ui_Panes *obj) +{ + return efl_ui_panes_fixed_get(obj); +} diff --git a/src/lib/elementary/efl_ui_panes_eo.legacy.h b/src/lib/elementary/efl_ui_panes_eo.legacy.h new file mode 100644 index 0000000000..b0b3a942b8 --- /dev/null +++ b/src/lib/elementary/efl_ui_panes_eo.legacy.h @@ -0,0 +1,49 @@ +#ifndef _EFL_UI_PANES_EO_LEGACY_H_ +#define _EFL_UI_PANES_EO_LEGACY_H_ + +#ifndef _EFL_UI_PANES_EO_CLASS_TYPE +#define _EFL_UI_PANES_EO_CLASS_TYPE + +typedef Eo Efl_Ui_Panes; + +#endif + +#ifndef _EFL_UI_PANES_EO_TYPES +#define _EFL_UI_PANES_EO_TYPES + + +#endif + + + +/** + * @brief Set whether the left and right panes can be resized by user + * interaction. + * + * By default panes' contents are resizable by user interaction. + * + * @param[in] obj The object. + * @param[in] fixed Use @c true to fix the left and right panes sizes and make + * them not to be resized by user interaction. Use @c false to make them + * resizable. + * + * @ingroup Elm_Panes_Group + */ +EAPI void elm_panes_fixed_set(Efl_Ui_Panes *obj, Eina_Bool fixed); + +/** + * @brief Set whether the left and right panes can be resized by user + * interaction. + * + * By default panes' contents are resizable by user interaction. + * + * @param[in] obj The object. + * + * @return Use @c true to fix the left and right panes sizes and make them not + * to be resized by user interaction. Use @c false to make them resizable. + * + * @ingroup Elm_Panes_Group + */ +EAPI Eina_Bool elm_panes_fixed_get(const Efl_Ui_Panes *obj); + +#endif diff --git a/src/lib/elementary/efl_ui_panes_legacy.eo b/src/lib/elementary/efl_ui_panes_legacy.eo deleted file mode 100644 index 6c8355e0b9..0000000000 --- a/src/lib/elementary/efl_ui_panes_legacy.eo +++ /dev/null @@ -1,9 +0,0 @@ -class @beta Efl.Ui.Panes_Legacy extends Efl.Ui.Panes implements Efl.Ui.Legacy -{ - [[Elementary panes class]] - data: null; - implements { - class.constructor; - Efl.Object.constructor; - } -} diff --git a/src/lib/elementary/efl_ui_panes_legacy_eo.c b/src/lib/elementary/efl_ui_panes_legacy_eo.c new file mode 100644 index 0000000000..ba95585085 --- /dev/null +++ b/src/lib/elementary/efl_ui_panes_legacy_eo.c @@ -0,0 +1,35 @@ + +Efl_Object *_efl_ui_panes_legacy_efl_object_constructor(Eo *obj, void *pd); + + +static Eina_Bool +_efl_ui_panes_legacy_class_initializer(Efl_Class *klass) +{ + const Efl_Object_Ops *opsp = NULL; + + const Efl_Object_Property_Reflection_Ops *ropsp = NULL; + +#ifndef EFL_UI_PANES_LEGACY_EXTRA_OPS +#define EFL_UI_PANES_LEGACY_EXTRA_OPS +#endif + + EFL_OPS_DEFINE(ops, + EFL_OBJECT_OP_FUNC(efl_constructor, _efl_ui_panes_legacy_efl_object_constructor), + EFL_UI_PANES_LEGACY_EXTRA_OPS + ); + opsp = &ops; + + return efl_class_functions_set(klass, opsp, ropsp); +} + +static const Efl_Class_Description _efl_ui_panes_legacy_class_desc = { + EO_VERSION, + "Efl.Ui.Panes_Legacy", + EFL_CLASS_TYPE_REGULAR, + 0, + _efl_ui_panes_legacy_class_initializer, + _efl_ui_panes_legacy_class_constructor, + NULL +}; + +EFL_DEFINE_CLASS(efl_ui_panes_legacy_class_get, &_efl_ui_panes_legacy_class_desc, EFL_UI_PANES_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); diff --git a/src/lib/elementary/efl_ui_panes_legacy_eo.h b/src/lib/elementary/efl_ui_panes_legacy_eo.h new file mode 100644 index 0000000000..692578c8ca --- /dev/null +++ b/src/lib/elementary/efl_ui_panes_legacy_eo.h @@ -0,0 +1,26 @@ +#ifndef _EFL_UI_PANES_LEGACY_EO_H_ +#define _EFL_UI_PANES_LEGACY_EO_H_ + +#ifndef _EFL_UI_PANES_LEGACY_EO_CLASS_TYPE +#define _EFL_UI_PANES_LEGACY_EO_CLASS_TYPE + +typedef Eo Efl_Ui_Panes_Legacy; + +#endif + +#ifndef _EFL_UI_PANES_LEGACY_EO_TYPES +#define _EFL_UI_PANES_LEGACY_EO_TYPES + + +#endif +#ifdef EFL_BETA_API_SUPPORT +/** Elementary panes class + * + * @ingroup Efl_Ui_Panes_Legacy + */ +#define EFL_UI_PANES_LEGACY_CLASS efl_ui_panes_legacy_class_get() + +EWAPI const Efl_Class *efl_ui_panes_legacy_class_get(void); +#endif /* EFL_BETA_API_SUPPORT */ + +#endif diff --git a/src/lib/elementary/efl_ui_panes_legacy_eo.legacy.h b/src/lib/elementary/efl_ui_panes_legacy_eo.legacy.h new file mode 100644 index 0000000000..ba2c1331a3 --- /dev/null +++ b/src/lib/elementary/efl_ui_panes_legacy_eo.legacy.h @@ -0,0 +1,17 @@ +#ifndef _EFL_UI_PANES_LEGACY_EO_LEGACY_H_ +#define _EFL_UI_PANES_LEGACY_EO_LEGACY_H_ + +#ifndef _EFL_UI_PANES_LEGACY_EO_CLASS_TYPE +#define _EFL_UI_PANES_LEGACY_EO_CLASS_TYPE + +typedef Eo Efl_Ui_Panes_Legacy; + +#endif + +#ifndef _EFL_UI_PANES_LEGACY_EO_TYPES +#define _EFL_UI_PANES_LEGACY_EO_TYPES + + +#endif + +#endif diff --git a/src/lib/elementary/elm_panes_legacy.h b/src/lib/elementary/elm_panes_legacy.h index b33bbf0361..71b9d7e778 100644 --- a/src/lib/elementary/elm_panes_legacy.h +++ b/src/lib/elementary/elm_panes_legacy.h @@ -220,4 +220,4 @@ EAPI void elm_panes_content_right_min_relative_size_set(Evas_Object *obj, double */ EAPI double elm_panes_content_right_min_relative_size_get(const Evas_Object *obj); -#include "efl_ui_panes.eo.legacy.h" +#include "efl_ui_panes_eo.legacy.h" diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index 722b2817ae..6e852afd42 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -1,7 +1,6 @@ pub_legacy_eo_files = [ 'efl_ui_radio_legacy.eo', 'efl_ui_video_legacy.eo', - 'efl_ui_panes_legacy.eo', 'efl_ui_win_legacy.eo', 'efl_ui_progressbar_legacy.eo', 'efl_ui_clock_legacy.eo', @@ -709,6 +708,9 @@ elementary_pub_headers = [ 'efl_ui_image_zoomable_legacy_eo.legacy.h', 'efl_ui_layout_legacy_eo.h', 'efl_ui_layout_legacy_eo.legacy.h', + 'efl_ui_panes_eo.legacy.h', + 'efl_ui_panes_legacy_eo.h', + 'efl_ui_panes_legacy_eo.legacy.h', 'elm_hoversel_eo.h', 'elm_hoversel_eo.legacy.h', 'elm_hoversel_item_eo.h',