kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crazy indentation. no functional changes. 

* keep on a single line if it fits 80 cols
* align to opening braces in functions
This commit is contained in:
Davide Andreoli 2016-05-24 20:21:19 +02:00
parent 0a2bb86c63
commit b0ed787d03
1 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/lib/elementary/elm_thumb.c
View File

@ -98,25 +98,22 @@ _thumb_ready_inform(Elm_Thumb_Data *sd,
if ((sd->is_video) && (sd->thumb.format == ETHUMB_THUMB_EET)) if ((sd->is_video) && (sd->thumb.format == ETHUMB_THUMB_EET))
{ {
edje_object_size_min_get(sd->view, &mw, &mh); edje_object_size_min_get(sd->view, &mw, &mh);
edje_object_size_min_restricted_calc edje_object_size_min_restricted_calc(sd->view, &mw, &mh, mw, mh);
(sd->view, &mw, &mh, mw, mh);
evas_object_size_hint_min_set(sd->view, mw, mh); evas_object_size_hint_min_set(sd->view, mw, mh);
} }
else else
{ {
evas_object_image_size_get(sd->view, &aw, &ah); evas_object_image_size_get(sd->view, &aw, &ah);
evas_object_size_hint_aspect_set evas_object_size_hint_aspect_set(sd->view, EVAS_ASPECT_CONTROL_BOTH,
(sd->view, EVAS_ASPECT_CONTROL_BOTH, aw, ah); aw, ah);
} }
edje_object_part_swallow(wd->resize_obj, "elm.swallow.content", sd->view); edje_object_part_swallow(wd->resize_obj, "elm.swallow.content", sd->view);
eina_stringshare_replace(&(sd->thumb.file), thumb_path); eina_stringshare_replace(&(sd->thumb.file), thumb_path);
eina_stringshare_replace(&(sd->thumb.key), thumb_key); eina_stringshare_replace(&(sd->thumb.key), thumb_key);
edje_object_signal_emit edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm");
(wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm");
edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm"); edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm");
eo_event_callback_call eo_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_STOP, NULL);
(sd->obj, ELM_THUMB_EVENT_GENERATE_STOP, NULL);
} }
static void static void
@ -245,9 +242,8 @@ _thumb_finish(Elm_Thumb_Data *sd,
ERR("could not create image object"); ERR("could not create image object");
goto err; goto err;
} }
evas_object_event_callback_add evas_object_event_callback_add(sd->view, EVAS_CALLBACK_IMAGE_PRELOADED,
(sd->view, EVAS_CALLBACK_IMAGE_PRELOADED, _on_thumb_preloaded, _on_thumb_preloaded, sd->obj);
sd->obj);
evas_object_hide(sd->view); evas_object_hide(sd->view);
} }
@ -291,18 +287,15 @@ _thumb_finish(Elm_Thumb_Data *sd,
ELM_SAFE_FREE(sd->view, evas_object_del); ELM_SAFE_FREE(sd->view, evas_object_del);
wd = eo_data_scope_get(sd->obj, ELM_WIDGET_CLASS); wd = eo_data_scope_get(sd->obj, ELM_WIDGET_CLASS);
edje_object_signal_emit edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm");
(wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm"); eo_event_callback_call(sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL);
eo_event_callback_call
(sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL);
} }
return; return;
err: err:
edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm"); edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_LOAD_ERROR, "elm");
eo_event_callback_call eo_event_callback_call(sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL);
(sd->obj, ELM_THUMB_EVENT_LOAD_ERROR, NULL);
} }
static void static void
@ -336,9 +329,8 @@ _on_ethumb_thumb_error(Ethumb_Client *client EINA_UNUSED,
ERR("Something odd happened with a thumbnail request"); ERR("Something odd happened with a thumbnail request");
return; return;
} }
evas_object_event_callback_del_full evas_object_event_callback_del_full(sd->view, EVAS_CALLBACK_IMAGE_PRELOADED,
(sd->view, EVAS_CALLBACK_IMAGE_PRELOADED, _on_thumb_preloaded, _on_thumb_preloaded, sd);
sd);
pending_request--; pending_request--;
sd->thumb.request = NULL; sd->thumb.request = NULL;
@ -349,8 +341,7 @@ _on_ethumb_thumb_error(Ethumb_Client *client EINA_UNUSED,
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd); ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_ERROR, "elm"); edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_ERROR, "elm");
edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm"); edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_STOP, "elm");
eo_event_callback_call eo_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_ERROR, NULL);
(sd->obj, ELM_THUMB_EVENT_GENERATE_ERROR, NULL);
} }
static void static void
@ -389,13 +380,14 @@ _thumb_start(Elm_Thumb_Data *sd)
ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd); ELM_WIDGET_DATA_GET_OR_RETURN(sd->obj, wd);
edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_START, "elm"); edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_PULSE_START, "elm");
edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_START, "elm"); edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_START, "elm");
eo_event_callback_call eo_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_START, NULL);
(sd->obj, ELM_THUMB_EVENT_GENERATE_START, NULL);
pending_request++; pending_request++;
ethumb_client_file_set(_elm_ethumb_client, sd->file, sd->key); ethumb_client_file_set(_elm_ethumb_client, sd->file, sd->key);
sd->thumb.request = ethumb_client_thumb_async_get sd->thumb.request = ethumb_client_thumb_async_get(_elm_ethumb_client,
(_elm_ethumb_client, _on_ethumb_thumb_done, _on_ethumb_thumb_error, sd->obj); _on_ethumb_thumb_done,
_on_ethumb_thumb_error,
sd->obj);
} }
static Eina_Bool static Eina_Bool
@ -456,8 +448,8 @@ _thumb_show(Elm_Thumb_Data *sd)
} }
if (!sd->eeh) if (!sd->eeh)
sd->eeh = ecore_event_handler_add sd->eeh = ecore_event_handler_add(ELM_ECORE_EVENT_ETHUMB_CONNECT,
(ELM_ECORE_EVENT_ETHUMB_CONNECT, _thumbnailing_available_cb, sd->obj); _thumbnailing_available_cb, sd->obj);
} }
EOLIAN static void EOLIAN static void
@ -480,10 +472,8 @@ _elm_thumb_evas_object_smart_hide(Eo *obj, Elm_Thumb_Data *sd)
ethumb_client_thumb_async_cancel(_elm_ethumb_client, sd->thumb.request); ethumb_client_thumb_async_cancel(_elm_ethumb_client, sd->thumb.request);
sd->thumb.request = NULL; sd->thumb.request = NULL;
edje_object_signal_emit edje_object_signal_emit(wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm");
(wd->resize_obj, EDJE_SIGNAL_GENERATE_STOP, "elm"); eo_event_callback_call(sd->obj, ELM_THUMB_EVENT_GENERATE_STOP, NULL);
eo_event_callback_call
(sd->obj, ELM_THUMB_EVENT_GENERATE_STOP, NULL);
} }
if (sd->thumb.retry) if (sd->thumb.retry)
@ -544,10 +534,10 @@ _elm_thumb_evas_object_smart_add(Eo *obj, Elm_Thumb_Data *_pd EINA_UNUSED)
if (!elm_layout_theme_set(obj, "thumb", "base", elm_widget_style_get(obj))) if (!elm_layout_theme_set(obj, "thumb", "base", elm_widget_style_get(obj)))
CRI("Failed to set layout!"); CRI("Failed to set layout!");
evas_object_event_callback_add evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN,
(obj, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down_cb, obj); _mouse_down_cb, obj);
evas_object_event_callback_add evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_UP,
(obj, EVAS_CALLBACK_MOUSE_UP, _mouse_up_cb, obj); _mouse_up_cb, obj);
elm_widget_can_focus_set(obj, EINA_FALSE); elm_widget_can_focus_set(obj, EINA_FALSE);
} }
@ -566,9 +556,8 @@ _elm_thumb_evas_object_smart_del(Eo *obj, Elm_Thumb_Data *sd)
eo_data_unref(sd->obj, sd); eo_data_unref(sd->obj, sd);
sd->thumb.retry = EINA_FALSE; sd->thumb.retry = EINA_FALSE;
} }
evas_object_event_callback_del_full evas_object_event_callback_del_full(sd->view, EVAS_CALLBACK_IMAGE_PRELOADED,
(sd->view, EVAS_CALLBACK_IMAGE_PRELOADED, _on_thumb_preloaded, _on_thumb_preloaded, sd);
sd);
ELM_SAFE_FREE(sd->view, evas_object_del); ELM_SAFE_FREE(sd->view, evas_object_del);
eina_stringshare_del(sd->thumb.thumb_path); eina_stringshare_del(sd->thumb.thumb_path);
@ -608,7 +597,6 @@ _elm_thumb_efl_file_file_set(Eo *obj EINA_UNUSED, Elm_Thumb_Data *sd, const char
{ {
Eina_Bool file_replaced, key_replaced; Eina_Bool file_replaced, key_replaced;
file_replaced = eina_stringshare_replace(&(sd->file), file); file_replaced = eina_stringshare_replace(&(sd->file), file);
key_replaced = eina_stringshare_replace(&(sd->key), key); key_replaced = eina_stringshare_replace(&(sd->key), key);