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

elm_colorselector: "color" -> "picked_color"

This commit is contained in:
Mike Blumenkrantz 2018-02-14 21:14:52 -05:00
parent 26ea82f975
commit b3bc06a5be
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/elementary/elm_colorselector.c
View File

@ -2282,13 +2282,13 @@ _elm_colorselector_efl_object_constructor(Eo *obj, Elm_Colorselector_Data *_pd E
} }
EOLIAN static void EOLIAN static void
_elm_colorselector_color_set(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED, int r, int g, int b, int a) _elm_colorselector_picked_color_set(Eo *obj, Elm_Colorselector_Data *_pd EINA_UNUSED, int r, int g, int b, int a)
{ {
_colors_set(obj, r, g, b, a, EINA_FALSE); _colors_set(obj, r, g, b, a, EINA_FALSE);
} }
EOLIAN static void EOLIAN static void
_elm_colorselector_color_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd, int *r, int *g, int *b, int *a) _elm_colorselector_picked_color_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd, int *r, int *g, int *b, int *a)
{ {
if (r) *r = sd->r; if (r) *r = sd->r;
if (g) *g = sd->g; if (g) *g = sd->g;
@ -2730,4 +2730,3 @@ ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(elm_colorselector, Elm_Colorselector_Data)
#include "elm_colorselector.eo.c" #include "elm_colorselector.eo.c"
#include "elm_color_item.eo.c" #include "elm_color_item.eo.c"

4
src/lib/elementary/elm_colorselector.eo
View File

@ -20,13 +20,15 @@ class Elm.Colorselector (Efl.Ui.Layout, Efl.Ui.Focus.Composition,
eo_prefix: elm_obj_colorselector; eo_prefix: elm_obj_colorselector;
event_prefix: elm_colorselector; event_prefix: elm_colorselector;
methods { methods {
@property color { @property picked_color {
set { set {
[[Set color to colorselector.]] [[Set color to colorselector.]]
legacy: elm_colorselector_color_set;
} }
get { get {
[[Get current color from colorselector.]] [[Get current color from colorselector.]]
legacy: elm_colorselector_color_get;
} }
values { values {
r: int; [[Red value of color]] r: int; [[Red value of color]]