kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm: Rename slider part to part_indicator 

This is specific to the indicator.

Fixes T6376
Fixes T5361
This commit is contained in:
Jean-Philippe Andre 2017-12-12 11:11:19 +09:00
parent 26272bf3a2
commit 0de20aeafa
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile_Elementary.am
View File

@ -70,7 +70,7 @@ elm_public_eolian_files = \
lib/elementary/efl_ui_multibuttonentry_part.eo \
lib/elementary/efl_ui_panes_part.eo \
lib/elementary/efl_ui_progressbar_part.eo \
lib/elementary/efl_ui_slider_part.eo \
lib/elementary/efl_ui_slider_part_indicator.eo \
lib/elementary/efl_ui_textpath_part.eo \
lib/elementary/efl_ui_widget_part.eo \
lib/elementary/efl_ui_widget_part_bg.eo \

6
src/bin/elementary/test_ui_slider_interval.c
View File

@ -42,7 +42,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
efl_text_set(efl_added, "Horizontal"),
efl_ui_slider_part_visible_mode_set(efl_part(efl_added, "indicator"),
efl_ui_slider_part_indicator_visible_mode_set(efl_part(efl_added, "indicator"),
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_NONE),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(160, 0)),
efl_ui_format_string_set(efl_part(efl_added, "indicator"), "%1.5f"),
@ -98,7 +98,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, hbx,
efl_text_set(efl_added, "Always Show Indicator:"),
efl_ui_slider_part_visible_mode_set(efl_part(efl_added, "indicator"),
efl_ui_slider_part_indicator_visible_mode_set(efl_part(efl_added, "indicator"),
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(0, 160)),
efl_ui_format_string_set(efl_added, "%1.0f units"),
@ -110,7 +110,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_add(EFL_UI_SLIDER_INTERVAL_CLASS, bx,
efl_text_set(efl_added, "Limited (100-500)"),
efl_ui_slider_part_visible_mode_set(efl_part(efl_added, "indicator"),
efl_ui_slider_part_indicator_visible_mode_set(efl_part(efl_added, "indicator"),
EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS),
efl_gfx_size_hint_min_set(efl_added, EINA_SIZE2D(260, 0)),
efl_ui_format_string_set(efl_added, "%1.0f units"),

22
src/lib/elementary/efl_ui_slider.c
View File

@ -1442,13 +1442,13 @@ _efl_ui_slider_efl_part_part(const Eo *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED,
EINA_SAFETY_ON_NULL_RETURN_VAL(part, NULL);
if (eina_streq(part, "indicator"))
return ELM_PART_IMPLEMENT(EFL_UI_SLIDER_PART_CLASS, obj, part);
return ELM_PART_IMPLEMENT(EFL_UI_SLIDER_PART_INDICATOR_CLASS, obj, part);
return efl_part(efl_super(obj, MY_CLASS), part);
}
EOLIAN static void
_efl_ui_slider_part_efl_ui_format_format_cb_set(Eo *obj, void *_pd EINA_UNUSED, void *func_data, Efl_Ui_Format_Func_Cb func, Eina_Free_Cb func_free_cb)
_efl_ui_slider_part_indicator_efl_ui_format_format_cb_set(Eo *obj, void *_pd EINA_UNUSED, void *func_data, Efl_Ui_Format_Func_Cb func, Eina_Free_Cb func_free_cb)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
@ -1493,7 +1493,7 @@ _indi_default_format_free_cb(void *data)
}
EOLIAN static void
_efl_ui_slider_part_efl_ui_format_format_string_set(Eo *obj, void *_pd EINA_UNUSED, const char *template)
_efl_ui_slider_part_indicator_efl_ui_format_format_string_set(Eo *obj, void *_pd EINA_UNUSED, const char *template)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
@ -1505,7 +1505,7 @@ _efl_ui_slider_part_efl_ui_format_format_string_set(Eo *obj, void *_pd EINA_UNUS
}
EOLIAN static const char *
_efl_ui_slider_part_efl_ui_format_format_string_get(Eo *obj, void *_pd EINA_UNUSED)
_efl_ui_slider_part_indicator_efl_ui_format_format_string_get(Eo *obj, void *_pd EINA_UNUSED)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
@ -1514,7 +1514,7 @@ _efl_ui_slider_part_efl_ui_format_format_string_get(Eo *obj, void *_pd EINA_UNUS
}
EOLIAN static void
_efl_ui_slider_part_visible_mode_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui_Slider_Indicator_Visible_Mode indicator_visible_mode)
_efl_ui_slider_part_indicator_visible_mode_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui_Slider_Indicator_Visible_Mode indicator_visible_mode)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
@ -1527,7 +1527,7 @@ _efl_ui_slider_part_visible_mode_set(Eo *obj, void *_pd EINA_UNUSED, Efl_Ui_Slid
}
EOLIAN static Efl_Ui_Slider_Indicator_Visible_Mode
_efl_ui_slider_part_visible_mode_get(Eo *obj, void *_pd EINA_UNUSED)
_efl_ui_slider_part_indicator_visible_mode_get(Eo *obj, void *_pd EINA_UNUSED)
{
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
Efl_Ui_Slider_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_SLIDER_CLASS);
@ -1536,7 +1536,7 @@ _efl_ui_slider_part_visible_mode_get(Eo *obj, void *_pd EINA_UNUSED)
return sd->indicator_visible_mode;
}
#include "efl_ui_slider_part.eo.c"
#include "efl_ui_slider_part_indicator.eo.c"
/* Efl.Part end */
@ -1761,7 +1761,7 @@ elm_slider_indicator_format_function_set(Evas_Object *obj, slider_func_type func
EAPI void
elm_slider_indicator_show_on_focus_set(Evas_Object *obj, Eina_Bool flag)
{
efl_ui_slider_part_visible_mode_set(efl_part(obj, "indicator"),
efl_ui_slider_part_indicator_visible_mode_set(efl_part(obj, "indicator"),
flag ? ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS
: ELM_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT);
}
@ -1769,7 +1769,7 @@ elm_slider_indicator_show_on_focus_set(Evas_Object *obj, Eina_Bool flag)
EAPI Eina_Bool
elm_slider_indicator_show_on_focus_get(const Evas_Object *obj)
{
return (efl_ui_slider_part_visible_mode_get(efl_part(obj, "indicator"))
return (efl_ui_slider_part_indicator_visible_mode_get(efl_part(obj, "indicator"))
== EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS);
}
@ -1810,13 +1810,13 @@ elm_slider_indicator_show_get(const Evas_Object *obj)
EAPI void
elm_slider_indicator_visible_mode_set(Evas_Object *obj, Elm_Slider_Indicator_Visible_Mode indicator_visible_mode)
{
efl_ui_slider_part_visible_mode_set(efl_part(obj, "indicator"), indicator_visible_mode);
efl_ui_slider_part_indicator_visible_mode_set(efl_part(obj, "indicator"), indicator_visible_mode);
}
EAPI Elm_Slider_Indicator_Visible_Mode
elm_slider_indicator_visible_mode_get(const Evas_Object *obj)
{
return efl_ui_slider_part_visible_mode_get(efl_part(obj, "indicator"));
return efl_ui_slider_part_indicator_visible_mode_get(efl_part(obj, "indicator"));
}
/* Internal EO APIs and hidden overrides */

3
src/lib/elementary/efl_ui_slider.eo
View File

@ -30,7 +30,8 @@ class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
}
}
parts {
indicator: Efl.Ui.Slider.Part; [[A floating indicator above the slider.]]
indicator: Efl.Ui.Slider.Part_Indicator;
[[A floating indicator above the slider.]]
}
implements {
class.constructor;

4
src/lib/elementary/efl_ui_slider_part.eo → src/lib/elementary/efl_ui_slider_part_indicator.eo
View File

@ -1,6 +1,6 @@
import efl_ui;
class Efl.Ui.Slider.Part (Efl.Ui.Layout.Part, Efl.Ui.Format)
class Efl.Ui.Slider.Part_Indicator (Efl.Ui.Layout.Part, Efl.Ui.Format)
{
[[Elementary slider internal part class]]
data: null;
@ -9,7 +9,7 @@ class Efl.Ui.Slider.Part (Efl.Ui.Layout.Part, Efl.Ui.Format)
[[Set/Get the visible mode of indicator.
]]
values {
indicator_visible_mode: Efl.Ui.Slider.Indicator_Visible_Mode; [[The indicator visible mode.]]
mode: Efl.Ui.Slider.Indicator_Visible_Mode; [[The indicator visible mode.]]
}
}
}

2
src/lib/elementary/elm_slider.h
View File

@ -77,7 +77,7 @@
#include "elm_slider_common.h"
#ifdef EFL_EO_API_SUPPORT
#include "efl_ui_slider_eo.h"
#include "efl_ui_slider_part.eo.h"
#include "efl_ui_slider_part_indicator.eo.h"
#include <efl_ui_slider_interval.eo.h>
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT