summaryrefslogtreecommitdiff
path: root/src/bin/elementary
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2019-09-16 11:06:02 +0200
committerXavi Artigas <xavierartigas@yahoo.es>2019-09-16 11:06:02 +0200
commit944d5f37c7add5772a62d0d976db48b3a2a90982 (patch)
treefb50f8b08247c02c1b0f2f5c0f03e1125ba35233 /src/bin/elementary
parente18d07b2979e5b80ce930fa6f525b9e02f19db01 (diff)
downloadefl-944d5f37c7add5772a62d0d976db48b3a2a90982.tar.gz
efl/image: Efl.Gfx.Image_Scale_Type -> Efl.Gfx.Image_Scale_Method
ref T7927, T7875 Depends on D9931
Diffstat (limited to 'src/bin/elementary')
-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
6 files changed, 34 insertions, 34 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