#include <Elementary.h>
#include "elm_priv.h"
+#include "els_icon.h"
+
+#ifdef _WIN32
+# define FMT_SIZE_T "%Iu"
+#else
+# define FMT_SIZE_T "%zu"
+#endif
typedef struct _Smart_Data Smart_Data;
{
Evas_Coord x, y, w, h;
Evas_Object *obj;
+ Evas_Object *prev;
int size;
double scale;
Eina_Bool fill_inside : 1;
Eina_Bool show : 1;
Eina_Bool edit : 1;
Eina_Bool edje : 1;
+ Eina_Bool aspect_fixed: 1;
Elm_Image_Orient orient;
};
}
static void
-_preloaded(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
+_preloaded(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event __UNUSED__)
{
Smart_Data *sd = data;
sd->preloading = EINA_FALSE;
- if (sd->show)
- evas_object_show(sd->obj);
+ if (obj == sd->obj)
+ {
+ if (sd->show)
+ evas_object_show(sd->obj);
+ }
+ if (sd->prev) evas_object_del(sd->prev);
+ sd->prev = NULL;
}
-Eina_Bool
-_els_smart_icon_file_key_set(Evas_Object *obj, const char *file, const char *key)
+static void
+_els_smart_icon_file_helper(Evas_Object *obj)
{
Smart_Data *sd;
Evas_Object *pclip;
sd = evas_object_smart_data_get(obj);
- if (!sd) return EINA_FALSE;
/* smart code here */
- if (sd->edje)
- {
- pclip = evas_object_clip_get(sd->obj);
- if (sd->obj) evas_object_del(sd->obj);
- sd->obj = evas_object_image_add(evas_object_evas_get(obj));
- evas_object_image_scale_hint_set(sd->obj, EVAS_IMAGE_SCALE_HINT_STATIC);
- evas_object_smart_member_add(sd->obj, obj);
- evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_IMAGE_PRELOADED,
- _preloaded, sd);
- evas_object_clip_set(sd->obj, pclip);
- sd->edje = EINA_FALSE;
- }
+ /* NOTE: Do not merge upstream for the if (sd->edje) { } statements
+ But wonder whether the edje resource icons have no problem. */
+ if (!sd->edje) goto out;
+
+ if (sd->prev) evas_object_del(sd->prev);
+ pclip = evas_object_clip_get(sd->obj);
+ if (sd->obj) sd->prev = sd->obj;
+ sd->obj = evas_object_image_add(evas_object_evas_get(obj));
+ evas_object_image_load_orientation_set(sd->obj, EINA_TRUE);
+ evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_IMAGE_PRELOADED,
+ _preloaded, sd);
+ evas_object_smart_member_add(sd->obj, obj);
+ if (sd->prev) evas_object_smart_member_add(sd->prev, obj);
+ evas_object_image_scale_hint_set(sd->obj, EVAS_IMAGE_SCALE_HINT_STATIC);
+ evas_object_clip_set(sd->obj, pclip);
+
+ sd->edje = EINA_FALSE;
+out:
+
if (!sd->size)
evas_object_image_load_size_set(sd->obj, sd->size, sd->size);
+}
+
+Eina_Bool
+_els_smart_icon_memfile_set(Evas_Object *obj, const void *img, size_t size, const char *format, const char *key)
+{
+ Smart_Data *sd;
+
+ sd = evas_object_smart_data_get(obj);
+ if (!sd) return EINA_FALSE;
+ _els_smart_icon_file_helper(obj);
+
+ evas_object_image_memfile_set(sd->obj, (void*)img, size, (char*)format, (char*)key);
+ sd->preloading = EINA_TRUE;
+ sd->show = EINA_TRUE;
+ evas_object_hide(sd->obj);
+ evas_object_image_preload(sd->obj, EINA_FALSE);
+ if (evas_object_image_load_error_get(sd->obj) != EVAS_LOAD_ERROR_NONE)
+ {
+ ERR("Things are going bad for some random " FMT_SIZE_T " byte chunk of memory (%p)", size, sd->obj);
+ return EINA_FALSE;
+ }
+ _smart_reconfigure(sd);
+ return EINA_TRUE;
+}
+
+Eina_Bool
+_els_smart_icon_file_key_set(Evas_Object *obj, const char *file, const char *key)
+{
+ Smart_Data *sd;
+
+ sd = evas_object_smart_data_get(obj);
+ if (!sd) return EINA_FALSE;
+ _els_smart_icon_file_helper(obj);
+
evas_object_image_file_set(sd->obj, file, key);
- /* by default preload off by seok.j.jeong */
- sd->preloading = EINA_FALSE;
+ // NOTE: Do not merge upstream for sd->preloading.
+ sd->preloading = EINA_FALSE; // by default preload off by seok.j.jeong
sd->show = EINA_TRUE;
+ // NOTE: Do not merge upstream for sd->preloading.
if (sd->preloading)
evas_object_image_preload(sd->obj, EINA_FALSE);
- if (sd->preloading)
+ // NOTE: Do not merge upstream for sd->preloading.
+ if (sd->preloading) // sd->preloading can be changed by above function. so add "if (sd->preloading)" as below
evas_object_hide(sd->obj);
if (evas_object_image_load_error_get(sd->obj) != EVAS_LOAD_ERROR_NONE)
- return EINA_FALSE;
+ {
+ ERR("Things are going bad for '%s' (%p)", file, sd->obj);
+ return EINA_FALSE;
+ }
_smart_reconfigure(sd);
return EINA_TRUE;
}
+void
+_els_smart_icon_preload_set(Evas_Object *obj, Eina_Bool disable)
+{
+ Smart_Data *sd;
+
+ sd = evas_object_smart_data_get(obj);
+ if ((!sd) || sd->edje) return;
+ evas_object_image_preload(sd->obj, disable);
+ sd->preloading = !disable;
+}
+
Eina_Bool
_els_smart_icon_file_edje_set(Evas_Object *obj, const char *file, const char *part)
{
sd = evas_object_smart_data_get(obj);
if (!sd) return EINA_FALSE;
/* smart code here */
+ if (sd->prev) evas_object_del(sd->prev);
+ sd->prev = NULL;
+
if (!sd->edje)
{
pclip = evas_object_clip_get(sd->obj);
{
Smart_Data *sd;
int tw, th;
+ int cw, ch;
+ const char *type;
sd = evas_object_smart_data_get(obj);
if (!sd) return;
-
- const char *type = evas_object_type_get(sd->obj);
- if ((type) && !strcmp(type, "edje"))
+ type = evas_object_type_get(sd->obj);
+ if (!type) return;
+ if (!strcmp(type, "edje"))
edje_object_size_min_get(sd->obj, &tw, &th);
else
evas_object_image_size_get(sd->obj, &tw, &th);
+ evas_object_geometry_get(sd->obj, NULL, NULL, &cw, &ch);
+ tw = tw > cw ? tw : cw;
+ th = th > ch ? th : ch;
tw = ((double)tw) * sd->scale;
th = ((double)th) * sd->scale;
if (w) *w = tw;
_els_smart_icon_orient_set(Evas_Object *obj, Elm_Image_Orient orient)
{
Smart_Data *sd;
- Evas_Object *tmp;
- unsigned int *data, *data2, *to, *from;
+ unsigned int *data, *data2 = NULL, *to, *from;
int x, y, w, hw, iw, ih;
- const char *file, *key;
sd = evas_object_smart_data_get(obj);
if (!sd) return;
return;
case ELM_IMAGE_FLIP_VERTICAL:
_els_smart_icon_flip_vertical(sd);
- return;
+ return;
case ELM_IMAGE_ROTATE_180_CW:
_els_smart_icon_rotate_180(sd);
return;
}
evas_object_image_size_get(sd->obj, &iw, &ih);
- evas_object_image_file_get(sd->obj, &file, &key);
- tmp = evas_object_image_add(evas_object_evas_get(sd->obj));
- evas_object_image_file_set(tmp, file, key);
- data2 = evas_object_image_data_get(tmp, EINA_FALSE);
+ /* we need separate destination memory if we want to rotate 90 or 270 degree */
+ evas_object_image_data_copy_set(sd->obj, data2);
+ if (!data2) return;
w = ih;
ih = iw;
evas_object_image_size_set(sd->obj, iw, ih);
data = evas_object_image_data_get(sd->obj, EINA_TRUE);
+
switch (orient)
{
case ELM_IMAGE_FLIP_TRANSPOSE:
- to = data;
- hw = -hw + 1;
- break;
+ to = data;
+ hw = -hw + 1;
+ break;
case ELM_IMAGE_FLIP_TRANSVERSE:
- to = data + hw - 1;
- w = -w;
- hw = hw - 1;
- break;
+ to = data + hw - 1;
+ w = -w;
+ hw = hw - 1;
+ break;
case ELM_IMAGE_ROTATE_90_CW:
- to = data + w - 1;
- hw = -hw - 1;
- break;
+ to = data + w - 1;
+ hw = -hw - 1;
+ break;
case ELM_IMAGE_ROTATE_90_CCW:
- to = data + hw - w;
- w = -w;
- hw = hw + 1;
- break;
+ to = data + hw - w;
+ w = -w;
+ hw = hw + 1;
+ break;
default:
- ERR("unknown orient %d", orient);
- evas_object_del(tmp);
- evas_object_image_data_set(sd->obj, data); // give it back
- return;
+ ERR("unknown orient %d", orient);
+ evas_object_image_data_set(sd->obj, data); // give it back
+ if (data2) free(data2);
+ return;
}
from = data2;
for (x = iw; --x >= 0;)
to += hw;
}
sd->orient = orient;
- evas_object_del(tmp);
+ if (data2) free(data2);
evas_object_image_data_set(sd->obj, data);
evas_object_image_data_update_add(sd->obj, 0, 0, iw, ih);
_smart_reconfigure(sd);
return sd->obj;
}
+void
+_els_smart_icon_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed)
+{
+ Smart_Data *sd;
+
+ sd = evas_object_smart_data_get(obj);
+ if (!sd) return;
+
+ fixed = !!fixed;
+ if (sd->aspect_fixed == fixed) return;
+ sd->aspect_fixed = fixed;
+ _smart_reconfigure(sd);
+}
+
+Eina_Bool
+_els_smart_icon_aspect_fixed_get(const Evas_Object *obj)
+{
+ Smart_Data *sd;
+
+ sd = evas_object_smart_data_get(obj);
+ if (!sd) return EINA_FALSE;
+ return sd->aspect_fixed;
+}
+
/* local subsystem globals */
static void
_smart_reconfigure(Smart_Data *sd)
{
Evas_Coord x, y, w, h;
+ const char *type;
if (!sd->obj) return;
- const char *type = evas_object_type_get(sd->obj);
- if ((type) && !strcmp(type, "edje"))
+ w = sd->w;
+ h = sd->h;
+
+ type = evas_object_type_get(sd->obj);
+ if (!type) return;
+ if (!strcmp(type, "edje"))
{
- w = sd->w;
- h = sd->h;
- x = sd->x;
- y = sd->y;
- evas_object_move(sd->obj, x, y);
- evas_object_resize(sd->obj, w, h);
+ x = sd->x;
+ y = sd->y;
+ evas_object_move(sd->obj, x, y);
+ evas_object_resize(sd->obj, w, h);
}
else
{
int iw = 0, ih = 0;
+ double alignh = 0.5, alignv = 0.5;
+ Evas_Object *parent;
- evas_object_image_size_get(sd->obj, &iw, &ih);
-
- iw = ((double)iw) * sd->scale;
- ih = ((double)ih) * sd->scale;
-
- if (iw < 1) iw = 1;
- if (ih < 1) ih = 1;
-
- if (sd->fill_inside)
- {
- w = sd->w;
- h = ((double)ih * w) / (double)iw;
- if (h > sd->h)
- {
- h = sd->h;
- w = ((double)iw * h) / (double)ih;
- }
- }
- else
- {
- w = sd->w;
- h = ((double)ih * w) / (double)iw;
- if (h < sd->h)
- {
- h = sd->h;
- w = ((double)iw * h) / (double)ih;
- }
- }
- if (!sd->scale_up)
- {
- if ((w > iw) || (h > ih))
- {
- w = iw;
- h = ih;
- }
- }
- if (!sd->scale_down)
- {
- if ((w < iw) || (h < ih))
- {
- w = iw;
- h = ih;
- }
- }
- x = sd->x + ((sd->w - w) / 2);
- y = sd->y + ((sd->h - h) / 2);
- evas_object_move(sd->obj, x, y);
- evas_object_image_fill_set(sd->obj, 0, 0, w, h);
- evas_object_resize(sd->obj, w, h);
+ evas_object_image_size_get(sd->obj, &iw, &ih);
+
+ iw = ((double)iw) * sd->scale;
+ ih = ((double)ih) * sd->scale;
+
+ if (iw < 1) iw = 1;
+ if (ih < 1) ih = 1;
+
+ if (sd->aspect_fixed)
+ {
+ h = ((double)ih * w) / (double)iw;
+ if (sd->fill_inside)
+ {
+ if (h > sd->h)
+ {
+ h = sd->h;
+ w = ((double)iw * h) / (double)ih;
+ }
+ }
+ else
+ {
+ if (h < sd->h)
+ {
+ h = sd->h;
+ w = ((double)iw * h) / (double)ih;
+ }
+ }
+ }
+ if (!sd->scale_up)
+ {
+ if (w > iw) w = iw;
+ if (h > ih) h = ih;
+ }
+ if (!sd->scale_down)
+ {
+ if (w < iw) w = iw;
+ if (h < ih) h = ih;
+ }
+ parent = elm_widget_parent_widget_get(sd->obj);
+ if (parent)
+ evas_object_size_hint_align_get(parent, &alignh, &alignv);
+ if (alignh == EVAS_HINT_FILL) alignh = 0.5;
+ if (alignv == EVAS_HINT_FILL) alignv = 0.5;
+ x = sd->x + ((sd->w - w) * alignh);
+ y = sd->y + ((sd->h - h) * alignv);
+ evas_object_move(sd->obj, x, y);
+ evas_object_image_fill_set(sd->obj, 0, 0, w, h);
+ evas_object_resize(sd->obj, w, h);
}
}
{
if (_e_smart) return;
{
- static const Evas_Smart_Class sc =
- {
- "e_icon",
- EVAS_SMART_CLASS_VERSION,
- _smart_add,
- _smart_del,
- _smart_move,
- _smart_resize,
- _smart_show,
- _smart_hide,
- _smart_color_set,
- _smart_clip_set,
- _smart_clip_unset,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL
- };
- _e_smart = evas_smart_class_new(&sc);
+ static const Evas_Smart_Class sc =
+ {
+ "e_icon",
+ EVAS_SMART_CLASS_VERSION,
+ _smart_add,
+ _smart_del,
+ _smart_move,
+ _smart_resize,
+ _smart_show,
+ _smart_hide,
+ _smart_color_set,
+ _smart_clip_set,
+ _smart_clip_unset,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL
+ };
+ _e_smart = evas_smart_class_new(&sc);
}
}
sd = calloc(1, sizeof(Smart_Data));
if (!sd) return;
sd->obj = evas_object_image_add(evas_object_evas_get(obj));
+ sd->prev = NULL;
evas_object_image_scale_hint_set(sd->obj, EVAS_IMAGE_SCALE_HINT_STATIC);
sd->x = 0;
sd->y = 0;
sd->fill_inside = EINA_TRUE;
sd->scale_up = EINA_TRUE;
sd->scale_down = EINA_TRUE;
+ sd->aspect_fixed = EINA_TRUE;
sd->size = 64;
sd->scale = 1.0;
evas_object_smart_member_add(sd->obj, obj);
sd = evas_object_smart_data_get(obj);
if (!sd) return;
evas_object_del(sd->obj);
+ if (sd->prev) evas_object_del(sd->prev);
free(sd);
}
if (!sd) return;
sd->show = EINA_TRUE;
if (!sd->preloading)
- evas_object_show(sd->obj);
+ {
+ evas_object_show(sd->obj);
+ if (sd->prev) evas_object_del(sd->prev);
+ sd->prev = NULL;
+ }
}
static void
if (!sd) return;
sd->show = EINA_FALSE;
evas_object_hide(sd->obj);
+ if (sd->prev) evas_object_del(sd->prev);
+ sd->prev = NULL;
}
static void
sd = evas_object_smart_data_get(obj);
if (!sd) return;
evas_object_color_set(sd->obj, r, g, b, a);
+ if (sd->prev) evas_object_color_set(sd->prev, r, g, b, a);
}
static void
sd = evas_object_smart_data_get(obj);
if (!sd) return;
evas_object_clip_set(sd->obj, clip);
+ if (sd->prev) evas_object_clip_set(sd->prev, clip);
}
static void
sd = evas_object_smart_data_get(obj);
if (!sd) return;
evas_object_clip_unset(sd->obj);
+ if (sd->prev) evas_object_clip_unset(sd->prev);
}
static void
return EINA_TRUE;
}
-/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
+/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-3f0^-2{2(0W1st0 :*/
projects / framework / uifw / elementary.git / blobdiff