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

e17/evry: only show gadget windowed in illume. 

SVN revision: 63060
This commit is contained in:
Hannes Janetzek 2011-09-01 16:32:55 +00:00
parent bbd1b1303e
commit 9c3d03e3d1
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/modules/everything/evry_gadget.c
View File

@ -229,23 +229,35 @@ _button_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
{ {
win = inst->win; win = inst->win;
bd = win->ewin->border; bd = win->ewin->border;
/* evry_hide(win, 0); */
if (ev->flags == EVAS_BUTTON_DOUBLE_CLICK) if (!bd->focused)
{
evry_hide(win, 0);
}
else
{ {
e_border_show(bd); e_border_show(bd);
e_border_raise(bd); e_border_raise(bd);
e_border_focus_set(bd, 1, 1); e_border_focus_set(bd, 1, 1);
return;
}
else
{
evry_hide(win, 1);
return;
} }
return;
} }
/* hack to find out out if illume is running, dont grab if
this is the case... */
int show_windowed = 0;
Eina_List *l;
E_Module *m;
EINA_LIST_FOREACH(e_module_list(), l, m)
if (!strcmp(m->name, "illume2") && m->enabled)
break;
if (m) show_windowed = 1;
win = evry_show(e_util_zone_current_get(e_manager_current_get()), win = evry_show(e_util_zone_current_get(e_manager_current_get()),
0, inst->cfg->plugin, EINA_FALSE); 0, inst->cfg->plugin, !show_windowed);
if (!win) return; if (!win) return;
ecore_x_netwm_window_type_set(win->ewin->evas_win, ecore_x_netwm_window_type_set(win->ewin->evas_win,
@ -298,13 +310,16 @@ _button_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
if (win->ewin->y + ph > win->zone->h) if (win->ewin->y + ph > win->zone->h)
e_win_move(win->ewin, win->ewin->x, win->zone->h - ph); e_win_move(win->ewin, win->ewin->x, win->zone->h - ph);
if (show_windowed)
e_win_show(win->ewin); {
bd = win->ewin->border; e_win_show(win->ewin);
e_border_focus_set(bd, 1, 1); bd = win->ewin->border;
/* bd->client.netwm.state.skip_taskbar = 1; */ e_border_focus_set(bd, 1, 1);
bd->client.netwm.state.skip_pager = 1; /* bd->client.netwm.state.skip_taskbar = 1; */
bd->sticky = 1; bd->client.netwm.state.skip_pager = 1;
bd->sticky = 1;
}
inst->win = win; inst->win = win;
e_gadcon_locked_set(inst->gcc->gadcon, 1); e_gadcon_locked_set(inst->gcc->gadcon, 1);