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

'everything' module: 

- get all popup sizes from theme
- slightly less shine on the main popup


SVN revision: 41823
This commit is contained in:
Hannes Janetzek 2009-08-16 17:12:18 +00:00
parent 43ebda5a4d
commit 6e1b43e306
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
data/themes/default.edc
View File

@ -26601,7 +26601,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
rel2.relative: 0.5 1.0;
image {
normal: "bt_base2.png";
border: 7 7 7 7;
border: 7 7 5 5;
}
}
@ -26693,7 +26693,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
normal: "bt_hilight.png";
border: 7 7 7 0;
}
color: 255 255 255 200;
color: 255 255 255 120;
}
}
part { name: "over2";
@ -26701,8 +26701,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
description { state: "default" 0.0;
rel1.to: "bg";
rel2.to: "bg";
/* rel2.relative: 1.0 0.5; */
rel2.offset: -1 30;
rel2.offset: -1 40;
image {
normal: "bt_shine.png";
@ -26825,7 +26824,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
size: 10;
min: 0 1;
align: 0.0 0.5;
/* text_class: "menu_item"; */
}
}
}
@ -26851,7 +26849,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
size: 10;
min: 0 1;
align: 1.0 0.0;
/* text_class: "menu_item"; */
}
}
}
@ -26895,6 +26892,11 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
image: "menu_sel_fg.png" COMP;
}
data.item: "shaped" "1";
/* offset to main popup */
data.item: "offset_y" "-4";
min: 350 235;
parts {
part { name: "base";
mouse_events: 0;
@ -27492,7 +27494,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
size: 10;
min: 1 1;
align: 0.5 0.5;
text_class: "fileman_icon";
}
}
description { state: "selected" 0.0;
@ -27559,7 +27560,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128);
size: 10;
min: 1 1;
align: 0.5 0.5;
text_class: "fileman_icon";
}
}
description { state: "selected" 0.0;

22
src/modules/everything/evry.c
View File

@ -598,18 +598,15 @@ evry_fuzzy_match(const char *str, const char *match)
static Evry_List_Window *
_evry_list_win_new(E_Zone *zone)
{
int x, y;
int x, y, mw, mh;
Evry_List_Window *list_win;
E_Popup *popup;
Evas_Object *o;
x = (zone->w / 2) - (win->popup->w / 3);
y = (zone->h / 2);
const char *offset_y;
/* TODO get offsets from theme */
popup = e_popup_new(zone, x + 30, y - 4,
win->popup->w * 2/3 - 60,
evry_conf->height);
popup = e_popup_new(zone, 0, 0, 1, 1);
if (!popup) return NULL;
list_win = E_NEW(Evry_List_Window, 1);
@ -627,6 +624,15 @@ _evry_list_win_new(E_Zone *zone)
list_win->o_main = o;
e_theme_edje_object_set(o, "base/theme/everything",
"e/widgets/everything/list");
offset_y = edje_object_data_get(o, "offset_y");
edje_object_size_min_get(o, &mw, &mh);
if (mh == 0) mh = 200;
if (mw == 0) mw = win->popup->w / 2;
x = (win->popup->x + win->popup->w / 2) - (mw / 2);
y = (win->popup->y + win->popup->h) + (offset_y ? atoi(offset_y) : 0);
e_popup_move_resize(popup, x, y, mw, mh);
o = e_box_add(popup->evas);
list_win->o_list = o;
@ -717,7 +723,7 @@ _evry_window_new(E_Zone *zone)
E_Popup *popup;
Evas_Object *o;
popup = e_popup_new(zone, 100, 100, 1, 1);
popup = e_popup_new(zone, 0, 0, 1, 1);
if (!popup) return NULL;
win = E_NEW(Evry_Window, 1);