summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/bin/elementary/test_bg.c18
-rw-r--r--src/bin/elementary/test_efl_gfx_mapping.c2
-rw-r--r--src/bin/elementary/test_evas_map.c2
-rw-r--r--src/bin/elementary/test_image.c20
-rw-r--r--src/bin/elementary/test_part_bg.c6
-rw-r--r--src/bin/elementary/test_ui_image.c20
-rw-r--r--src/examples/elementary/bg_cxx_example_02.cc2
-rw-r--r--src/examples/elementary/efl_ui_list_example_1.c4
-rw-r--r--src/examples/elementary/icon_cxx_example_01.cc2
-rw-r--r--src/lib/efl/interfaces/efl_gfx_image.eo7
-rw-r--r--src/lib/elementary/efl_ui_bg.c42
-rw-r--r--src/lib/elementary/efl_ui_bg.eo2
-rw-r--r--src/lib/elementary/efl_ui_image.c34
-rw-r--r--src/lib/elementary/efl_ui_image.eo2
-rw-r--r--src/lib/elementary/efl_ui_widget.c10
-rw-r--r--src/lib/elementary/efl_ui_widget_image.h2
-rw-r--r--src/lib/elementary/efl_ui_widget_part_bg.eo2
-rw-r--r--src/lib/elementary/efl_ui_win.c2
18 files changed, 90 insertions, 89 deletions
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c
index 45afcac021..29fdeec7c3 100644
--- a/src/bin/elementary/test_bg.c
+++ b/src/bin/elementary/test_bg.c
@@ -318,7 +318,7 @@ _image_cb(void *data, const Efl_Event *ev)
{
efl_file_simple_get(ev->object, &f, &k);
o = efl_add(EFL_UI_IMAGE_CLASS, win,
- efl_gfx_image_scale_type_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_EXPAND),
+ efl_gfx_image_scale_method_set(efl_added, EFL_GFX_IMAGE_SCALE_METHOD_EXPAND),
efl_file_set(efl_added, f),
efl_file_key_set(efl_added, k)
);
@@ -380,7 +380,7 @@ _cb_radio_changed_scale_type(void *data, const Efl_Event *ev)
int v = efl_ui_radio_group_selected_value_get(bx);
if (v == -1) v = 0;
- efl_gfx_image_scale_type_set(o_bg, v);
+ efl_gfx_image_scale_method_set(o_bg, v);
}
static void
@@ -437,48 +437,48 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_pack(box, efl_added));
rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
- efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_FILL);
+ efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_METHOD_FILL);
efl_text_set(rd, "Fill");
efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
efl_pack(hbox, rd);
rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
- efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_FIT);
+ efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_METHOD_FIT);
efl_text_set(rd, "Fit");
efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
efl_pack(hbox, rd);
rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
- efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_FIT_WIDTH);
+ efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_METHOD_FIT_WIDTH);
efl_text_set(rd, "Fit Horizontally");
efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
efl_pack(hbox, rd);
rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
- efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_FIT_HEIGHT);
+ efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_METHOD_FIT_HEIGHT);
efl_text_set(rd, "Fit Verically");
efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
efl_pack(hbox, rd);
rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
- efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_EXPAND);
+ efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_METHOD_EXPAND);
efl_text_set(rd, "Expand");
efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
efl_pack(hbox, rd);
rd = efl_add(EFL_UI_RADIO_CLASS, hbox);
- efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_TYPE_TILE);
+ efl_ui_radio_state_value_set(rd, EFL_GFX_IMAGE_SCALE_METHOD_TILE);
efl_text_set(rd, "Tile");
efl_gfx_hint_weight_set(rd, EFL_GFX_HINT_EXPAND, 0.0);
efl_event_callback_add(rd, EFL_UI_EVENT_SELECTED_CHANGED, _cb_radio_changed_scale_type, o_bg);
efl_pack(hbox, rd);
- efl_ui_radio_group_selected_value_set(hbox, EFL_GFX_IMAGE_SCALE_TYPE_FILL);
+ efl_ui_radio_group_selected_value_set(hbox, EFL_GFX_IMAGE_SCALE_METHOD_FILL);
c = efl_add(EFL_UI_CHECK_CLASS, box);
efl_text_set(c, "Bg Color");
diff --git a/src/bin/elementary/test_efl_gfx_mapping.c b/src/bin/elementary/test_efl_gfx_mapping.c
index c4080c1b94..fecfc456d9 100644
--- a/src/bin/elementary/test_efl_gfx_mapping.c
+++ b/src/bin/elementary/test_efl_gfx_mapping.c
@@ -55,7 +55,7 @@ test_efl_gfx_mapping(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
img = efl_add(EFL_UI_IMAGE_CLASS, win,
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
efl_file_set(efl_added, buf));
- efl_gfx_image_scale_type_set(img, EFL_GFX_IMAGE_SCALE_TYPE_FILL);
+ efl_gfx_image_scale_method_set(img, EFL_GFX_IMAGE_SCALE_METHOD_FILL);
evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE,
_image_resize_cb, NULL);
diff --git a/src/bin/elementary/test_evas_map.c b/src/bin/elementary/test_evas_map.c
index 3cabe96061..0687a33fc6 100644
--- a/src/bin/elementary/test_evas_map.c
+++ b/src/bin/elementary/test_evas_map.c
@@ -64,7 +64,7 @@ test_evas_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
efl_file_set(efl_added, buf),
efl_file_load(efl_added));
- efl_gfx_image_scale_type_set(img, EFL_GFX_IMAGE_SCALE_TYPE_FILL);
+ efl_gfx_image_scale_method_set(img, EFL_GFX_IMAGE_SCALE_METHOD_FILL);
evas_object_event_callback_add(img, EVAS_CALLBACK_RESIZE,
_image_resize_cb, NULL);
diff --git a/src/bin/elementary/test_image.c b/src/bin/elementary/test_image.c
index cbc127e3ea..38304cc6e4 100644
--- a/src/bin/elementary/test_image.c
+++ b/src/bin/elementary/test_image.c
@@ -100,16 +100,16 @@ im_align_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUS
}
static const struct {
- Efl_Gfx_Image_Scale_Type scale_type;
+ Efl_Gfx_Image_Scale_Method scale_type;
const char *name;
} images_scale_type[] = {
- { EFL_GFX_IMAGE_SCALE_TYPE_NONE, "None" },
- { EFL_GFX_IMAGE_SCALE_TYPE_FILL, "Fill" },
- { EFL_GFX_IMAGE_SCALE_TYPE_FIT, "Fit" },
- { EFL_GFX_IMAGE_SCALE_TYPE_FIT_WIDTH, "Fit Horizontally" },
- { EFL_GFX_IMAGE_SCALE_TYPE_FIT_HEIGHT, "Fit Vertically" },
- { EFL_GFX_IMAGE_SCALE_TYPE_EXPAND, "Expand" },
- { EFL_GFX_IMAGE_SCALE_TYPE_TILE, "Tile" },
+ { EFL_GFX_IMAGE_SCALE_METHOD_NONE, "None" },
+ { EFL_GFX_IMAGE_SCALE_METHOD_FILL, "Fill" },
+ { EFL_GFX_IMAGE_SCALE_METHOD_FIT, "Fit" },
+ { EFL_GFX_IMAGE_SCALE_METHOD_FIT_WIDTH, "Fit Horizontally" },
+ { EFL_GFX_IMAGE_SCALE_METHOD_FIT_HEIGHT, "Fit Vertically" },
+ { EFL_GFX_IMAGE_SCALE_METHOD_EXPAND, "Expand" },
+ { EFL_GFX_IMAGE_SCALE_METHOD_TILE, "Tile" },
{ 0, NULL }
};
@@ -121,9 +121,9 @@ my_im_scale_ch(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_U
Evas_Object *rdg = evas_object_data_get(win, "rdg");
int v = elm_radio_value_get(rdg);
- efl_gfx_image_scale_type_set(im, images_scale_type[v].scale_type);
+ efl_gfx_image_scale_method_set(im, images_scale_type[v].scale_type);
fprintf(stderr, "Set %d[%s] and got %d\n",
- images_scale_type[v].scale_type, images_scale_type[v].name, efl_gfx_image_scale_type_get(im));
+ images_scale_type[v].scale_type, images_scale_type[v].name, efl_gfx_image_scale_method_get(im));
}
void
diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c
index 3f8f30be00..da50aae206 100644
--- a/src/bin/elementary/test_part_bg.c
+++ b/src/bin/elementary/test_part_bg.c
@@ -40,7 +40,7 @@ _scale_type_cb(void *data, const Efl_Event *ev EINA_UNUSED)
{
Efl_Ui_Radio_Group *radio = data;
Evas_Object *target;
- Efl_Gfx_Image_Scale_Type type;
+ Efl_Gfx_Image_Scale_Method type;
char buf[PATH_MAX];
radio = efl_ui_single_selectable_last_selected_get(radio);
@@ -48,9 +48,9 @@ _scale_type_cb(void *data, const Efl_Event *ev EINA_UNUSED)
snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", elm_app_data_dir_get());
efl_file_simple_load(efl_part(target, "background"), buf, NULL);
- type = efl_gfx_image_scale_type_get(efl_part(target, "background"));
+ type = efl_gfx_image_scale_method_get(efl_part(target, "background"));
type = (type + 1) % 6;
- efl_gfx_image_scale_type_set(efl_part(target, "background"), type);
+ efl_gfx_image_scale_method_set(efl_part(target, "background"), type);
}
static Efl_Ui_Radio_Group *
diff --git a/src/bin/elementary/test_ui_image.c b/src/bin/elementary/test_ui_image.c
index 87ad9fbafb..c93fd4ce7e 100644
--- a/src/bin/elementary/test_ui_image.c
+++ b/src/bin/elementary/test_ui_image.c
@@ -107,16 +107,16 @@ im_align_cb(void *data, Eo *obj EINA_UNUSED, void *event_info EINA_UNUSED)
}
static const struct {
- Efl_Gfx_Image_Scale_Type scale_type;
+ Efl_Gfx_Image_Scale_Method scale_type;
const char *name;
} images_scale_type[] = {
- { EFL_GFX_IMAGE_SCALE_TYPE_NONE, "None" },
- { EFL_GFX_IMAGE_SCALE_TYPE_FILL, "Fill" },
- { EFL_GFX_IMAGE_SCALE_TYPE_FIT, "Fit" },
- { EFL_GFX_IMAGE_SCALE_TYPE_FIT_WIDTH, "Fit Horizontally" },
- { EFL_GFX_IMAGE_SCALE_TYPE_FIT_HEIGHT, "Fit Vertically" },
- { EFL_GFX_IMAGE_SCALE_TYPE_EXPAND, "Expand" },
- { EFL_GFX_IMAGE_SCALE_TYPE_TILE, "Tile" },
+ { EFL_GFX_IMAGE_SCALE_METHOD_NONE, "None" },
+ { EFL_GFX_IMAGE_SCALE_METHOD_FILL, "Fill" },
+ { EFL_GFX_IMAGE_SCALE_METHOD_FIT, "Fit" },
+ { EFL_GFX_IMAGE_SCALE_METHOD_FIT_WIDTH, "Fit Horizontally" },
+ { EFL_GFX_IMAGE_SCALE_METHOD_FIT_HEIGHT, "Fit Vertically" },
+ { EFL_GFX_IMAGE_SCALE_METHOD_EXPAND, "Expand" },
+ { EFL_GFX_IMAGE_SCALE_METHOD_TILE, "Tile" },
{ 0, NULL }
};
@@ -128,9 +128,9 @@ my_im_scale_ch(void *data, const Efl_Event *ev EINA_UNUSED)
int v = efl_ui_radio_group_selected_value_get(ev->object);
if (v == -1) v = 0;
- efl_gfx_image_scale_type_set(im, images_scale_type[v].scale_type);
+ efl_gfx_image_scale_method_set(im, images_scale_type[v].scale_type);
fprintf(stderr, "Set %d[%s] and got %d\n",
- images_scale_type[v].scale_type, images_scale_type[v].name, efl_gfx_image_scale_type_get(im));
+ images_scale_type[v].scale_type, images_scale_type[v].name, efl_gfx_image_scale_method_get(im));
}
void
diff --git a/src/examples/elementary/bg_cxx_example_02.cc b/src/examples/elementary/bg_cxx_example_02.cc
index 496981984f..f276fdd7bb 100644
--- a/src/examples/elementary/bg_cxx_example_02.cc
+++ b/src/examples/elementary/bg_cxx_example_02.cc
@@ -33,7 +33,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev)
path = "performance/background.png";
efl::ui::Bg bg(instantiate, win);
- bg.scale_type_set(EFL_GFX_IMAGE_SCALE_TYPE_FILL);
+ bg.scale_method_set(EFL_GFX_IMAGE_SCALE_METHOD_FILL);
bg.file_set(path);
bg.load();
win.content_set(bg);
diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c
index 5cadb29e6b..5a30a8c1c2 100644
--- a/src/examples/elementary/efl_ui_list_example_1.c
+++ b/src/examples/elementary/efl_ui_list_example_1.c
@@ -200,13 +200,13 @@ elm_main(int argc EINA_UNUSED, char **argv)
case 40:
efl_file_simple_load(efl_part(item, "background"), "./sky_01.jpg", NULL);
- efl_gfx_image_scale_type_set(efl_part(item, "background"), EFL_GFX_IMAGE_SCALE_TYPE_EXPAND);
+ efl_gfx_image_scale_method_set(efl_part(item, "background"), EFL_GFX_IMAGE_SCALE_METHOD_EXPAND);
efl_pack_at(list, item, 39);
break;
case 50:
efl_file_simple_load(efl_part(item, "background"), "./sky_01.jpg", NULL);
- efl_gfx_image_scale_type_set(efl_part(item, "background"), EFL_GFX_IMAGE_SCALE_TYPE_TILE);
+ efl_gfx_image_scale_method_set(efl_part(item, "background"), EFL_GFX_IMAGE_SCALE_METHOD_TILE);
efl_pack(list, item);
break;
diff --git a/src/examples/elementary/icon_cxx_example_01.cc b/src/examples/elementary/icon_cxx_example_01.cc
index fd71bedeb5..90271c18ef 100644
--- a/src/examples/elementary/icon_cxx_example_01.cc
+++ b/src/examples/elementary/icon_cxx_example_01.cc
@@ -20,7 +20,7 @@ elm_main (int argc EINA_UNUSED, char **argv EINA_UNUSED)
std::cout << ", name = " << icon.icon_get() << std::endl;
- icon.scale_type_set(EFL_GFX_IMAGE_SCALE_TYPE_NONE);
+ icon.scale_method_set(EFL_GFX_IMAGE_SCALE_METHOD_NONE);
//icon.resizable_set(false, true);
//icon.smooth_set(false);
//icon.fill_outside_set(true);
diff --git a/src/lib/efl/interfaces/efl_gfx_image.eo b/src/lib/efl/interfaces/efl_gfx_image.eo
index c39b4c2bbe..bfaa48e485 100644
--- a/src/lib/efl/interfaces/efl_gfx_image.eo
+++ b/src/lib/efl/interfaces/efl_gfx_image.eo
@@ -18,7 +18,7 @@ enum @beta Efl.Gfx.Image_Scale_Hint
static = 2 [[Image will not be re-scaled over time, thus turning scaling cache ON for its data.]]
}
-enum @beta Efl.Gfx.Image_Scale_Type
+enum @beta Efl.Gfx.Image_Scale_Method
{
[[Enumeration that defines scaling methods to be used when rendering an image.]]
none, [[Use the image's natural size.]]
@@ -82,14 +82,15 @@ interface @beta Efl.Gfx.Image
smooth_scale: bool; [[Whether to use smooth scale or not. The default value is $true.]]
}
}
- @property scale_type {
+ @property scale_method {
[[Determine how the image is scaled at render time.
This allows more granular controls for how an image object should display its internal
buffer. The underlying image data will not be modified.
]]
values {
- scale_type: Efl.Gfx.Image_Scale_Type; [[Image scale type to use. The default value is @Efl.Gfx.Image_Scale_Type.none.]]
+ scale_method: Efl.Gfx.Image_Scale_Method; [[Image scale type to use. The default value is
+ @Efl.Gfx.Image_Scale_Method.none.]]
}
}
@property can_upscale {
diff --git a/src/lib/elementary/efl_ui_bg.c b/src/lib/elementary/efl_ui_bg.c
index acde39f7fd..8759bf4db7 100644
--- a/src/lib/elementary/efl_ui_bg.c
+++ b/src/lib/elementary/efl_ui_bg.c
@@ -44,7 +44,7 @@ _efl_ui_bg_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Data *pd)
efl_content_set(efl_part(obj, "elm.swallow.rectangle"), efl_added));
pd->img = elm_image_add(obj);
- efl_gfx_image_scale_type_set(pd->img, EFL_GFX_IMAGE_SCALE_TYPE_EXPAND);
+ efl_gfx_image_scale_method_set(pd->img, EFL_GFX_IMAGE_SCALE_METHOD_EXPAND);
elm_layout_content_set(obj, "elm.swallow.background", pd->img);
}
else
@@ -54,7 +54,7 @@ _efl_ui_bg_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Data *pd)
efl_content_set(efl_part(obj, "efl.rectangle"), efl_added));
pd->img = efl_add(EFL_UI_IMAGE_CLASS, obj,
- efl_gfx_image_scale_type_set(efl_added, EFL_GFX_IMAGE_SCALE_TYPE_EXPAND),
+ efl_gfx_image_scale_method_set(efl_added, EFL_GFX_IMAGE_SCALE_METHOD_EXPAND),
efl_content_set(efl_part(obj, "efl.background"), efl_added));
}
pd->file = NULL;
@@ -79,51 +79,51 @@ _efl_ui_bg_efl_object_destructor(Eo *obj, Efl_Ui_Bg_Data *sd)
EAPI void
elm_bg_option_set(Evas_Object *obj, Elm_Bg_Option option)
{
- Efl_Gfx_Image_Scale_Type type;
+ Efl_Gfx_Image_Scale_Method type;
switch (option)
{
case ELM_BG_OPTION_CENTER:
- type = EFL_GFX_IMAGE_SCALE_TYPE_NONE;
+ type = EFL_GFX_IMAGE_SCALE_METHOD_NONE;
break;
case ELM_BG_OPTION_SCALE:
- type = EFL_GFX_IMAGE_SCALE_TYPE_EXPAND;
+ type = EFL_GFX_IMAGE_SCALE_METHOD_EXPAND;
break;
case ELM_BG_OPTION_TILE:
- type = EFL_GFX_IMAGE_SCALE_TYPE_TILE;
+ type = EFL_GFX_IMAGE_SCALE_METHOD_TILE;
break;
case ELM_BG_OPTION_STRETCH:
- type = EFL_GFX_IMAGE_SCALE_TYPE_FILL;
+ type = EFL_GFX_IMAGE_SCALE_METHOD_FILL;
break;
case ELM_BG_OPTION_LAST:
default:
- type = EFL_GFX_IMAGE_SCALE_TYPE_EXPAND;
+ type = EFL_GFX_IMAGE_SCALE_METHOD_EXPAND;
}
- efl_gfx_image_scale_type_set(obj, type);
+ efl_gfx_image_scale_method_set(obj, type);
}
EAPI Elm_Bg_Option
elm_bg_option_get(const Evas_Object *obj)
{
- Efl_Gfx_Image_Scale_Type type;
+ Efl_Gfx_Image_Scale_Method type;
Elm_Bg_Option option = ELM_BG_OPTION_LAST;
- type = efl_gfx_image_scale_type_get(obj);
+ type = efl_gfx_image_scale_method_get(obj);
switch (type)
{
- case EFL_GFX_IMAGE_SCALE_TYPE_NONE:
+ case EFL_GFX_IMAGE_SCALE_METHOD_NONE:
option = ELM_BG_OPTION_CENTER;
break;
- case EFL_GFX_IMAGE_SCALE_TYPE_EXPAND:
+ case EFL_GFX_IMAGE_SCALE_METHOD_EXPAND:
option = ELM_BG_OPTION_SCALE;
break;
- case EFL_GFX_IMAGE_SCALE_TYPE_TILE:
+ case EFL_GFX_IMAGE_SCALE_METHOD_TILE:
option = ELM_BG_OPTION_TILE;
break;
- case EFL_GFX_IMAGE_SCALE_TYPE_FILL:
+ case EFL_GFX_IMAGE_SCALE_METHOD_FILL:
option = ELM_BG_OPTION_STRETCH;
break;
- case EFL_GFX_IMAGE_SCALE_TYPE_FIT:
+ case EFL_GFX_IMAGE_SCALE_METHOD_FIT:
default:
ERR("Scale type %d cannot be converted to Elm_Bg_Option", type);
break;
@@ -133,15 +133,15 @@ elm_bg_option_get(const Evas_Object *obj)
}
EOLIAN static void
-_efl_ui_bg_efl_gfx_image_scale_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd, Efl_Gfx_Image_Scale_Type scale_type)
+_efl_ui_bg_efl_gfx_image_scale_method_set(Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd, Efl_Gfx_Image_Scale_Method scale_type)
{
- efl_gfx_image_scale_type_set(sd->img, scale_type);
+ efl_gfx_image_scale_method_set(sd->img, scale_type);
}
-EOLIAN static Efl_Gfx_Image_Scale_Type
-_efl_ui_bg_efl_gfx_image_scale_type_get(const Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd)
+EOLIAN static Efl_Gfx_Image_Scale_Method
+_efl_ui_bg_efl_gfx_image_scale_method_get(const Eo *obj EINA_UNUSED, Efl_Ui_Bg_Data *sd)
{
- return efl_gfx_image_scale_type_get(sd->img);
+ return efl_gfx_image_scale_method_get(sd->img);
}
EAPI void
diff --git a/src/lib/elementary/efl_ui_bg.eo b/src/lib/elementary/efl_ui_bg.eo
index f4552e341f..5de72abd37 100644
--- a/src/lib/elementary/efl_ui_bg.eo
+++ b/src/lib/elementary/efl_ui_bg.eo
@@ -16,7 +16,7 @@ class @beta Efl.Ui.Bg extends Efl.Ui.Layout_Base
Efl.File.key { get; set; }
Efl.File.mmap { get; set; }
Efl.Gfx.Color.color { get; set; }
- Efl.Gfx.Image.scale_type { get; set; }
+ Efl.Gfx.Image.scale_method { get; set; }
Efl.Gfx.Image_Load_Controller.load_size { get; set; }
}
}
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index 8fd829b867..a5d683c42f 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -204,15 +204,15 @@ _image_sizing_eval(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *img)
// according to (iw x ih), (ow x oh), and scale_type
switch (sd->scale_type)
{
- case EFL_GFX_IMAGE_SCALE_TYPE_NONE:
+ case EFL_GFX_IMAGE_SCALE_METHOD_NONE:
w = iw;
h = ih;
break;
- case EFL_GFX_IMAGE_SCALE_TYPE_FILL:
+ case EFL_GFX_IMAGE_SCALE_METHOD_FILL:
w = ow;
h = oh;
break;
- case EFL_GFX_IMAGE_SCALE_TYPE_FIT:
+ case EFL_GFX_IMAGE_SCALE_METHOD_FIT:
w = ow;
h = ((double)ih * w) / (double)iw;
@@ -224,17 +224,17 @@ _image_sizing_eval(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *img)
break;
- case EFL_GFX_IMAGE_SCALE_TYPE_FIT_WIDTH:
+ case EFL_GFX_IMAGE_SCALE_METHOD_FIT_WIDTH:
w = ow;
h = ((double)ih * w) / (double)iw;
break;
- case EFL_GFX_IMAGE_SCALE_TYPE_FIT_HEIGHT:
+ case EFL_GFX_IMAGE_SCALE_METHOD_FIT_HEIGHT:
h = oh;
w = ((double)iw * h) / (double)ih;
break;
- case EFL_GFX_IMAGE_SCALE_TYPE_EXPAND:
+ case EFL_GFX_IMAGE_SCALE_METHOD_EXPAND:
if (ow > oh)
{
w = ow;
@@ -246,7 +246,7 @@ _image_sizing_eval(Eo *obj, Efl_Ui_Image_Data *sd, Evas_Object *img)
w = ((double)iw * h) / (double)ih;
}
break;
- case EFL_GFX_IMAGE_SCALE_TYPE_TILE:
+ case EFL_GFX_IMAGE_SCALE_METHOD_TILE:
evas_object_geometry_get(obj, &x, &y, &w, &h);
evas_object_image_fill_set(img, x, y, iw, ih);
goto done;
@@ -869,7 +869,7 @@ _efl_ui_image_efl_object_constructor(Eo *obj, Efl_Ui_Image_Data *pd)
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE);
- pd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FIT;
+ pd->scale_type = EFL_GFX_IMAGE_SCALE_METHOD_FIT;
pd->self = obj;
return obj;
@@ -1579,7 +1579,7 @@ _efl_ui_image_efl_player_play_get(const Eo *obj, Efl_Ui_Image_Data *sd)
}
EOLIAN static void
-_efl_ui_image_efl_gfx_image_scale_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd EINA_UNUSED, Efl_Gfx_Image_Scale_Type scale_type)
+_efl_ui_image_efl_gfx_image_scale_method_set(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd EINA_UNUSED, Efl_Gfx_Image_Scale_Method scale_type)
{
if (scale_type == sd->scale_type) return;
@@ -1588,8 +1588,8 @@ _efl_ui_image_efl_gfx_image_scale_type_set(Eo *obj EINA_UNUSED, Efl_Ui_Image_Dat
efl_canvas_group_change(obj);
}
-EOLIAN static Efl_Gfx_Image_Scale_Type
-_efl_ui_image_efl_gfx_image_scale_type_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
+EOLIAN static Efl_Gfx_Image_Scale_Method
+_efl_ui_image_efl_gfx_image_scale_method_get(const Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd)
{
return sd->scale_type;
}
@@ -2101,11 +2101,11 @@ elm_image_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside)
if (sd->aspect_fixed)
{
- if (sd->fill_inside) sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FIT;
- else sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_EXPAND;
+ if (sd->fill_inside) sd->scale_type = EFL_GFX_IMAGE_SCALE_METHOD_FIT;
+ else sd->scale_type = EFL_GFX_IMAGE_SCALE_METHOD_EXPAND;
}
else
- sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FILL;
+ sd->scale_type = EFL_GFX_IMAGE_SCALE_METHOD_FILL;
efl_canvas_group_change(obj);
}
@@ -2246,11 +2246,11 @@ elm_image_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed)
if (sd->aspect_fixed)
{
- if (sd->fill_inside) sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FIT;
- else sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_EXPAND;
+ if (sd->fill_inside) sd->scale_type = EFL_GFX_IMAGE_SCALE_METHOD_FIT;
+ else sd->scale_type = EFL_GFX_IMAGE_SCALE_METHOD_EXPAND;
}
else
- sd->scale_type = EFL_GFX_IMAGE_SCALE_TYPE_FILL;
+ sd->scale_type = EFL_GFX_IMAGE_SCALE_METHOD_FILL;
efl_canvas_group_change(obj);
}
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 3abf738524..876d817858 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -78,7 +78,7 @@ class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Input.Clickable, E
Efl.Gfx.Image.image_size { get; }
Efl.Gfx.Image_Load_Controller.load_size { get; set; }
Efl.Gfx.Image.smooth_scale { get; set; }
- Efl.Gfx.Image.scale_type { get; set; }
+ Efl.Gfx.Image.scale_method { get; set; }
Efl.Gfx.Image_Orientable.image_orientation { get; set; }
Efl.Player.playable { get; }
Efl.Player.play { get; set; }
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 9dc21e340d..88eae6ef78 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -5760,19 +5760,19 @@ _efl_ui_widget_part_bg_efl_gfx_color_color_get(const Eo *obj, void *pd EINA_UNUS
}
EOLIAN static void
-_efl_ui_widget_part_bg_efl_gfx_image_scale_type_set(Eo *obj, void *pd EINA_UNUSED, Efl_Gfx_Image_Scale_Type scale_type)
+_efl_ui_widget_part_bg_efl_gfx_image_scale_method_set(Eo *obj, void *pd EINA_UNUSED, Efl_Gfx_Image_Scale_Method scale_type)
{
Evas_Object *bg_obj = efl_ui_widget_part_bg_get(obj);
- efl_gfx_image_scale_type_set(bg_obj, scale_type);
+ efl_gfx_image_scale_method_set(bg_obj, scale_type);
}
-EOLIAN static Efl_Gfx_Image_Scale_Type
-_efl_ui_widget_part_bg_efl_gfx_image_scale_type_get(const Eo *obj, void *pd EINA_UNUSED)
+EOLIAN static Efl_Gfx_Image_Scale_Method
+_efl_ui_widget_part_bg_efl_gfx_image_scale_method_get(const Eo *obj, void *pd EINA_UNUSED)
{
Evas_Object *bg_obj = efl_ui_widget_part_bg_get(obj);
- return efl_gfx_image_scale_type_get(bg_obj);
+ return efl_gfx_image_scale_method_get(bg_obj);
}
typedef struct _Efl_Ui_Property_Bound Efl_Ui_Property_Bound;
diff --git a/src/lib/elementary/efl_ui_widget_image.h b/src/lib/elementary/efl_ui_widget_image.h
index aafb8bd81f..7c775f0868 100644
--- a/src/lib/elementary/efl_ui_widget_image.h
+++ b/src/lib/elementary/efl_ui_widget_image.h
@@ -72,7 +72,7 @@ struct _Efl_Ui_Image_Data
} async;
Efl_Ui_Image_Preload_Status preload_status;
- Efl_Gfx_Image_Scale_Type scale_type;
+ Efl_Gfx_Image_Scale_Method scale_type;
const char *stdicon;
diff --git a/src/lib/elementary/efl_ui_widget_part_bg.eo b/src/lib/elementary/efl_ui_widget_part_bg.eo
index 3ed5d543a0..722cfb1748 100644
--- a/src/lib/elementary/efl_ui_widget_part_bg.eo
+++ b/src/lib/elementary/efl_ui_widget_part_bg.eo
@@ -9,6 +9,6 @@ class @beta Efl.Ui.Widget_Part_Bg extends Efl.Ui.Widget_Part implements Efl.File
Efl.File.load;
Efl.File.unload;
Efl.Gfx.Color.color { set; get; }
- Efl.Gfx.Image.scale_type { get; set; }
+ Efl.Gfx.Image.scale_method { get; set; }
}
}
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 58af84b281..4e49447ad1 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -7736,7 +7736,7 @@ _efl_ui_win_part_file_load(Eo *obj, Efl_Ui_Win_Data *sd, Eo *part_obj, const cha
if (file)
{
bg = efl_add(EFL_UI_IMAGE_CLASS, obj);
- efl_gfx_image_scale_type_set(bg, EFL_GFX_IMAGE_SCALE_TYPE_EXPAND);
+ efl_gfx_image_scale_method_set(bg, EFL_GFX_IMAGE_SCALE_METHOD_EXPAND);
ok = efl_file_simple_load(bg, file, key);
if (!ok) ELM_SAFE_DEL(bg);
_elm_win_bg_set(sd, bg);
View Lorry Controller Status