use elipsis for fileman icons.
some ilist work. more to come. SVN revision: 18327
This commit is contained in:
parent
85c28ba965
commit
0b320cb218
|
@ -995,10 +995,11 @@ group {
|
||||||
color3: 255 255 255 128;
|
color3: 255 255 255 128;
|
||||||
text {
|
text {
|
||||||
text: "No Title";
|
text: "No Title";
|
||||||
align: 0.0 0.0;
|
|
||||||
size: 10;
|
size: 10;
|
||||||
font: "Edje-Vera";
|
font: "Edje-Vera";
|
||||||
min: 0 1;
|
min: 0 1;
|
||||||
|
align: 0.5 1.0;
|
||||||
|
elipsis: 0.0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1191,7 +1192,8 @@ group {
|
||||||
font: "Edje-Vera";
|
font: "Edje-Vera";
|
||||||
size: 10;
|
size: 10;
|
||||||
//min: 1 1;
|
//min: 1 1;
|
||||||
align: 0.0 1.0;
|
align: 0.5 1.0;
|
||||||
|
elipsis: 0.0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,7 +77,7 @@ static Evas_List *_e_apps_start_pending = NULL;
|
||||||
" image: \"%s\" COMP;\n" \
|
" image: \"%s\" COMP;\n" \
|
||||||
"}\n" \
|
"}\n" \
|
||||||
"collections {\n" \
|
"collections {\n" \
|
||||||
" group {\n" \
|
" group {\n" \
|
||||||
" name: \"icon\";\n" \
|
" name: \"icon\";\n" \
|
||||||
" max: %s %s;\n" \
|
" max: %s %s;\n" \
|
||||||
" parts {\n" \
|
" parts {\n" \
|
||||||
|
@ -1430,7 +1430,7 @@ _e_app_cb_monitor(void *data, Ecore_File_Monitor *em,
|
||||||
if (!app->scanned)
|
if (!app->scanned)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
file = ecore_file_get_file((char *)path);
|
file = (char *)ecore_file_get_file((char *)path);
|
||||||
if (!strcmp(file, ".order"))
|
if (!strcmp(file, ".order"))
|
||||||
{
|
{
|
||||||
if ((event == ECORE_FILE_EVENT_CREATED_FILE)
|
if ((event == ECORE_FILE_EVENT_CREATED_FILE)
|
||||||
|
|
|
@ -150,6 +150,24 @@ e_dialog_content_set(E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coor
|
||||||
evas_object_show(obj);
|
evas_object_show(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
e_dialog_resizable_set(E_Dialog *dia, int resizable)
|
||||||
|
{
|
||||||
|
dia->resizable = resizable;
|
||||||
|
if (dia->win)
|
||||||
|
{
|
||||||
|
if (resizable)
|
||||||
|
{
|
||||||
|
e_win_size_max_set(dia->win, 99999, 99999);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
e_win_resize(dia->win, dia->min_w, dia->min_h);
|
||||||
|
e_win_size_max_set(dia->win, dia->min_w, dia->min_h);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
e_dialog_show(E_Dialog *dia)
|
e_dialog_show(E_Dialog *dia)
|
||||||
{
|
{
|
||||||
|
@ -173,7 +191,10 @@ e_dialog_show(E_Dialog *dia)
|
||||||
evas_object_resize(dia->bg_object, mw, mh);
|
evas_object_resize(dia->bg_object, mw, mh);
|
||||||
e_win_resize(dia->win, mw, mh);
|
e_win_resize(dia->win, mw, mh);
|
||||||
e_win_size_min_set(dia->win, mw, mh);
|
e_win_size_min_set(dia->win, mw, mh);
|
||||||
e_win_size_max_set(dia->win, mw, mh);
|
dia->min_w = mw;
|
||||||
|
dia->min_h = mh;
|
||||||
|
if (!dia->resizable) e_win_size_max_set(dia->win, mw, mh);
|
||||||
|
else e_win_size_max_set(dia->win, 99999, 99999);
|
||||||
e_win_show(dia->win);
|
e_win_show(dia->win);
|
||||||
|
|
||||||
if (!e_widget_focus_get(dia->box_object))
|
if (!e_widget_focus_get(dia->box_object))
|
||||||
|
|
|
@ -25,6 +25,8 @@ struct _E_Dialog
|
||||||
Evas_Object *event_object;
|
Evas_Object *event_object;
|
||||||
Evas_List *buttons;
|
Evas_List *buttons;
|
||||||
void *data;
|
void *data;
|
||||||
|
int min_w, min_h;
|
||||||
|
unsigned char resizable : 1;
|
||||||
};
|
};
|
||||||
|
|
||||||
EAPI E_Dialog *e_dialog_new (E_Container *con);
|
EAPI E_Dialog *e_dialog_new (E_Container *con);
|
||||||
|
@ -35,6 +37,7 @@ EAPI void e_dialog_title_set (E_Dialog *dia, char *title);
|
||||||
EAPI void e_dialog_text_set (E_Dialog *dia, char *text);
|
EAPI void e_dialog_text_set (E_Dialog *dia, char *text);
|
||||||
EAPI void e_dialog_icon_set (E_Dialog *dia, char *icon, Evas_Coord size);
|
EAPI void e_dialog_icon_set (E_Dialog *dia, char *icon, Evas_Coord size);
|
||||||
EAPI void e_dialog_content_set (E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coord minh);
|
EAPI void e_dialog_content_set (E_Dialog *dia, Evas_Object *obj, Evas_Coord minw, Evas_Coord minh);
|
||||||
|
EAPI void e_dialog_resizable_set (E_Dialog *dia, int resizable);
|
||||||
EAPI void e_dialog_show (E_Dialog *dia);
|
EAPI void e_dialog_show (E_Dialog *dia);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -69,8 +69,8 @@ e_file_dialog_new(E_Container *con)
|
||||||
void
|
void
|
||||||
e_file_dialog_show(E_File_Dialog *dia)
|
e_file_dialog_show(E_File_Dialog *dia)
|
||||||
{
|
{
|
||||||
|
e_dialog_resizable_set(dia->dia, 1);
|
||||||
e_dialog_show(dia->dia);
|
e_dialog_show(dia->dia);
|
||||||
e_win_size_max_set(dia->dia->win, 9999, 9999);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -80,7 +80,7 @@ e_icon_file_get(Evas_Object *obj)
|
||||||
sd = evas_object_smart_data_get(obj);
|
sd = evas_object_smart_data_get(obj);
|
||||||
if (!strcmp(evas_object_type_get(sd->obj), "edje"))
|
if (!strcmp(evas_object_type_get(sd->obj), "edje"))
|
||||||
{
|
{
|
||||||
edje_object_file_get(sd->obj, &file, NULL);
|
edje_object_file_get(sd->obj, (const char **)&file, NULL);
|
||||||
return file;
|
return file;
|
||||||
}
|
}
|
||||||
evas_object_image_file_get(sd->obj, &file, NULL);
|
evas_object_image_file_get(sd->obj, &file, NULL);
|
||||||
|
|
|
@ -217,6 +217,7 @@ void
|
||||||
e_scrollframe_child_viewport_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
|
e_scrollframe_child_viewport_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
|
||||||
{
|
{
|
||||||
API_ENTRY return;
|
API_ENTRY return;
|
||||||
|
edje_object_calc_force(sd->edje_obj);
|
||||||
evas_object_geometry_get(sd->pan_obj, NULL, NULL, w, h);
|
evas_object_geometry_get(sd->pan_obj, NULL, NULL, w, h);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -410,6 +410,20 @@ _e_test_sel(void *data, void *data2)
|
||||||
e_scrollframe_child_region_show(tmp.scrollframe, x, y, w, h);
|
e_scrollframe_child_region_show(tmp.scrollframe, x, y, w, h);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_e_test_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
|
{
|
||||||
|
Evas_Coord mw, mh, vw, vh, w, h;
|
||||||
|
|
||||||
|
e_scrollframe_child_viewport_size_get(obj, &vw, &vh);
|
||||||
|
e_ilist_min_size_get(data, &mw, &mh);
|
||||||
|
evas_object_geometry_get(data, NULL, NULL, &w, &h);
|
||||||
|
if (vw >= mw)
|
||||||
|
{
|
||||||
|
if (w != vw) evas_object_resize(data, vw, h);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_e_test_internal(E_Container *con)
|
_e_test_internal(E_Container *con)
|
||||||
{
|
{
|
||||||
|
@ -464,14 +478,16 @@ _e_test_internal(E_Container *con)
|
||||||
evas_object_show(o);
|
evas_object_show(o);
|
||||||
|
|
||||||
o2 = e_scrollframe_add(dia->win->evas);
|
o2 = e_scrollframe_add(dia->win->evas);
|
||||||
|
evas_object_event_callback_add(o2, EVAS_CALLBACK_RESIZE, _e_test_resize, o);
|
||||||
evas_object_resize(o2, mw, 150);
|
evas_object_resize(o2, mw, 150);
|
||||||
evas_object_show(o2);
|
evas_object_show(o2);
|
||||||
e_scrollframe_child_set(o2, o);
|
e_scrollframe_child_set(o2, o);
|
||||||
|
|
||||||
e_scrollframe_child_viewport_size_get(o2, &vw, &vh);
|
e_scrollframe_child_viewport_size_get(o2, &vw, &vh);
|
||||||
e_dialog_content_set(dia, o2, mw + (mw - vw), 150);
|
e_dialog_content_set(dia, o2, 200, 150);
|
||||||
e_dialog_button_add(dia, "OK", NULL, NULL, NULL);
|
e_dialog_button_add(dia, "OK", NULL, NULL, NULL);
|
||||||
e_win_centered_set(dia->win, 1);
|
e_win_centered_set(dia->win, 1);
|
||||||
|
e_dialog_resizable_set(dia, 1);
|
||||||
e_dialog_show(dia);
|
e_dialog_show(dia);
|
||||||
|
|
||||||
tmp.ilist = o;
|
tmp.ilist = o;
|
||||||
|
|
Loading…
Reference in New Issue