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

outdent small block in menu idler

This commit is contained in:
Mike Blumenkrantz 2013-06-21 10:28:22 +01:00
parent bc338ab390
commit c507b36abf
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/bin/e_menu.c
View File

@ -1161,45 +1161,43 @@ e_menu_idler_before(void)
{ {
if (m->frozen) continue; if (m->frozen) continue;
if (!m->realized) _e_menu_realize(m); if (!m->realized) _e_menu_realize(m);
if (m->realized) if (!m->realized) continue;
if (((m->cur.w) != (m->prev.w)) ||
((m->cur.h) != (m->prev.h)))
{ {
if (((m->cur.w) != (m->prev.w)) || int w, h;
((m->cur.h) != (m->prev.h)))
{
int w, h;
m->prev.w = m->cur.w; m->prev.w = m->cur.w;
m->prev.h = m->cur.h; m->prev.h = m->cur.h;
w = m->cur.w; w = m->cur.w;
h = m->cur.h; h = m->cur.h;
if (m->cw) if (m->cw)
e_comp_win_resize(m->cw, w, h); e_comp_win_resize(m->cw, w, h);
} }
if (((m->cur.x) != (m->prev.x)) || if (((m->cur.x) != (m->prev.x)) ||
((m->cur.y) != (m->prev.y))) ((m->cur.y) != (m->prev.y)))
{
if (!m->parent_item)
{ {
if (!m->parent_item) int x, y, w, h;
e_zone_useful_geometry_get(m->zone, &x, &y, &w, &h);
if (m->cur.w <= w)
{ {
int x, y, w, h; if ((m->cur.x + m->cur.w) > (x + w))
m->cur.x = x + w - m->cur.w;
e_zone_useful_geometry_get(m->zone, &x, &y, &w, &h); }
if (m->cur.w <= w) if (m->cur.h <= h)
{ {
if ((m->cur.x + m->cur.w) > (x + w)) if ((m->cur.y + m->cur.h) > (y + h))
m->cur.x = x + w - m->cur.w; m->cur.y = y + h - m->cur.h;
}
if (m->cur.h <= h)
{
if ((m->cur.y + m->cur.h) > (y + h))
m->cur.y = y + h - m->cur.h;
}
} }
m->prev.x = m->cur.x;
m->prev.y = m->cur.y;
if (m->cw)
e_comp_win_move(m->cw, m->cur.x, m->cur.y);
} }
m->prev.x = m->cur.x;
m->prev.y = m->cur.y;
if (m->cw)
e_comp_win_move(m->cw, m->cur.x, m->cur.y);
} }
} }
/* phase 3. show all the menus that want to be shown */ /* phase 3. show all the menus that want to be shown */