remove trailing spaces and fix coding style
SVN revision: 77838
This commit is contained in:
parent
fc1d6f99de
commit
d19a9669c3
|
@ -315,7 +315,7 @@ _view_update(Evas_Object *obj)
|
|||
_shrink_mode_set(obj, EINA_TRUE);
|
||||
|
||||
// update guidetext
|
||||
_visual_guide_text_set(obj);
|
||||
_visual_guide_text_set(obj);
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
|
@ -1274,7 +1274,7 @@ _box_layout_cb(Evas_Object *o,
|
|||
const Eina_List *l, *l_next;
|
||||
Evas_Object *obj;
|
||||
double ax, ay;
|
||||
|
||||
|
||||
_box_min_size_calculate(o, priv);
|
||||
|
||||
evas_object_geometry_get(o, &x, &y, &w, &h);
|
||||
|
|
|
@ -147,7 +147,7 @@ _prefix_check(void)
|
|||
dirs[1] = app_compile_lib_dir;
|
||||
dirs[2] = app_compile_data_dir;
|
||||
dirs[3] = app_compile_locale_dir;
|
||||
|
||||
|
||||
if (!dirs[0]) dirs[0] = "/usr/local/bin";
|
||||
if (!dirs[1]) dirs[1] = "/usr/local/lib";
|
||||
if (!dirs[2])
|
||||
|
@ -422,7 +422,7 @@ elm_quicklaunch_init(int argc,
|
|||
ecore_file_init();
|
||||
|
||||
_elm_exit_handler = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, _elm_signal_exit, NULL);
|
||||
|
||||
|
||||
if (argv) _elm_appname = strdup(ecore_file_file_get(argv[0]));
|
||||
|
||||
pfx = eina_prefix_new(argv ? argv[0] : NULL, elm_quicklaunch_init,
|
||||
|
@ -455,7 +455,7 @@ elm_quicklaunch_sub_init(int argc,
|
|||
return _elm_sub_init_count;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
if (!quicklaunch_on)
|
||||
{
|
||||
ecore_app_args_set(argc, (const char **)argv);
|
||||
|
@ -721,7 +721,7 @@ elm_quicklaunch_fork(int argc,
|
|||
_elm_appname = NULL;
|
||||
if ((argv) && (argv[0]))
|
||||
_elm_appname = strdup(ecore_file_file_get(argv[0]));
|
||||
|
||||
|
||||
#ifdef SEMI_BROKEN_QUICKLAUNCH
|
||||
ecore_app_args_set(argc, (const char **)argv);
|
||||
evas_init();
|
||||
|
@ -1060,15 +1060,15 @@ elm_object_focus_set(Evas_Object *obj,
|
|||
if (elm_widget_is(obj))
|
||||
{
|
||||
const char *type;
|
||||
|
||||
|
||||
if (focus == elm_widget_focus_get(obj)) return;
|
||||
|
||||
|
||||
// ugly, but, special case for inlined windows
|
||||
type = evas_object_type_get(obj);
|
||||
if ((type) && (!strcmp(type, "elm_win")))
|
||||
{
|
||||
Evas_Object *inlined = elm_win_inlined_image_object_get(obj);
|
||||
|
||||
|
||||
if (inlined)
|
||||
{
|
||||
evas_object_focus_set(inlined, focus);
|
||||
|
|
|
@ -529,7 +529,7 @@ _access_spinner_register(Evas_Object *obj)
|
|||
sd->increment_btn_access =
|
||||
_elm_access_edje_object_part_object_register
|
||||
(obj, elm_layout_edje_get(obj), increment_part);
|
||||
|
||||
|
||||
ai = _elm_access_object_get(sd->increment_btn_access);
|
||||
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("spinner increment button"));
|
||||
|
||||
|
@ -541,7 +541,7 @@ _access_spinner_register(Evas_Object *obj)
|
|||
ai = _elm_access_object_get(sd->decrement_btn_access);
|
||||
_elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("spinner decrement button"));
|
||||
|
||||
// spinner label
|
||||
// spinner label
|
||||
sd->access_obj = _elm_access_edje_object_part_object_register
|
||||
(obj, elm_layout_edje_get(obj), "access_text");
|
||||
|
||||
|
@ -663,7 +663,7 @@ _access_hook(Evas_Object *obj, Eina_Bool is_access)
|
|||
{
|
||||
ELM_SPINNER_CHECK(obj);
|
||||
ELM_SPINNER_DATA_GET(obj, sd);
|
||||
|
||||
|
||||
if (is_access)
|
||||
{
|
||||
ELM_WIDGET_CLASS(ELM_WIDGET_DATA(sd)->api)->focus_next =
|
||||
|
|
|
@ -146,7 +146,7 @@ _store_genlist_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
|
|||
}
|
||||
eina_lock_release(&sti->lock);
|
||||
eina_lock_free(&sti->lock);
|
||||
st->items = NULL;
|
||||
st->items = NULL;
|
||||
free(sti);
|
||||
}
|
||||
// FIXME: kill threads and more
|
||||
|
@ -398,7 +398,7 @@ _store_filesystem_list_do(void *data, Ecore_Thread *th __UNUSED__)
|
|||
Eina_Bool ok;
|
||||
size_t pathsz = finf->path_length + 1;
|
||||
|
||||
if (finf->path[finf->name_start] == '.') continue ;
|
||||
if (finf->path[finf->name_start] == '.') continue ;
|
||||
|
||||
info = calloc(1, sizeof(Elm_Store_Item_Info_Filesystem) + pathsz);
|
||||
if (!info) continue;
|
||||
|
|
|
@ -205,24 +205,24 @@ _elm_win_state_eval(void *data __UNUSED__)
|
|||
{
|
||||
Eina_List *l;
|
||||
Evas_Object *obj;
|
||||
|
||||
|
||||
_elm_win_state_eval_job = NULL;
|
||||
|
||||
|
||||
if (_elm_config->auto_norender_withdrawn)
|
||||
{
|
||||
EINA_LIST_FOREACH(_elm_win_list, l, obj)
|
||||
{
|
||||
if ((elm_win_withdrawn_get(obj)) ||
|
||||
((elm_win_iconified_get(obj) &&
|
||||
((elm_win_iconified_get(obj) &&
|
||||
(_elm_config->auto_norender_iconified_same_as_withdrawn))))
|
||||
{
|
||||
if (!evas_object_data_get(obj, "__win_auto_norender"))
|
||||
{
|
||||
Evas *evas = evas_object_evas_get(obj);
|
||||
|
||||
|
||||
elm_win_norender_push(obj);
|
||||
evas_object_data_set(obj, "__win_auto_norender", obj);
|
||||
|
||||
|
||||
if (_elm_config->auto_flush_withdrawn)
|
||||
{
|
||||
edje_file_cache_flush();
|
||||
|
@ -258,7 +258,7 @@ _elm_win_state_eval(void *data __UNUSED__)
|
|||
}
|
||||
else
|
||||
{
|
||||
if ((_elm_win_count_iconified + _elm_win_count_withdrawn) >=
|
||||
if ((_elm_win_count_iconified + _elm_win_count_withdrawn) >=
|
||||
_elm_win_count_shown)
|
||||
{
|
||||
if (!_elm_win_auto_throttled)
|
||||
|
@ -780,7 +780,7 @@ _elm_win_focus_in(Ecore_Evas *ee)
|
|||
EINA_SAFETY_ON_NULL_RETURN(sd);
|
||||
|
||||
obj = ELM_WIDGET_DATA(sd)->obj;
|
||||
|
||||
|
||||
_elm_widget_top_win_focused_set(obj, EINA_TRUE);
|
||||
if (!elm_widget_focus_order_get(obj))
|
||||
{
|
||||
|
@ -846,7 +846,7 @@ _elm_win_state_change(Ecore_Evas *ee)
|
|||
|
||||
if (sd->withdrawn) _elm_win_count_withdrawn--;
|
||||
if (sd->iconified) _elm_win_count_iconified--;
|
||||
|
||||
|
||||
if (sd->withdrawn != ecore_evas_withdrawn_get(sd->ee))
|
||||
{
|
||||
sd->withdrawn = ecore_evas_withdrawn_get(sd->ee);
|
||||
|
@ -876,7 +876,7 @@ _elm_win_state_change(Ecore_Evas *ee)
|
|||
if (sd->withdrawn) _elm_win_count_withdrawn++;
|
||||
if (sd->iconified) _elm_win_count_iconified++;
|
||||
_elm_win_state_eval_queue();
|
||||
|
||||
|
||||
if ((ch_withdrawn) || (ch_iconified))
|
||||
{
|
||||
if (sd->withdrawn)
|
||||
|
@ -1305,7 +1305,7 @@ _elm_win_smart_del(Evas_Object *obj)
|
|||
if (evas_object_visible_get(obj)) _elm_win_count_shown--;
|
||||
_elm_win_count--;
|
||||
_elm_win_state_eval_queue();
|
||||
|
||||
|
||||
if (sd->ee)
|
||||
{
|
||||
ecore_evas_callback_delete_request_set(sd->ee, NULL);
|
||||
|
@ -1978,16 +1978,16 @@ _elm_win_frame_cb_resize_show(void *data,
|
|||
else if (!strcmp(source, "elm.event.resize.r"))
|
||||
ecore_wl_window_cursor_from_name_set(sd->wl.win, ELM_CURSOR_RIGHT_SIDE);
|
||||
else if (!strcmp(source, "elm.event.resize.tl"))
|
||||
ecore_wl_window_cursor_from_name_set(sd->wl.win,
|
||||
ecore_wl_window_cursor_from_name_set(sd->wl.win,
|
||||
ELM_CURSOR_TOP_LEFT_CORNER);
|
||||
else if (!strcmp(source, "elm.event.resize.tr"))
|
||||
ecore_wl_window_cursor_from_name_set(sd->wl.win,
|
||||
ecore_wl_window_cursor_from_name_set(sd->wl.win,
|
||||
ELM_CURSOR_TOP_RIGHT_CORNER);
|
||||
else if (!strcmp(source, "elm.event.resize.bl"))
|
||||
ecore_wl_window_cursor_from_name_set(sd->wl.win,
|
||||
ecore_wl_window_cursor_from_name_set(sd->wl.win,
|
||||
ELM_CURSOR_BOTTOM_LEFT_CORNER);
|
||||
else if (!strcmp(source, "elm.event.resize.br"))
|
||||
ecore_wl_window_cursor_from_name_set(sd->wl.win,
|
||||
ecore_wl_window_cursor_from_name_set(sd->wl.win,
|
||||
ELM_CURSOR_BOTTOM_RIGHT_CORNER);
|
||||
else
|
||||
ecore_wl_window_cursor_default_restore(sd->wl.win);
|
||||
|
@ -2085,15 +2085,15 @@ _elm_win_frame_cb_close(void *data,
|
|||
Evas_Object *win;
|
||||
|
||||
/* FIXME: After the current freeze, this should be handled differently.
|
||||
*
|
||||
* Ideally, we would want to mimic the X11 backend and use something
|
||||
* like ECORE_WL_EVENT_WINDOW_DELETE and handle the delete_request
|
||||
* inside of ecore_evas. That would be the 'proper' way, but since we are
|
||||
* in a freeze right now, I cannot add a new event value, or a new
|
||||
*
|
||||
* Ideally, we would want to mimic the X11 backend and use something
|
||||
* like ECORE_WL_EVENT_WINDOW_DELETE and handle the delete_request
|
||||
* inside of ecore_evas. That would be the 'proper' way, but since we are
|
||||
* in a freeze right now, I cannot add a new event value, or a new
|
||||
* event structure to ecore_wayland.
|
||||
*
|
||||
* So yes, this is a temporary 'stop-gap' solution which will be fixed
|
||||
* when the freeze is over, but it does fix a trac bug for now, and in a
|
||||
*
|
||||
* So yes, this is a temporary 'stop-gap' solution which will be fixed
|
||||
* when the freeze is over, but it does fix a trac bug for now, and in a
|
||||
* way which does not break API or the freeze. - dh
|
||||
*/
|
||||
|
||||
|
@ -2153,7 +2153,7 @@ _elm_win_frame_add(Elm_Win_Smart_Data *sd,
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
_elm_win_frame_del(Elm_Win_Smart_Data *sd)
|
||||
{
|
||||
if (sd->frame_obj)
|
||||
|
@ -2177,7 +2177,7 @@ _elm_win_frame_del(Elm_Win_Smart_Data *sd)
|
|||
(sd->frame_obj, "elm,action,maximize", "elm",
|
||||
_elm_win_frame_cb_maximize);
|
||||
edje_object_signal_callback_del
|
||||
(sd->frame_obj, "elm,action,close", "elm",
|
||||
(sd->frame_obj, "elm,action,close", "elm",
|
||||
_elm_win_frame_cb_close);
|
||||
|
||||
evas_object_del(sd->frame_obj);
|
||||
|
@ -2700,7 +2700,7 @@ elm_win_add(Evas_Object *parent,
|
|||
|
||||
_elm_win_list = eina_list_append(_elm_win_list, obj);
|
||||
_elm_win_count++;
|
||||
|
||||
|
||||
if (((fallback) && (!strcmp(fallback, "Software FB"))) ||
|
||||
((!fallback) && (ENGINE_COMPARE(ELM_SOFTWARE_FB))))
|
||||
{
|
||||
|
@ -3400,7 +3400,7 @@ elm_win_norender_push(Evas_Object *obj)
|
|||
{
|
||||
ELM_WIN_CHECK(obj);
|
||||
ELM_WIN_DATA_GET_OR_RETURN(obj, sd);
|
||||
|
||||
|
||||
sd->norender++;
|
||||
if (sd->norender == 1) ecore_evas_manual_render_set(sd->ee, EINA_TRUE);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue