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

Formatting on menu & notify. 

Some cleanup for panel widget...still no where near complete tho.



SVN revision: 43137
This commit is contained in:
Christopher Michael 2009-10-18 00:10:36 +00:00
parent d434116d77
commit 528b304c12
5 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/elementary/data/themes/default.edc
View File

@ -3374,7 +3374,7 @@ collections {
inherit: "default" 0.0;
}
}
part { name: "over_disabled";
part { name: "over_disabled";
mouse_events: 0;
description { state: "default" 0.0;
color: 255 255 255 0;

26
legacy/elementary/src/bin/test_menu.c
View File

@ -15,7 +15,8 @@ _show(void *data, Evas *e, Evas_Object *obj, void *event_info)
evas_object_show(data);
}
static void _populate_4(Elm_Menu_Item *item)
static void
_populate_4(Elm_Menu_Item *item)
{
Evas_Object *ic;
Elm_Menu_Item *item2, *item3;
@ -28,10 +29,10 @@ static void _populate_4(Elm_Menu_Item *item)
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
elm_icon_file_set(ic, buf, NULL);
item2 = elm_menu_item_add(menu, item, ic, "menu 3", NULL, NULL);
item2 = elm_menu_item_add(menu, item, ic, "menu 3", NULL, NULL);
elm_menu_item_separator_add(menu,item);
elm_menu_item_separator_add(menu, item);
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
@ -52,7 +53,8 @@ static void _populate_4(Elm_Menu_Item *item)
elm_menu_item_disabled_set(item3, 1);
}
static void _populate_3(Elm_Menu_Item *item)
static void
_populate_3(Elm_Menu_Item *item)
{
Evas_Object *ic;
Elm_Menu_Item *item2, *item3;
@ -65,8 +67,8 @@ static void _populate_3(Elm_Menu_Item *item)
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
elm_icon_file_set(ic, buf, NULL);
item2 = elm_menu_item_add(menu, item, ic, "menu 3", NULL, NULL);
item2 = elm_menu_item_add(menu, item, ic, "menu 3", NULL, NULL);
elm_menu_item_separator_add(menu,item);
@ -77,7 +79,8 @@ static void _populate_3(Elm_Menu_Item *item)
elm_menu_item_disabled_set(item3, 1);
}
static void _populate_2(Elm_Menu_Item *item)
static void
_populate_2(Elm_Menu_Item *item)
{
Evas_Object *ic;
Elm_Menu_Item *item2, *item3;
@ -90,8 +93,8 @@ static void _populate_2(Elm_Menu_Item *item)
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
elm_icon_file_set(ic, buf, NULL);
item2 = elm_menu_item_add(menu, item, ic, "menu 3", NULL, NULL);
item2 = elm_menu_item_add(menu, item, ic, "menu 3", NULL, NULL);
_populate_3(item2);
@ -106,6 +109,7 @@ static void _populate_2(Elm_Menu_Item *item)
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
elm_icon_file_set(ic, buf, NULL);
item2 = elm_menu_item_add(menu, item, ic, "menu 2", NULL, NULL);
elm_menu_item_separator_add(menu,item);
@ -119,7 +123,8 @@ static void _populate_2(Elm_Menu_Item *item)
_populate_4(item2);
}
static void _populate_1(Elm_Menu_Item *item)
static void
_populate_1(Elm_Menu_Item *item)
{
Elm_Menu_Item *item2;
@ -147,12 +152,10 @@ test_menu(void *data, Evas_Object *obj, void *event_info)
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(bg);
rect = evas_object_rectangle_add(evas_object_evas_get(win));
elm_win_resize_object_add(win, rect);
evas_object_color_set(rect, 0, 0, 0, 0);
evas_object_show(rect);
menu = elm_menu_add(win);
item = elm_menu_item_add(menu, NULL, NULL, "first item", NULL, NULL);
@ -160,8 +163,8 @@ test_menu(void *data, Evas_Object *obj, void *event_info)
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
elm_icon_file_set(ic, buf, NULL);
item = elm_menu_item_add(menu, NULL, ic, "second item", NULL, NULL);
item = elm_menu_item_add(menu, NULL, ic, "second item", NULL, NULL);
_populate_1(item);
ic = elm_icon_add(win);
@ -169,7 +172,6 @@ test_menu(void *data, Evas_Object *obj, void *event_info)
elm_icon_file_set(ic, buf, NULL);
elm_menu_item_add(menu, item, ic, "sub menu", NULL, NULL);
evas_object_event_callback_add(rect, EVAS_CALLBACK_MOUSE_DOWN, _show, menu);
evas_object_resize(win, 350, 200);

2
legacy/elementary/src/bin/test_notify.c
View File

@ -18,7 +18,7 @@ _bt_close(void *data, Evas_Object *obj, void *event_info)
evas_object_hide(notify);
}
void
void
test_notify(void *data, Evas_Object *obj, void *event_info)
{
Evas_Object *win, *bg, *bx, *bx2, *notify, *bt, *lb;

1
legacy/elementary/src/bin/test_panel.c
View File

@ -17,7 +17,6 @@ test_panel(void *data, Evas_Object *obj, void *event_info)
panel = elm_panel_add(win);
elm_panel_orient_set(panel, ELM_PANEL_ORIENT_LEFT);
elm_panel_timeout_set(panel, 2);
evas_object_size_hint_weight_set(panel, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(panel, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(panel);

8
legacy/elementary/src/lib/elm_panel.c
View File

@ -36,7 +36,8 @@ _theme_hook(Evas_Object *obj)
Widget_Data *wd = elm_widget_data_get(obj);
_elm_theme_set(wd->panel, "panel", "base", "default");
edje_object_scale_set(wd->panel, elm_widget_scale_get(obj) * _elm_config->scale);
edje_object_scale_set(wd->panel, elm_widget_scale_get(obj) *
_elm_config->scale);
_sizing_eval(obj);
}
@ -45,10 +46,8 @@ _sizing_eval(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
Evas_Coord x, y, w, h;
Evas_Coord px, py, pw, ph;
evas_object_geometry_get(wd->parent, &x, &y, &w, &h);
evas_object_geometry_get(wd->panel, &px, &py, &pw, &ph);
switch (wd->orient)
{
case ELM_PANEL_ORIENT_TOP:
@ -79,8 +78,7 @@ _parent_resize(void *data, Evas *evas, Evas_Object *obj, void *event)
static void
_btn_click(void *data, Evas_Object *obj, void *event)
{
Evas_Object *o = data;
Widget_Data *wd = elm_widget_data_get(o);
Widget_Data *wd = elm_widget_data_get(data);
elm_icon_standard_set(wd->icn, "arrow_right");
}