}
}
part {
- name: "e.swallow.bg";
- type: SWALLOW;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- }
- }
- part {
name: "shadow";
mouse_events: 0;
description {
}
}
}
+ part { name: "e.swallow.favorites"; type: SWALLOW;
+ description { state: "default" 0.0;
+ align: 0.0 1.0;
+ rel1.offset: 0 0;
+ rel1.to: "region";
+ rel2.offset: 0 -1;
+ rel2.relative: 0.0 1.0;
+ rel2.to: "region";
+ fixed: 1 0;
+ }
+ }
+ part { name: "e.swallow.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ rel1.offset: 0 0;
+ rel1.to: "region";
+ rel2.offset: -1 -1;
+ rel2.to: "region";
+ align: 1.0 1.0;
+ }
+ description { state: "fav" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 1.0 0.0;
+ rel1.to_x: "e.swallow.favorites";
+ }
+ }
+ part { name: "e.swallow.toolbar"; type: SWALLOW;
+ description { state: "default" 0.0;
+ }
+ description { state: "tb_top" 0.0;
+ align: 0.5 0.0;
+ rel1.offset: 0 0;
+ rel2.offset: -1 0;
+ rel2.relative: 1.0 0.0;
+ fixed: 0 1;
+ }
+ description { state: "tb_bottom" 0.0;
+ align: 0.5 1.0;
+ rel1.offset: 0 -1;
+ rel1.relative: 0.0 1.0;
+ rel2.offset: -1 -1;
+ fixed: 0 1;
+ }
+ }
+ part { name: "region"; type: SPACER;
+ description { state: "default" 0.0;
+ }
+ description { state: "tb_top" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 0.0 1.0;
+ rel1.to_y: "e.swallow.toolbar";
+ }
+ description { state: "tb_bottom" 0.0;
+ inherit: "default" 0.0;
+ rel2.relative: 1.0 0.0;
+ rel2.to_y: "e.swallow.toolbar";
+ }
+ description { state: "tb_left" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 1.0 0.0;
+ rel1.to_x: "e.swallow.toolbar";
+ }
+ description { state: "tb_right" 0.0;
+ inherit: "default" 0.0;
+ rel2.relative: 0.0 1.0;
+ rel2.to_x: "e.swallow.toolbar";
+ }
+ }
+ }
+ programs {
+ program {
+signal: "e,favorites,enabled"; source: "e";
+action: STATE_SET "fav" 0.0;
+target: "e.swallow.content";
+ }
+ program {
+signal: "e,favorites,disabled"; source: "e";
+action: STATE_SET "default" 0.0;
+target: "e.swallow.content";
+ }
+ program {
+signal: "e,toolbar,left"; source: "e";
+action: STATE_SET "tb_left" 0.0;
+target: "e.swallow.toolbar";
+target: "region";
+ }
+ program {
+signal: "e,toolbar,right"; source: "e";
+action: STATE_SET "tb_right" 0.0;
+target: "e.swallow.toolbar";
+target: "region";
+ }
+ program {
+signal: "e,toolbar,top"; source: "e";
+action: STATE_SET "tb_top" 0.0;
+target: "e.swallow.toolbar";
+target: "region";
+ }
+ program {
+signal: "e,toolbar,bottom"; source: "e";
+action: STATE_SET "tb_bottom" 0.0;
+target: "e.swallow.toolbar";
+target: "region";
+ }
+ program {
+signal: "e,toolbar,disabled"; source: "e";
+action: STATE_SET "default" 0.0;
+target: "e.swallow.toolbar";
+target: "region";
+ }
+ }
+ }
+ group { name: "e/fileman/popup/default";
+ parts {
+ part { name: "base"; type: RECT; mouse_events: 0;
+ description { state: "default" 0.0;
+ color: 160 160 160 255;
+ }
+ part { name: "e.swallow.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ rel1.offset: 4 0;
+ rel1.relative: 0.0 1.0;
+ rel1.to_y: "e.text.title";
+ rel2.offset: -5 -5;
+ }
+ }
+ part { name: "e.text.title"; type: TEXT; mouse_events: 0;
+ scale: 1;
+ effect: SHADOW BOTTOM;
+ description { state: "default" 0.0;
+ color_class: "fileman_popup_title";
+ rel1.relative: 0.0 0.0;
+ rel1.offset: 1 3;
+ rel2.relative: 1.0 0.0;
+ rel2.offset: -2 3;
+ align: 0.5 0.0;
+ color: 0 0 0 255;
+ color3: 255 255 255 128;
+ text { font: "Sans:style=Bold"; size: 10;
+ text_class: "fileman_popup_title";
+ align: 0.5 0.0;
+ min: 0 1;
+ }
+ fixed: 0 1;
+ }
+ }
+ }
}
}
group {
/* local vars */
static Eina_List *toolbars = NULL;
+static void
+_tb_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *info __UNUSED__)
+{
+ E_Toolbar *tbar = data;
+ Evas_Coord w, h;
+ evas_object_geometry_get(obj, NULL, NULL, &w, &h);
+ if (tbar->gadcon) e_gadcon_swallowed_min_size_set(tbar->gadcon, w, h);
+}
+
EINTERN int
e_toolbar_init(void)
{
if (!tbar) return NULL;
tbar->id = 1;
// tbar->id = eina_list_count(toolbars) + 1;
- tbar->x = tbar->y = 0;
- tbar->h = 32;
- tbar->w = fwin->w;
tbar->evas = evas;
tbar->name = eina_stringshare_add(name);
tbar->fwin = fwin;
evas_object_smart_callback_add(tbar->fm2, "selection_change",
_e_toolbar_fm2_selection_changed, tbar);
+ tbar->o_base = edje_object_add(evas);
+ e_theme_edje_object_set(tbar->o_base, "base/theme/fileman/toolbar",
+ "e/fileman/toolbar/default/base");
+ evas_object_event_callback_add(tbar->o_base, EVAS_CALLBACK_RESIZE,
+ _tb_resize, tbar);
tbar->o_event = evas_object_rectangle_add(evas);
evas_object_color_set(tbar->o_event, 0, 0, 0, 0);
- evas_object_resize(tbar->o_event, tbar->w, tbar->h);
+ evas_object_show(tbar->o_event);
+ edje_object_part_swallow(tbar->o_base, "e.swallow.event", tbar->o_event);
evas_object_event_callback_add(tbar->o_event, EVAS_CALLBACK_MOUSE_DOWN,
_e_toolbar_cb_mouse_down, tbar);
- evas_object_layer_set(tbar->o_event, 0);
- evas_object_show(tbar->o_event);
-
- tbar->o_base = edje_object_add(evas);
- evas_object_resize(tbar->o_base, tbar->w, tbar->h);
- e_theme_edje_object_set(tbar->o_base, "base/theme/fileman/toolbar",
- "e/fileman/toolbar/default/base");
-
- e_toolbar_move_resize(tbar, tbar->x, tbar->y, tbar->w, tbar->h);
tbar->gadcon = e_gadcon_swallowed_new(tbar->name, tbar->id, tbar->o_base,
"e.swallow.content");
}
EAPI void
-e_toolbar_show(E_Toolbar *tbar)
-{
- E_OBJECT_CHECK(tbar);
- E_OBJECT_TYPE_CHECK(tbar, E_TOOLBAR_TYPE);
- evas_object_show(tbar->o_event);
- evas_object_show(tbar->o_base);
-}
-
-EAPI void
-e_toolbar_hide(E_Toolbar *tbar)
-{
- E_OBJECT_CHECK(tbar);
- E_OBJECT_TYPE_CHECK(tbar, E_TOOLBAR_TYPE);
- evas_object_hide(tbar->o_event);
- evas_object_hide(tbar->o_base);
-}
-
-EAPI void
-e_toolbar_move(E_Toolbar *tbar, int x, int y)
-{
- E_OBJECT_CHECK(tbar);
- E_OBJECT_TYPE_CHECK(tbar, E_TOOLBAR_TYPE);
- tbar->x = x;
- tbar->y = y;
- evas_object_move(tbar->o_event, tbar->x, tbar->y);
- evas_object_move(tbar->o_base, tbar->x, tbar->y);
-}
-
-EAPI void
-e_toolbar_resize(E_Toolbar *tbar, int w, int h)
-{
- E_OBJECT_CHECK(tbar);
- E_OBJECT_TYPE_CHECK(tbar, E_TOOLBAR_TYPE);
- tbar->w = w;
- tbar->h = h;
- if (tbar->gadcon)
- e_gadcon_swallowed_min_size_set(tbar->gadcon, w, h);
- evas_object_resize(tbar->o_event, tbar->w, tbar->h);
- evas_object_resize(tbar->o_base, tbar->w, tbar->h);
-}
-
-EAPI void
-e_toolbar_move_resize(E_Toolbar *tbar, int x, int y, int w, int h)
-{
- E_OBJECT_CHECK(tbar);
- E_OBJECT_TYPE_CHECK(tbar, E_TOOLBAR_TYPE);
- tbar->x = x;
- tbar->y = y;
- tbar->w = w;
- tbar->h = h;
- if (tbar->gadcon)
- e_gadcon_swallowed_min_size_set(tbar->gadcon, w, h);
- evas_object_move(tbar->o_event, x, y);
- evas_object_move(tbar->o_base, x, y);
- evas_object_resize(tbar->o_event, w, h);
- evas_object_resize(tbar->o_base, w, h);
-}
-
-EAPI void
e_toolbar_orient(E_Toolbar *tbar, E_Gadcon_Orient orient)
{
char buf[4096];
}
EAPI void
-e_toolbar_position_calc(E_Toolbar *tbar)
-{
- E_Gadcon_Orient orient = E_GADCON_ORIENT_TOP;
-
- E_OBJECT_CHECK(tbar);
- E_OBJECT_TYPE_CHECK(tbar, E_TOOLBAR_TYPE);
- if (!tbar->fwin) return;
- orient = tbar->gadcon->orient;
- switch (orient)
- {
- case E_GADCON_ORIENT_HORIZ:
- case E_GADCON_ORIENT_TOP:
- tbar->x = 0;
- tbar->y = 0;
- tbar->h = 32;
- tbar->w = tbar->fwin->w;
- break;
-
- case E_GADCON_ORIENT_BOTTOM:
- tbar->x = 0;
- tbar->h = 32;
- tbar->w = tbar->fwin->w;
- tbar->y = (tbar->fwin->h - tbar->h);
- break;
-
- case E_GADCON_ORIENT_VERT:
- case E_GADCON_ORIENT_LEFT:
- tbar->x = 0;
- tbar->w = 32;
- tbar->h = tbar->fwin->h;
- tbar->y = 0;
- break;
-
- case E_GADCON_ORIENT_RIGHT:
- tbar->y = 0;
- tbar->w = 32;
- tbar->x = (tbar->fwin->w - tbar->w);
- tbar->h = tbar->fwin->h;
- break;
-
- default:
- break;
- }
- e_toolbar_move_resize(tbar, tbar->x, tbar->y, tbar->w, tbar->h);
-}
-
-EAPI void
e_toolbar_populate(E_Toolbar *tbar)
{
E_OBJECT_CHECK(tbar);
_e_toolbar_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h)
{
E_Toolbar *tbar;
- Evas_Coord nx, ny, nw, nh, ww, hh;
+ Evas_Coord ww, hh, nw, nh;
tbar = data;
- nx = tbar->x;
- ny = tbar->y;
- nw = tbar->w;
- nh = tbar->h;
ww = hh = 0;
evas_object_geometry_get(gc->o_container, NULL, NULL, &ww, &hh);
switch (gc->orient)
w = ww;
h = 32;
break;
-
case E_GADCON_ORIENT_LEFT:
case E_GADCON_ORIENT_RIGHT:
w = 32;
h = hh;
break;
-
default:
break;
}
e_gadcon_swallowed_min_size_set(gc, w, h);
edje_object_size_min_calc(tbar->o_base, &nw, &nh);
- switch (gc->orient)
- {
- case E_GADCON_ORIENT_TOP:
- nx = ny = 0;
- nw = tbar->w;
- nh = tbar->h;
- if (nw > tbar->fwin->w) nw = tbar->fwin->w;
- if (nh > tbar->fwin->h) nh = 32;
- break;
-
- case E_GADCON_ORIENT_BOTTOM:
- nx = 0;
- nw = tbar->w;
- nh = tbar->h;
- if (nw > tbar->fwin->w) nw = tbar->fwin->w;
- if (nh > tbar->fwin->h) nh = 32;
- ny = (tbar->fwin->h - nh);
- break;
-
- case E_GADCON_ORIENT_LEFT:
- nx = ny = 0;
- nw = tbar->w;
- nh = tbar->h;
- if (nh > tbar->fwin->h) nh = tbar->fwin->h;
- if (nw > tbar->fwin->w) nw = 32;
- break;
-
- case E_GADCON_ORIENT_RIGHT:
- ny = 0;
- nh = tbar->h;
- nw = tbar->w;
- if (nw > tbar->fwin->w) nw = 32;
- if (nh > tbar->fwin->h) nh = tbar->fwin->h;
- nx = (tbar->fwin->w - tbar->w);
- break;
-
- default:
- break;
- }
- e_toolbar_move_resize(tbar, nx, ny, nw, nh);
+ tbar->minw = nw;
+ tbar->minh = nh;
}
static const char *
E_Fwin *fwin;
Ecore_Event_Handler *fm_op_entry_add_handler;
- Evas_Object *box;
Evas_Object *flist;
Evas_Object *flist_frame;
Evas_Object *scrollframe_obj;
{
if (!fwin->cur_page->tbar)
{
- fwin->cur_page->tbar = e_toolbar_new(e_win_evas_get(fwin->win), "toolbar",
- fwin->win, fwin->cur_page->fm_obj);
- e_toolbar_show(fwin->cur_page->tbar);
+ fwin->cur_page->tbar = e_toolbar_new
+ (e_win_evas_get(fwin->win), "toolbar",
+ fwin->win, fwin->cur_page->fm_obj);
}
}
else
if (fileman_config->view.show_sidebar)
{
if (!fwin->cur_page->flist_frame)
- _e_fwin_page_favorites_add(fwin->cur_page);
+ {
+ _e_fwin_page_favorites_add(fwin->cur_page);
+ edje_object_signal_emit(fwin->bg_obj, "e,favorites,enabled", "e");
+ edje_object_message_signal_process(fwin->bg_obj);
+ }
}
else
{
{
evas_object_del(fwin->cur_page->flist_frame);
fwin->cur_page->flist_frame = fwin->cur_page->flist = NULL;
+ edje_object_signal_emit(fwin->bg_obj, "e,favorites,disabled", "e");
+ edje_object_message_signal_process(fwin->bg_obj);
}
}
_e_fwin_window_title_set(fwin->cur_page);
// o = e_icon_add(e_win_evas_get(fwin->win));
// e_icon_scale_size_set(o, 0);
// e_icon_fill_inside_set(o, 0);
- edje_object_part_swallow(e_scrollframe_edje_object_get(page->scr), "e.swallow.overlay", o);
+ edje_object_part_swallow(e_scrollframe_edje_object_get(page->scr),
+ "e.swallow.overlay", o);
evas_object_pass_events_set(o, 1);
fwin->over_obj = o;
if (fwin->win->evas_win)
e_drop_xdnd_register_set(fwin->win->evas_win, 1);
if (fwin->win->border)
- eina_stringshare_replace(&fwin->win->border->internal_icon, "system-file-manager");
+ eina_stringshare_replace(&fwin->win->border->internal_icon,
+ "system-file-manager");
return fwin;
}
_e_fwin_page_free(fwin->cur_page);
if (fwin->zone)
- {
- evas_object_event_callback_del(fwin->zone->bg_event_object,
- EVAS_CALLBACK_MOUSE_DOWN,
- _e_fwin_zone_cb_mouse_down);
- }
-
+ evas_object_event_callback_del(fwin->zone->bg_event_object,
+ EVAS_CALLBACK_MOUSE_DOWN,
+ _e_fwin_zone_cb_mouse_down);
if (fwin->zone_handler)
ecore_event_handler_del(fwin->zone_handler);
if (fwin->zone_del_handler)
fwin->popup = e_popup_new(zone, 0, 0, 1, 1);
e_popup_ignore_events_set(fwin->popup, 1);
ecore_x_window_shape_input_rectangle_set(fwin->popup->evas_win, 0, 0, 0, 0);
+
bg = edje_object_add(fwin->popup->evas);
- e_theme_edje_object_set(bg, "base/theme/fileman", "e/fileman/default/window/main");
- e_popup_edje_bg_object_set(fwin->popup, bg);
- edje = edje_object_add(fwin->popup->evas);
- e_theme_edje_object_set(edje, "base/theme/borders", "e/widgets/border/pixel/border");
- edje_object_signal_emit(edje, "e,state,focused", "e");
+ e_theme_edje_object_set(bg, "base/theme/fileman",
+ "e/fileman/popup/default");
mw = zone->w * fileman_config->tooltip.size / 100.0;
mh = zone->h * fileman_config->tooltip.size / 100.0;
- /*
- * NO! this causes the filename label to either take up the whole screen or be cut off!!!
- if (fwin->popup_icon->link)
- {
- if (fwin->popup_icon->real_link == NULL)
- snprintf(buf, sizeof(buf), _("%s → %s ⇒ (broken)"), fwin->popup_icon->file, fwin->popup_icon->link);
- else if (fwin->popup_icon->real_link != fwin->popup_icon->link)
- snprintf(buf, sizeof(buf), _("%s → %s ⇒ %s"), fwin->popup_icon->file, fwin->popup_icon->link, fwin->popup_icon->real_link);
- else if (fwin->popup_icon->broken_link)
- snprintf(buf, sizeof(buf), _("%s → %s (broken)"), fwin->popup_icon->file, fwin->popup_icon->link);
- else
- snprintf(buf, sizeof(buf), _("%s → %s"), fwin->popup_icon->file, fwin->popup_icon->link);
- }
- else
- snprintf(buf, sizeof(buf), "%s", fwin->popup_icon->file);
- list = e_widget_framelist_add(fwin->popup->evas, buf, 0);
- */
- list = e_widget_framelist_add(fwin->popup->evas, fwin->popup_icon->label ?: fwin->popup_icon->file, 0);
+ edje_object_part_text_set(bg, "e.text.title",
+ fwin->popup_icon->label ?
+ fwin->popup_icon->label : fwin->popup_icon->file);
+
+ list = e_widget_list_add(fwin->popup->evas, 0, 0);
+
o = e_widget_filepreview_add(fwin->popup->evas, mw, mh, 0);
e_widget_filepreview_path_set(o, buf, fwin->popup_icon->mime);
- e_widget_framelist_object_append(list, o);
+ e_widget_list_object_append(list, o, 1, 0, 0.5);
e_widget_size_min_get(list, &mw, &mh);
edje_extern_object_min_size_set(list, mw, mh);
- edje_object_part_swallow(edje, "e.swallow.client", list);
- edje_object_size_min_calc(edje, &mw, &mh);
- edje_extern_object_min_size_set(edje, mw, mh);
- edje_object_part_swallow(bg, "e.swallow.bg", edje);
+ edje_object_part_swallow(bg, "e.swallow.content", list);
+
edje_object_size_min_calc(bg, &mw, &mh);
evas_object_show(o);
evas_object_show(list);
- evas_object_show(edje);
evas_object_show(bg);
/* prefer tooltip left of icon */
{
E_Fm2_Config fmc;
Evas_Object *o;
- Evas *evas = evas_object_evas_get(page->box);
+ Evas *evas = evas_object_evas_get(page->fwin->bg_obj);
o = e_fm2_add(evas);
evas_object_data_set(o, "fm_page", page);
e_fm2_pan_get,
e_fm2_pan_max_get,
e_fm2_pan_child_size_get);
- e_scrollframe_custom_theme_set(e_widget_scrollframe_object_get(o), "base/theme/fileman",
+ e_scrollframe_custom_theme_set(e_widget_scrollframe_object_get(o),
+ "base/theme/fileman",
"e/fileman/default/scrollframe");
evas_object_propagate_events_set(page->flist, 0);
e_widget_can_focus_set(o, EINA_FALSE);
e_widget_scrollframe_focus_object_set(o, page->flist);
page->flist_frame = o;
- e_widget_size_min_set(o, 128, 128);
- e_widget_list_object_prepend(page->box, o, 1, 0, 0);
+ edje_extern_object_min_size_set(o, 128, 0);
+ edje_object_part_swallow(page->fwin->bg_obj, "e.swallow.favorites", o);
}
static E_Fwin_Page *
page->fwin = fwin;
evas = e_win_evas_get(fwin->win);
- page->box = e_widget_list_add(evas, 0, 1);
-
if (fileman_config->view.show_sidebar)
- _e_fwin_page_favorites_add(page);
+ {
+ _e_fwin_page_favorites_add(page);
+ edje_object_signal_emit(fwin->bg_obj, "e,favorites,enabled", "e");
+ edje_object_message_signal_process(fwin->bg_obj);
+ }
o = e_fm2_add(evas);
page->fm_obj = o;
e_widget_can_focus_set(o, EINA_FALSE);
page->scrollframe_obj = o;
page->scr = e_widget_scrollframe_object_get(o);
- e_scrollframe_custom_theme_set(page->scr, "base/theme/fileman",
+ e_scrollframe_custom_theme_set(o, "base/theme/fileman",
"e/fileman/default/scrollframe");
-// edje_object_part_swallow(fwin->bg_obj, "e.swallow.content", o);
- e_widget_list_object_append(page->box, page->scrollframe_obj, 1, 1, 1);
- evas_object_move(page->box, 0, 0);
- evas_object_show(page->box);
+ edje_object_part_swallow(fwin->bg_obj, "e.swallow.content", o);
if (fileman_config->view.show_toolbar)
- {
- page->tbar = e_toolbar_new(evas, "toolbar",
- fwin->win, page->fm_obj);
- e_toolbar_show(page->tbar);
- }
+ page->tbar = e_toolbar_new(evas, "toolbar",
+ fwin->win, page->fm_obj);
page->fm_op_entry_add_handler =
ecore_event_handler_add(E_EVENT_FM_OP_REGISTRY_ADD,
_e_fwin_op_registry_entry_add_cb, page);
_e_fwin_op_registry_entry_iter(page);
+ _e_fwin_toolbar_resize(page);
return page;
}
{
if (page->fm_obj) evas_object_del(page->fm_obj);
if (page->tbar) e_object_del(E_OBJECT(page->tbar));
- if (page->box) evas_object_del(page->box);
else evas_object_del(page->scrollframe_obj);
if (page->fm_op_entry_add_handler)
static void
_e_fwin_toolbar_resize(E_Fwin_Page *page)
{
- int tx, ty, tw, th, offset = 0;
- int x, y, w, h;
-
- w = page->fwin->win->w;
- h = page->fwin->win->h;
if (!page->tbar)
{
- evas_object_move(page->box, 0, 0);
- evas_object_resize(page->box, w, h);
+ edje_object_signal_emit(page->fwin->bg_obj, "e,toolbar,disabled", "e");
return;
}
switch (page->tbar->gadcon->orient)
{
case E_GADCON_ORIENT_HORIZ:
case E_GADCON_ORIENT_TOP:
- tx = 0;
- ty = offset;
- th = 32;
- tw = w;
-
- x = 0;
- y = offset + th;
- h = (h - offset - th);
+ edje_extern_object_min_size_set(page->tbar->o_base, 0, page->tbar->minh);
+ edje_object_part_swallow(page->fwin->bg_obj, "e.swallow.toolbar", page->tbar->o_base);
+ edje_object_signal_emit(page->fwin->bg_obj, "e,toolbar,top", "e");
break;
-
case E_GADCON_ORIENT_BOTTOM:
- tx = 0;
- th = 32;
- tw = w;
- ty = h - th;
-
- x = 0;
- y = offset;
- h = (h - offset - th);
+ edje_extern_object_min_size_set(page->tbar->o_base, 0, page->tbar->minh);
+ edje_object_part_swallow(page->fwin->bg_obj, "e.swallow.toolbar", page->tbar->o_base);
+ edje_object_signal_emit(page->fwin->bg_obj, "e,toolbar,bottom", "e");
break;
-
case E_GADCON_ORIENT_VERT:
case E_GADCON_ORIENT_LEFT:
- tx = 0;
- tw = 32;
- th = h - offset;
- ty = offset;
-
- x = tw;
- y = offset;
- w = (w - tw);
+ edje_extern_object_min_size_set(page->tbar->o_base, page->tbar->minw, 0);
+ edje_object_part_swallow(page->fwin->bg_obj, "e.swallow.toolbar", page->tbar->o_base);
+ edje_object_signal_emit(page->fwin->bg_obj, "e,toolbar,left", "e");
break;
-
case E_GADCON_ORIENT_RIGHT:
- ty = offset;
- tw = 32;
- tx = w - tw;
- th = h - offset;
-
- x = 0;
- y = offset;
- w = (w - tw);
+ edje_extern_object_min_size_set(page->tbar->o_base, page->tbar->minw, 0);
+ edje_object_part_swallow(page->fwin->bg_obj, "e.swallow.toolbar", page->tbar->o_base);
+ edje_object_signal_emit(page->fwin->bg_obj, "e,toolbar,right", "e");
break;
-
default:
- return;
+ break;
}
- e_toolbar_move_resize(page->tbar, tx, ty, tw, th);
- evas_object_move(page->box, x, y);
- evas_object_resize(page->box, w, h);
+ edje_object_message_signal_process(page->fwin->bg_obj);
}
/* fwin callbacks */
}
if (fwin->under_obj)
{
- edje_object_part_swallow(fwin->bg_obj, "e.swallow.bg", fwin->under_obj);
+ edje_object_part_swallow(e_scrollframe_edje_object_get(page->scr),
+ "e.swallow.bg", fwin->under_obj);
evas_object_pass_events_set(fwin->under_obj, 1);
evas_object_show(fwin->under_obj);
}
evas_object_hide(fwin->over_obj);
if (fwin->overlay_file)
{
- edje_object_file_set(fwin->over_obj, fwin->overlay_file, "e/desktop/background");
+ edje_object_file_set(fwin->over_obj, fwin->overlay_file,
+ "e/desktop/background");
// ext = strrchr(fwin->overlay_file, '.');
// if (ext && !strcasecmp(ext, ".edj"))
// e_icon_file_edje_set(fwin->over_obj, fwin->overlay_file, "e/desktop/background");
if (page->scrollframe_obj)
{
if ((fwin->scrollframe_file) &&
- (e_util_edje_collection_exists(fwin->scrollframe_file, "e/fileman/default/scrollframe")))
+ (e_util_edje_collection_exists(fwin->scrollframe_file,
+ "e/fileman/default/scrollframe")))
e_scrollframe_custom_edje_file_set(page->scr,
(char *)fwin->scrollframe_file,
"e/fileman/default/scrollframe");
projects / platform / upstream / enlightenment.git / commitdiff