kikadf
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not crop labels at bottom: add extra space in icon-view mode 

SVN revision: 56821
This commit is contained in:
Hannes Janetzek 2011-02-08 21:30:48 +00:00
parent b65d89bec9
commit f56fe34d97
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/e_fm.c
View File

@ -3,6 +3,7 @@
#include "e_fm_op.h" #include "e_fm_op.h"
#define OVERCLIP 128 #define OVERCLIP 128
#define ICON_BOTTOM_SPACE 100
/* in order to check files (ie: extensions) use simpler and faster /* in order to check files (ie: extensions) use simpler and faster
* strcasecmp version that instead of checking case for each * strcasecmp version that instead of checking case for each
@ -4098,24 +4099,29 @@ _e_fm2_icons_place(Evas_Object *obj)
{ {
case E_FM2_VIEW_MODE_ICONS: case E_FM2_VIEW_MODE_ICONS:
_e_fm2_icons_place_icons(sd); _e_fm2_icons_place_icons(sd);
sd->max.h += ICON_BOTTOM_SPACE;
break; break;
case E_FM2_VIEW_MODE_GRID_ICONS: case E_FM2_VIEW_MODE_GRID_ICONS:
_e_fm2_icons_place_grid_icons(sd); _e_fm2_icons_place_grid_icons(sd);
sd->max.h += ICON_BOTTOM_SPACE;
break; break;
case E_FM2_VIEW_MODE_CUSTOM_ICONS: case E_FM2_VIEW_MODE_CUSTOM_ICONS:
_e_fm2_icons_place_custom_icons(sd); _e_fm2_icons_place_custom_icons(sd);
sd->max.h += ICON_BOTTOM_SPACE;
break; break;
case E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS: case E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS:
/* FIXME: not going to implement this at this stage */ /* FIXME: not going to implement this at this stage */
_e_fm2_icons_place_custom_grid_icons(sd); _e_fm2_icons_place_custom_grid_icons(sd);
sd->max.h += ICON_BOTTOM_SPACE;
break; break;
case E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS: case E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS:
/* FIXME: not going to implement this at this stage */ /* FIXME: not going to implement this at this stage */
_e_fm2_icons_place_custom_smart_grid_icons(sd); _e_fm2_icons_place_custom_smart_grid_icons(sd);
sd->max.h += ICON_BOTTOM_SPACE;
break; break;
case E_FM2_VIEW_MODE_LIST: case E_FM2_VIEW_MODE_LIST:
@ -5103,7 +5109,7 @@ _e_fm2_icon_make_visible(E_Fm2_Icon *ic)
if ( if (
((ic->y - ic->sd->pos.y) >= 0) && ((ic->y - ic->sd->pos.y) >= 0) &&
((ic->y + ic->h - ic->sd->pos.y) <= (ic->sd->h)) && ((ic->y + ic->h + ICON_BOTTOM_SPACE - ic->sd->pos.y) <= (ic->sd->h)) &&
((ic->x - ic->sd->pos.x) >= 0) && ((ic->x - ic->sd->pos.x) >= 0) &&
((ic->x + ic->w - ic->sd->pos.x) <= (ic->sd->w)) ((ic->x + ic->w - ic->sd->pos.x) <= (ic->sd->w))
) )
@ -5116,8 +5122,8 @@ _e_fm2_icon_make_visible(E_Fm2_Icon *ic)
y = ic->sd->pos.y; y = ic->sd->pos.y;
if ((ic->y - ic->sd->pos.y) < 0) if ((ic->y - ic->sd->pos.y) < 0)
y = ic->y; y = ic->y;
else if ((ic->y + ic->h - ic->sd->pos.y) > (ic->sd->h)) else if ((ic->y + ic->h + ICON_BOTTOM_SPACE - ic->sd->pos.y) > (ic->sd->h))
y = ic->y + ic->h - ic->sd->h; y = ic->y + ic->h + ICON_BOTTOM_SPACE - ic->sd->h;
e_fm2_pan_set(ic->sd->obj, x, y); e_fm2_pan_set(ic->sd->obj, x, y);
} }
evas_object_smart_callback_call(ic->sd->obj, "pan_changed", NULL); evas_object_smart_callback_call(ic->sd->obj, "pan_changed", NULL);
@ -6514,6 +6520,7 @@ _e_fm2_mouse_1_handler(E_Fm2_Icon *ic, int up, void *evas_event)
{ {
if (!ic->selected) sel_change = EINA_TRUE; if (!ic->selected) sel_change = EINA_TRUE;
_e_fm2_icon_select(ic); _e_fm2_icon_select(ic);
_e_fm2_icon_make_visible(ic);
ic->down_sel = EINA_TRUE; ic->down_sel = EINA_TRUE;
ic->last_selected = EINA_TRUE; ic->last_selected = EINA_TRUE;
} }