enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

e_fm2_optimal_size_calc now returns a bool to indicate whether the returned size can be used

This commit is contained in:
Mike Blumenkrantz 2013-05-08 08:27:54 +01:00
parent 2d55999aad
commit 529d58a410
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-05-08 Mike Blumenkrantz
* e_fm2_optimal_size_calc returns bool to indicate whether the returned size can be used
2013-04-26 Mike Blumenkrantz 2013-04-26 Mike Blumenkrantz
* fixed theme bug which prevented windows from unshading correctly when animations were disabled * fixed theme bug which prevented windows from unshading correctly when animations were disabled

1
NEWS
View File

@ -63,6 +63,7 @@ Changes:
* E_FN_DEL renamed to E_FREE_FUNC for consistency * E_FN_DEL renamed to E_FREE_FUNC for consistency
* deskpreview renamed to bgpreview * deskpreview renamed to bgpreview
* e_widget_bgpreview_desk_add now takes an evas instead of an evas object * e_widget_bgpreview_desk_add now takes an evas instead of an evas object
* e_fm2_optimal_size_calc returns bool to indicate whether the returned size can be used
Config: Config:
* move winlist_warp_speed option to pointer_warp_speed * move winlist_warp_speed option to pointer_warp_speed
* bindings now use new E_Binding_Event structs for mouse events * bindings now use new E_Binding_Event structs for mouse events

10
src/bin/e_fm.c
View File

@ -11411,12 +11411,13 @@ e_fm2_operation_abort(int id)
e_fm2_op_registry_entry_unref(ere); e_fm2_op_registry_entry_unref(ere);
} }
EAPI void EAPI Eina_Bool
e_fm2_optimal_size_calc(Evas_Object *obj, int maxw, int maxh, int *w, int *h) e_fm2_optimal_size_calc(Evas_Object *obj, int maxw, int maxh, int *w, int *h)
{ {
int x, y, minw, minh; int x, y, minw, minh;
EFM_SMART_CHECK(); EFM_SMART_CHECK(EINA_FALSE);
if ((!w) || (!h)) return; if ((!w) || (!h)) return EINA_FALSE;
if (!sd->icons) return EINA_FALSE;
if (maxw < 0) maxw = 0; if (maxw < 0) maxw = 0;
if (maxh < 0) maxh = 0; if (maxh < 0) maxh = 0;
minw = sd->min.w + 5, minh = sd->min.h + 5; minw = sd->min.w + 5, minh = sd->min.h + 5;
@ -11425,7 +11426,7 @@ e_fm2_optimal_size_calc(Evas_Object *obj, int maxw, int maxh, int *w, int *h)
case E_FM2_VIEW_MODE_LIST: case E_FM2_VIEW_MODE_LIST:
*w = MIN(minw, maxw); *w = MIN(minw, maxw);
*h = MIN(minh * eina_list_count(sd->icons), (unsigned int)maxh); *h = MIN(minh * eina_list_count(sd->icons), (unsigned int)maxh);
return; return EINA_TRUE;
default: default:
break; break;
@ -11440,6 +11441,7 @@ e_fm2_optimal_size_calc(Evas_Object *obj, int maxw, int maxh, int *w, int *h)
*w = MIN(*w, maxw); *w = MIN(*w, maxw);
*h = minh * y; *h = minh * y;
*h = MIN(*h, maxh); *h = MIN(*h, maxh);
return EINA_TRUE;
} }
EAPI E_Fm2_View_Mode EAPI E_Fm2_View_Mode

2
src/bin/e_fm.h
View File

@ -203,7 +203,7 @@ EAPI void e_fm2_overlay_clip_to(Evas_Object *fm, Evas_Object *clip);
EAPI void e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e); EAPI void e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e);
EAPI void e_fm2_client_del(Ecore_Ipc_Event_Client_Del *e); EAPI void e_fm2_client_del(Ecore_Ipc_Event_Client_Del *e);
EAPI E_Fm2_View_Mode e_fm2_view_mode_get(Evas_Object *obj); EAPI E_Fm2_View_Mode e_fm2_view_mode_get(Evas_Object *obj);
EAPI void e_fm2_optimal_size_calc(Evas_Object *obj, int maxw, int maxh, int *w, int *h); EAPI Eina_Bool e_fm2_optimal_size_calc(Evas_Object *obj, int maxw, int maxh, int *w, int *h);
EAPI const char *e_fm2_real_path_map(const char *dev, const char *path); EAPI const char *e_fm2_real_path_map(const char *dev, const char *path);
EAPI void e_fm2_favorites_init(void); EAPI void e_fm2_favorites_init(void);
EAPI unsigned int e_fm2_selected_count(Evas_Object *obj); EAPI unsigned int e_fm2_selected_count(Evas_Object *obj);