elementary - entry, genlist, gengrid, image, icon, hover, frame, diskselector, index, layout, label, conform, flip, flipselector - removed white spaces
SVN revision: 58252
This commit is contained in:
parent
160084626b
commit
b880342a74
|
@ -102,53 +102,53 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info)
|
|||
* visible when the vkbd comes and goes by moving the conformant obj (and thus
|
||||
* its children) to show the focused widget (and if focus changes follow)
|
||||
|
||||
static Evas_Object *
|
||||
_focus_object_get(const Evas_Object *obj)
|
||||
{
|
||||
static Evas_Object *
|
||||
_focus_object_get(const Evas_Object *obj)
|
||||
{
|
||||
Evas_Object *win, *foc;
|
||||
|
||||
win = elm_widget_top_get(obj);
|
||||
if (!win) return NULL;
|
||||
foc = elm_widget_top_get(win);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_focus_object_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
|
||||
{
|
||||
static void
|
||||
_focus_object_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
|
||||
{
|
||||
evas_object_geometry_get(obj, x, y, w, h);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_focus_change_del(void *data, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
// called from toplevel when the focused window shanges
|
||||
static void
|
||||
_focus_change_del(void *data, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
// called from toplevel when the focused window shanges
|
||||
}
|
||||
|
||||
static void
|
||||
_autoscroll_move(Evas_Object *obj)
|
||||
{
|
||||
// move conformant edje by delta to show focused widget
|
||||
// move conformant edje by delta to show focused widget
|
||||
}
|
||||
|
||||
static void
|
||||
_autoscroll_mode_enable(Evas_Object *obj)
|
||||
{
|
||||
// called when autoscroll mode should be on - content area smaller than
|
||||
// its min size
|
||||
// 1. get focused object
|
||||
// 2. if not in visible conformant area calculate delta needed to
|
||||
// get it in
|
||||
// 3. store delta and call _autoscroll_move() which either asanimates
|
||||
// or jumps right there
|
||||
// called when autoscroll mode should be on - content area smaller than
|
||||
// its min size
|
||||
// 1. get focused object
|
||||
// 2. if not in visible conformant area calculate delta needed to
|
||||
// get it in
|
||||
// 3. store delta and call _autoscroll_move() which either asanimates
|
||||
// or jumps right there
|
||||
}
|
||||
|
||||
static void
|
||||
_autoscroll_mode_disable(Evas_Object *obj)
|
||||
{
|
||||
// called when autoscroll mode should be off - set delta to 0 and
|
||||
// call _autoscroll_move()
|
||||
// called when autoscroll mode should be off - set delta to 0 and
|
||||
// call _autoscroll_move()
|
||||
}
|
||||
*/
|
||||
*/
|
||||
|
||||
static Eina_Bool
|
||||
_prop_change(void *data, int type __UNUSED__, void *event)
|
||||
|
|
|
@ -244,7 +244,7 @@ _module(Evas_Object *obj __UNUSED__)
|
|||
_elm_module_symbol_get(m, "obj_unhook");
|
||||
((Mod_Api *)(m->api) )->obj_longpress = // called on long press menu
|
||||
_elm_module_symbol_get(m, "obj_longpress");
|
||||
ok: // ok - return api
|
||||
ok: // ok - return api
|
||||
return m->api;
|
||||
}
|
||||
|
||||
|
@ -716,8 +716,8 @@ _resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event
|
|||
_sizing_eval(data);
|
||||
}
|
||||
if (wd->hoversel) _hoversel_position(data);
|
||||
// Evas_Coord ww, hh;
|
||||
// evas_object_geometry_get(wd->ent, NULL, NULL, &ww, &hh);
|
||||
// Evas_Coord ww, hh;
|
||||
// evas_object_geometry_get(wd->ent, NULL, NULL, &ww, &hh);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -820,7 +820,7 @@ _copy(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
|||
edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm");
|
||||
elm_widget_scroll_hold_pop(data);
|
||||
_store_selection(ELM_SEL_CLIPBOARD, data);
|
||||
// edje_object_part_text_select_none(wd->ent, "elm.text");
|
||||
// edje_object_part_text_select_none(wd->ent, "elm.text");
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -1380,7 +1380,7 @@ _event_selection_notify(void *data, int type __UNUSED__, void *event)
|
|||
static Eina_Bool
|
||||
_event_selection_clear(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
|
||||
{
|
||||
/*
|
||||
/*
|
||||
Widget_Data *wd = elm_widget_data_get(data);
|
||||
Ecore_X_Event_Selection_Clear *ev = event;
|
||||
if (!wd) return ECORE_CALLBACK_PASS_ON;
|
||||
|
|
|
@ -444,7 +444,7 @@ _signal_val_up(void *data)
|
|||
|
||||
return ECORE_CALLBACK_RENEW;
|
||||
|
||||
val_up_exit_on_error:
|
||||
val_up_exit_on_error:
|
||||
return ECORE_CALLBACK_CANCEL;
|
||||
}
|
||||
|
||||
|
@ -506,7 +506,7 @@ _signal_val_down(void *data)
|
|||
|
||||
return ECORE_CALLBACK_RENEW;
|
||||
|
||||
val_down_exit_on_error:
|
||||
val_down_exit_on_error:
|
||||
return ECORE_CALLBACK_CANCEL;
|
||||
}
|
||||
|
||||
|
|
|
@ -156,12 +156,12 @@
|
|||
* * Handle non-homogeneous objects too.
|
||||
*/
|
||||
|
||||
typedef struct _Widget_Data Widget_Data;
|
||||
typedef struct _Pan Pan;
|
||||
typedef struct _Widget_Data Widget_Data;
|
||||
typedef struct _Pan Pan;
|
||||
|
||||
#define PRELOAD 1
|
||||
|
||||
struct _Elm_Gengrid_Item
|
||||
struct _Elm_Gengrid_Item
|
||||
{
|
||||
Elm_Widget_Item base;
|
||||
EINA_INLIST;
|
||||
|
|
|
@ -749,7 +749,7 @@ _theme_hook(Evas_Object *obj)
|
|||
_mirrored_set(obj, elm_widget_mirrored_get(obj));
|
||||
elm_smart_scroller_object_theme_set(obj, wd->scr, "genlist", "base",
|
||||
elm_widget_style_get(obj));
|
||||
// edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * _elm_config->scale);
|
||||
// edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * _elm_config->scale);
|
||||
wd->item_width = wd->item_height = 0;
|
||||
wd->group_item_width = wd->group_item_height = 0;
|
||||
wd->minw = wd->minh = wd->realminw = 0;
|
||||
|
@ -2143,7 +2143,7 @@ _calc_job(void *data)
|
|||
if (wd->w != ow)
|
||||
{
|
||||
wd->w = ow;
|
||||
// if (wd->height_for_width) changed = EINA_TRUE;
|
||||
// if (wd->height_for_width) changed = EINA_TRUE;
|
||||
}
|
||||
|
||||
EINA_INLIST_FOREACH(wd->blocks, itb)
|
||||
|
@ -2327,16 +2327,16 @@ _pan_set(Evas_Object *obj,
|
|||
Pan *sd = evas_object_smart_data_get(obj);
|
||||
Item_Block *itb;
|
||||
|
||||
// Evas_Coord ow, oh;
|
||||
// evas_object_geometry_get(obj, NULL, NULL, &ow, &oh);
|
||||
// ow = sd->wd->minw - ow;
|
||||
// if (ow < 0) ow = 0;
|
||||
// oh = sd->wd->minh - oh;
|
||||
// if (oh < 0) oh = 0;
|
||||
// if (x < 0) x = 0;
|
||||
// if (y < 0) y = 0;
|
||||
// if (x > ow) x = ow;
|
||||
// if (y > oh) y = oh;
|
||||
// Evas_Coord ow, oh;
|
||||
// evas_object_geometry_get(obj, NULL, NULL, &ow, &oh);
|
||||
// ow = sd->wd->minw - ow;
|
||||
// if (ow < 0) ow = 0;
|
||||
// oh = sd->wd->minh - oh;
|
||||
// if (oh < 0) oh = 0;
|
||||
// if (x < 0) x = 0;
|
||||
// if (y < 0) y = 0;
|
||||
// if (x > ow) x = ow;
|
||||
// if (y > oh) y = oh;
|
||||
if ((x == sd->wd->pan_x) && (y == sd->wd->pan_y)) return;
|
||||
sd->wd->pan_x = x;
|
||||
sd->wd->pan_y = y;
|
||||
|
|
|
@ -624,7 +624,7 @@ elm_hover_parent_set(Evas_Object *obj, Evas_Object *parent)
|
|||
_parent_hide, obj);
|
||||
evas_object_event_callback_add(wd->parent, EVAS_CALLBACK_DEL,
|
||||
_parent_del, obj);
|
||||
// elm_widget_sub_object_add(parent, obj);
|
||||
// elm_widget_sub_object_add(parent, obj);
|
||||
}
|
||||
_sizing_eval(obj);
|
||||
}
|
||||
|
@ -816,7 +816,7 @@ elm_hover_content_set(Evas_Object *obj, const char *swallow, Evas_Object *conten
|
|||
}
|
||||
}
|
||||
|
||||
end:
|
||||
end:
|
||||
_sizing_eval(obj);
|
||||
}
|
||||
|
||||
|
|
|
@ -133,8 +133,8 @@ _sizing_eval(Evas_Object *obj)
|
|||
/* This icon has been set to a freedesktop icon, and the requested
|
||||
appears to have a different size than the requested size, so try to
|
||||
request another, higher resolution, icon.
|
||||
FIXME: Find a better heuristic to determine if there should be
|
||||
an icon with a different resolution. */
|
||||
FIXME: Find a better heuristic to determine if there should be
|
||||
an icon with a different resolution. */
|
||||
_icon_freedesktop_set(wd, obj, wd->stdicon, w);
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -413,8 +413,8 @@ static void
|
|||
_wheel(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(data);
|
||||
// Evas_Event_Mouse_Wheel *ev = event_info;
|
||||
// Evas_Object *obj = o;
|
||||
// Evas_Event_Mouse_Wheel *ev = event_info;
|
||||
// Evas_Object *obj = o;
|
||||
if (!wd) return;
|
||||
}
|
||||
|
||||
|
|
|
@ -141,9 +141,9 @@ _sizing_eval(Evas_Object *obj)
|
|||
wd->changed = EINA_FALSE;
|
||||
wd->lastw = resw;
|
||||
_elm_win_recalc_job(obj);
|
||||
// FIXME: works ok. but NOT for genlist. what should genlist do?
|
||||
// if (wd->deferred_recalc_job) ecore_job_del(wd->deferred_recalc_job);
|
||||
// wd->deferred_recalc_job = ecore_job_add(_elm_win_recalc_job, obj);
|
||||
// FIXME: works ok. but NOT for genlist. what should genlist do?
|
||||
// if (wd->deferred_recalc_job) ecore_job_del(wd->deferred_recalc_job);
|
||||
// wd->deferred_recalc_job = ecore_job_add(_elm_win_recalc_job, obj);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue