[EGIT] [core/efl] master 02/02: efl_part: use efl_ui_widget's default_part_get
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=08d86d3941ee7d4f5e89520fb8d29870a903300b commit 08d86d3941ee7d4f5e89520fb8d29870a903300b Author: Sungtaek HongDate: Thu Feb 8 14:53:59 2018 +0900 efl_part: use efl_ui_widget's default_part_get Summary: efl_part macros are using each widget's internally defined default_part_get() functions to get default part name. This might potentially cause errors when future widgets inherits the widget but not overriding Efl.Text.text and Efl.Content.content. Reviewers: jpeg, cedric, woohyun, Jaehyun_Cho Differential Revision: https://phab.enlightenment.org/D5797 --- src/lib/elementary/efl_ui_button.c | 4 +++- src/lib/elementary/efl_ui_frame.c | 1 + src/lib/elementary/efl_ui_popup.c | 3 ++- src/lib/elementary/efl_ui_progressbar.c | 4 +++- src/lib/elementary/efl_ui_radio.c | 7 +- src/lib/elementary/efl_ui_radio.eo | 2 -- src/lib/elementary/efl_ui_slider.c | 4 +++- src/lib/elementary/elc_popup.c | 4 ++-- src/lib/elementary/elm_part_helper.h| 38 - 9 files changed, 34 insertions(+), 33 deletions(-) diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index 7f4f691386..b47fafd1bd 100644 --- a/src/lib/elementary/efl_ui_button.c +++ b/src/lib/elementary/efl_ui_button.c @@ -464,7 +464,9 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(MY_CLASS_PFX) ELM_LAYOUT_CONTENT_ALIASES_OPS(MY_CLASS_PFX), \ ELM_LAYOUT_TEXT_ALIASES_OPS(MY_CLASS_PFX), \ ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_button), \ - EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button) + EFL_CANVAS_GROUP_ADD_OPS(efl_ui_button), \ + ELM_PART_TEXT_DEFAULT_OPS(efl_ui_button), \ + ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_button) #include "efl_ui_button.eo.c" diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c index d7dacda407..e4bb944733 100644 --- a/src/lib/elementary/efl_ui_frame.c +++ b/src/lib/elementary/efl_ui_frame.c @@ -217,6 +217,7 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(efl_ui_frame) #define EFL_UI_FRAME_EXTRA_OPS \ EFL_CANVAS_GROUP_ADD_OPS(efl_ui_frame), \ ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_frame), \ + ELM_PART_TEXT_DEFAULT_OPS(efl_ui_frame), \ ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_frame), \ ELM_LAYOUT_TEXT_ALIASES_OPS(efl_ui_frame) diff --git a/src/lib/elementary/efl_ui_popup.c b/src/lib/elementary/efl_ui_popup.c index ccb815ad5c..e5071daf4a 100644 --- a/src/lib/elementary/efl_ui_popup.c +++ b/src/lib/elementary/efl_ui_popup.c @@ -395,6 +395,7 @@ _efl_ui_popup_part_efl_file_file_set(Eo *obj, void *_pd EINA_UNUSED, const char /* Internal EO APIs and hidden overrides */ #define EFL_UI_POPUP_EXTRA_OPS \ - ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_popup) + ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_popup), \ + ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_popup) #include "efl_ui_popup.eo.c" diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index b9000d6350..4506c5941d 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -737,7 +737,9 @@ ELM_LAYOUT_TEXT_ALIASES_IMPLEMENT(efl_ui_progressbar) ELM_LAYOUT_CONTENT_ALIASES_OPS(efl_ui_progressbar), \ ELM_LAYOUT_TEXT_ALIASES_OPS(efl_ui_progressbar), \ ELM_LAYOUT_SIZING_EVAL_OPS(efl_ui_progressbar), \ - EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar) + EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_progressbar), \ + ELM_PART_TEXT_DEFAULT_OPS(efl_ui_progressbar), \ + ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_progressbar) #include "efl_ui_progressbar.eo.c" diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c index 8a3c537bda..0a49b3c5fc 100644 --- a/src/lib/elementary/efl_ui_radio.c +++ b/src/lib/elementary/efl_ui_radio.c @@ -357,11 +357,6 @@ _efl_ui_radio_efl_access_state_set_get(Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSE return ret; } -/* Part APIs */ - -ELM_PART_CONTENT_DEFAULT_GET(efl_ui_radio, "elm.swallow.content") -ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_radio, Efl_Ui_Radio_Data) - /* Internal EO APIs and hidden overrides */ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_radio, Efl_Ui_Radio_Data) @@ -410,4 +405,4 @@ elm_radio_value_get(const Evas_Object *obj) return efl_ui_nstate_value_get(obj); } -#include "efl_ui_radio_legacy.eo.c" \ No newline at end of file +#include "efl_ui_radio_legacy.eo.c" diff --git a/src/lib/elementary/efl_ui_radio.eo b/src/lib/elementary/efl_ui_radio.eo index f3ec5d60ee..c561eac409 100644 --- a/src/lib/elementary/efl_ui_radio.eo +++ b/src/lib/elementary/efl_ui_radio.eo @@ -66,8 +66,6 @@ class Efl.Ui.Radio (Efl.Ui.Check, Efl.Access.Widget.Action, Efl.Content) Efl.Ui.Widget.widget_event; Efl.Access.state_set { get; } Efl.Access.Widget.Action.elm_actions { get; } - Efl.Content.content {
[EGIT] [core/efl] master 01/02: ector: Updated the ector_buffer_pixels_set() api with stride info
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=48433efc43de9eeaf353e3da18c7109e434902da commit 48433efc43de9eeaf353e3da18c7109e434902da Author: subhransu mohantyDate: Thu Feb 8 14:27:15 2018 +0900 ector: Updated the ector_buffer_pixels_set() api with stride info Reviewers: jypark, jpeg Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D5795 --- src/lib/ector/cairo/ector_cairo_software_surface.c | 4 ++-- src/lib/ector/ector_buffer.eo | 1 + src/lib/ector/software/ector_software_buffer.c | 10 +++--- src/modules/evas/engines/gl_generic/evas_engine.c | 4 ++-- .../evas/engines/software_generic/evas_ector_software_buffer.c | 2 +- src/modules/evas/engines/software_generic/evas_engine.c| 6 +++--- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/lib/ector/cairo/ector_cairo_software_surface.c b/src/lib/ector/cairo/ector_cairo_software_surface.c index 98dd8e0a4f..96bf1c1081 100644 --- a/src/lib/ector/cairo/ector_cairo_software_surface.c +++ b/src/lib/ector/cairo/ector_cairo_software_surface.c @@ -51,7 +51,7 @@ struct _Ector_Cairo_Software_Surface_Data EOLIAN static Eina_Bool _ector_cairo_software_surface_ector_buffer_pixels_set(Eo *obj, Ector_Cairo_Software_Surface_Data *pd, - void *pixels, int width, int height, + void *pixels, int width, int height, int stride, Efl_Gfx_Colorspace cspace, Eina_Bool writable) { cairo_t *ctx = NULL; @@ -72,7 +72,7 @@ _ector_cairo_software_surface_ector_buffer_pixels_set(Eo *obj, Ector_Cairo_Softw cairo_surface_destroy(pd->surface); pd->surface = NULL; - ok = ector_buffer_pixels_set(efl_super(obj, MY_CLASS), pixels, width, height, cspace, writable); + ok = ector_buffer_pixels_set(efl_super(obj, MY_CLASS), pixels, width, height, stride, cspace, writable); if (ok && pixels) { diff --git a/src/lib/ector/ector_buffer.eo b/src/lib/ector/ector_buffer.eo index 143dcbb846..58d5409f37 100644 --- a/src/lib/ector/ector_buffer.eo +++ b/src/lib/ector/ector_buffer.eo @@ -77,6 +77,7 @@ mixin Ector.Buffer @in pixels: void_ptr; [[If $null, allocates an empty buffer]] @in width: int; [[Buffer width]] @in height: int; [[Buffer height]] +@in stride: int; [[Buffer stride (in bytes). If 0 then calculated based on $cspace and $width]] @in cspace: Efl.Gfx.Colorspace; [[Buffer colorspace]] @in writable: bool; [[Buffer is writable]] } diff --git a/src/lib/ector/software/ector_software_buffer.c b/src/lib/ector/software/ector_software_buffer.c index d44962bbec..8afe6c85c4 100644 --- a/src/lib/ector/software/ector_software_buffer.c +++ b/src/lib/ector/software/ector_software_buffer.c @@ -71,10 +71,10 @@ on_fail: EOLIAN static Eina_Bool _ector_software_buffer_base_ector_buffer_pixels_set(Eo *obj, Ector_Software_Buffer_Base_Data *pd, -void *pixels, int width, int height, +void *pixels, int width, int height, int stride, Efl_Gfx_Colorspace cspace, Eina_Bool writable) { - unsigned pxs, stride; + unsigned pxs; if (pd->generic->immutable) fail("This buffer is immutable."); @@ -92,7 +92,11 @@ _ector_software_buffer_base_ector_buffer_pixels_set(Eo *obj, Ector_Software_Buff if (((unsigned long long)(uintptr_t)pixels) & (pxs - 1)) fail ("Pixel data is not aligned to %u bytes!", pxs); - stride = width * pxs; + if (stride == 0) + stride = width * pxs; + else if (stride < (int)(width * pxs)) + fail ("Stride is less than minimum stride: provided %u bytes, minimum %u bytes!", stride, (width * pxs)); + if (pd->pixels.u8 && (pd->pixels.u8 != pixels)) _ector_software_buffer_base_pixels_clear(obj, pd); diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c index b0edce0255..623e96aea4 100644 --- a/src/modules/evas/engines/gl_generic/evas_engine.c +++ b/src/modules/evas/engines/gl_generic/evas_engine.c @@ -2657,7 +2657,7 @@ eng_ector_begin(void *engine, void *output, memset(pixels, 0, stride * h); // it just uses the software backend to draw for now -ector_buffer_pixels_set(ector, pixels, w, h, EFL_GFX_COLORSPACE_ARGB, EINA_TRUE); +ector_buffer_pixels_set(ector, pixels, w, h, stride, EFL_GFX_COLORSPACE_ARGB, EINA_TRUE); ector_surface_reference_point_set(ector, x, y); } else @@ -2681,7 +2681,7 @@ eng_ector_end(void *engine, void *output,
[EGIT] [core/efl] master 01/02: elm: call ecore_app_args_set() after quicklaunch fork
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b7bec2ba9a672aac75da6a4a11a17be82b38fc7a commit b7bec2ba9a672aac75da6a4a11a17be82b38fc7a Author: Mike BlumenkrantzDate: Wed Feb 7 13:30:37 2018 -0500 elm: call ecore_app_args_set() after quicklaunch fork ensure that apps get expected behavior when calling args_get() @fix --- src/lib/elementary/elm_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c index 41e75412c2..bf753d9313 100644 --- a/src/lib/elementary/elm_main.c +++ b/src/lib/elementary/elm_main.c @@ -1130,6 +1130,7 @@ elm_quicklaunch_fork(intargc, perror("could not fork"); return 0; } + ecore_app_args_set(argc, (const char**)argv); if (postfork_func) postfork_func(postfork_data); eina_main_loop_define(); --
[EGIT] [core/efl] master 02/02: elm: remove ecore-x init from quicklaunch post-fork
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=80cc3f230d47bc3f3d049e59adde449694e93b2c commit 80cc3f230d47bc3f3d049e59adde449694e93b2c Author: Mike BlumenkrantzDate: Wed Feb 7 13:32:08 2018 -0500 elm: remove ecore-x init from quicklaunch post-fork this is invalid for basically every possible case. allow components to naturally call this function as needed @fix --- src/lib/elementary/elm_main.c | 33 - 1 file changed, 33 deletions(-) diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c index bf753d9313..f588c1e95e 100644 --- a/src/lib/elementary/elm_main.c +++ b/src/lib/elementary/elm_main.c @@ -1146,39 +1146,6 @@ elm_quicklaunch_fork(intargc, evas_init(); _elm_module_init(); _elm_config_sub_init(); -# ifdef HAVE_ELEMENTARY_X - { - Eina_Bool init_x; - const char *ev = getenv("ELM_DISPLAY"); - Eina_Bool have_display = !!getenv("DISPLAY"); - - if (ev) /* If ELM_DISPLAY is specified */ - { - if (!strcmp(ev, "x11")) /* and it is X11 */ -{ - if (!have_display) /* if there is no $DISPLAY */ - { -ERR("$ELM_DISPLAY is set to x11 but $DISPLAY" -" is not set"); -init_x = EINA_FALSE; - } - else /* if there is */ - init_x = EINA_TRUE; -} - else /* not X11 */ -init_x = EINA_FALSE; - } - else /* ELM_DISPLAY not specified */ - { - if (have_display) /* If there is a $DISPLAY */ -init_x = EINA_TRUE; - else /* No $DISPLAY */ -init_x = EINA_FALSE; - } - if (init_x) - ecore_x_init(NULL); - } -# endif ecore_evas_init(); // FIXME: check errors ecore_imf_init(); #endif --
[EGIT] [core/efl] master 01/01: Evas: remove depth usage in GDI and DirectDraw engines
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d54f0f66cf1faca39816ed9daf7656fb4819d96e commit d54f0f66cf1faca39816ed9daf7656fb4819d96e Author: Vincent TorriDate: Wed Feb 7 22:10:24 2018 +0900 Evas: remove depth usage in GDI and DirectDraw engines Test Plan: compilation and elementary_test Reviewers: raster Reviewed By: raster Subscribers: cedric, raster Differential Revision: https://phab.enlightenment.org/D5792 --- .../ecore_evas/engines/win32/ecore_evas_win32.c| 2 - .../software_ddraw/Evas_Engine_Software_DDraw.h| 1 - .../engines/software_ddraw/evas_ddraw_buffer.c | 17 +-- .../engines/software_ddraw/evas_ddraw_main.cpp | 18 +-- .../evas/engines/software_ddraw/evas_engine.c | 2 - .../evas/engines/software_ddraw/evas_engine.h | 18 +-- .../evas/engines/software_ddraw/evas_outbuf.c | 155 +++ .../software_gdi/Evas_Engine_Software_Gdi.h| 1 - .../evas/engines/software_gdi/evas_engine.c| 13 +- .../evas/engines/software_gdi/evas_engine.h| 11 -- .../evas/engines/software_gdi/evas_gdi_buffer.c| 13 +- .../evas/engines/software_gdi/evas_gdi_main.c | 33 +--- .../evas/engines/software_gdi/evas_outbuf.c| 168 +++-- 13 files changed, 74 insertions(+), 378 deletions(-) diff --git a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c index 46c795b60b..a9e2d7b03e 100644 --- a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c +++ b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c @@ -1334,7 +1334,6 @@ _ecore_evas_engine_software_gdi_init(Ecore_Evas *ee) { /* FIXME: REDRAW_DEBUG missing for now */ einfo->info.window = ((Ecore_Win32_Window *)ee->prop.window)->window; -einfo->info.depth = ecore_win32_screen_depth_get(); einfo->info.rotation = 0; einfo->info.borderless = 0; einfo->info.fullscreen = 0; @@ -1377,7 +1376,6 @@ _ecore_evas_engine_software_ddraw_init(Ecore_Evas *ee) { /* FIXME: REDRAW_DEBUG missing for now */ einfo->info.window = ((Ecore_Win32_Window *)ee->prop.window)->window; -einfo->info.depth = ecore_win32_screen_depth_get(); einfo->info.rotation = 0; if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) { diff --git a/src/modules/evas/engines/software_ddraw/Evas_Engine_Software_DDraw.h b/src/modules/evas/engines/software_ddraw/Evas_Engine_Software_DDraw.h index 9735bb7c8b..bc2b69d291 100644 --- a/src/modules/evas/engines/software_ddraw/Evas_Engine_Software_DDraw.h +++ b/src/modules/evas/engines/software_ddraw/Evas_Engine_Software_DDraw.h @@ -17,7 +17,6 @@ struct _Evas_Engine_Info_Software_DDraw struct { HWND window; - int depth; int rotation; unsigned int fullscreen : 1; } info; diff --git a/src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c b/src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c index 3b94686d68..0886e37bb3 100644 --- a/src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c +++ b/src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c @@ -5,8 +5,7 @@ DD_Output_Buffer * -evas_software_ddraw_output_buffer_new(int depth, - int width, +evas_software_ddraw_output_buffer_new(int width, int height, void *data) { @@ -16,10 +15,9 @@ evas_software_ddraw_output_buffer_new(int depth, if (!ddob) return NULL; ddob->data = data; - ddob->depth = depth; ddob->width = width; ddob->height = height; - ddob->pitch = width * depth / 8; + ddob->pitch = width * 4; ddob->psize = ddob->pitch * height; if (!ddob->data) @@ -48,7 +46,6 @@ evas_software_ddraw_output_buffer_paste(DD_Output_Buffer *ddob, int ddraw_width, int ddraw_height, int ddraw_pitch, -int ddraw_depth, int x, int y) { @@ -69,9 +66,9 @@ evas_software_ddraw_output_buffer_paste(DD_Output_Buffer *ddob, height = ((y + ddob->height) > ddraw_height) ? ddraw_height - y : ddob->height; - pitch = width * ddob->depth / 8; + pitch = width * 4; - dd_data = (DATA8 *)ddraw_data + y * ddraw_pitch + x * ddraw_depth; + dd_data = (DATA8 *)ddraw_data + y * ddraw_pitch + x * 32; evas_data = (unsigned char *)ddob->data; for (j = 0; j < height; j++, evas_data += ddob->pitch, dd_data += ddraw_pitch)
[EGIT] [core/efl] master 01/01: elm_part_helper: Fix to use registered default text part
jaehyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=000d43b29e2cfff039e46c7de676f33dbdeb6949 commit 000d43b29e2cfff039e46c7de676f33dbdeb6949 Author: Jaehyun ChoDate: Wed Feb 7 20:51:04 2018 +0900 elm_part_helper: Fix to use registered default text part --- src/lib/elementary/efl_ui_button.c | 1 + src/lib/elementary/efl_ui_frame.c | 1 + src/lib/elementary/efl_ui_progressbar.c | 1 + src/lib/elementary/efl_ui_slider.c | 1 + src/lib/elementary/elm_part_helper.h| 28 ++-- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index c14d4be44a..7f4f691386 100644 --- a/src/lib/elementary/efl_ui_button.c +++ b/src/lib/elementary/efl_ui_button.c @@ -400,6 +400,7 @@ _efl_ui_button_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl /* Standard widget overrides */ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data) +ELM_PART_TEXT_DEFAULT_GET(efl_ui_button, _text_aliases[0].real_part) ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data) ELM_PART_CONTENT_DEFAULT_GET(efl_ui_button, _content_aliases[0].real_part) ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data) diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c index d4f60eb9c9..d7dacda407 100644 --- a/src/lib/elementary/efl_ui_frame.c +++ b/src/lib/elementary/efl_ui_frame.c @@ -203,6 +203,7 @@ _efl_ui_frame_collapse_get(Eo *obj EINA_UNUSED, Efl_Ui_Frame_Data *sd) /* Default text (title) and content */ +ELM_PART_TEXT_DEFAULT_GET(efl_ui_frame, "elm.text") ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_frame, Efl_Ui_Frame_Data) ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_frame, Efl_Ui_Frame_Data) ELM_PART_CONTENT_DEFAULT_GET(efl_ui_frame, "elm.swallow.content") diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index 2654b1a850..b9000d6350 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -724,6 +724,7 @@ _efl_ui_progressbar_part_efl_ui_range_range_min_max_get(Eo *obj, void *_pd EINA_ /* Efl.Part end */ /* Internal EO APIs and hidden overrides */ +ELM_PART_TEXT_DEFAULT_GET(efl_ui_progressbar, _text_aliases[0].real_part) ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data) ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_progressbar, Efl_Ui_Progressbar_Data) ELM_PART_CONTENT_DEFAULT_GET(efl_ui_progressbar, _content_aliases[0].real_part) diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index ca38c46f31..b4a687f5b5 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -1395,6 +1395,7 @@ _efl_ui_slider_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl /* Standard widget overrides */ +ELM_PART_TEXT_DEFAULT_GET(efl_ui_slider, _text_aliases[0].real_part) ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_slider, Efl_Ui_Slider_Data) ELM_PART_MARKUP_DEFAULT_IMPLEMENT(efl_ui_slider, Efl_Ui_Slider_Data) ELM_PART_CONTENT_DEFAULT_GET(efl_ui_slider, _content_aliases[0].real_part) diff --git a/src/lib/elementary/elm_part_helper.h b/src/lib/elementary/elm_part_helper.h index 29b08a68d6..a77f3db078 100644 --- a/src/lib/elementary/elm_part_helper.h +++ b/src/lib/elementary/elm_part_helper.h @@ -174,38 +174,38 @@ _ ## full ## _efl_text_markup_markup_set(Eo *obj, void *_pd EINA_UNUSED, const c #define ELM_PART_OVERRIDE_MARKUP_GET(type, TYPE, typedata) \ ELM_PART_OVERRIDE_TEXT_MARKUP_GET_FULL(type ## _part, type, TYPE, typedata) -#define ELM_PART_TEXT_DEFAULT_IMPLEMENT(type, Type) \ +#define ELM_PART_TEXT_DEFAULT_IMPLEMENT(type, typedata) \ EOLIAN static void \ -_ ## type ## _efl_text_text_set(Eo *obj, Type *pd EINA_UNUSED, const char *text) \ +_ ## type ## _efl_text_text_set(Eo *obj, typedata *sd, const char *text) \ { \ - efl_text_set(efl_part(efl_super(obj, MY_CLASS), "elm.text"), text); \ + efl_text_set(efl_part(efl_super(obj, MY_CLASS), _ ## type ## _default_text_part_get(obj, sd)), text); \ } \ EOLIAN static const char * \ -_ ## type ## _efl_text_text_get(Eo *obj, Type *pd EINA_UNUSED) \ +_ ## type ## _efl_text_text_get(Eo *obj, typedata *sd) \ { \ - return efl_text_get(efl_part(efl_super(obj, MY_CLASS), "elm.text")); \ + return efl_text_get(efl_part(efl_super(obj, MY_CLASS), _ ## type ## _default_text_part_get(obj, sd))); \ } \ EOLIAN static void \ -_ ## type ## _efl_ui_translatable_translatable_text_set(Eo *obj, Type *pd EINA_UNUSED, const char *label, const char *domain) \ +_ ## type ## _efl_ui_translatable_translatable_text_set(Eo *obj, typedata *sd, const char *label, const char *domain) \ { \ - efl_ui_translatable_text_set(efl_part(efl_super(obj, MY_CLASS), "elm.text"), label, domain); \ +