discomfitor pushed a commit to branch master.
commit c507b36abf24cc07fcab2837d21159b982eb596a
Author: Mike Blumenkrantz <[email protected]>
Date: Fri Jun 21 10:28:22 2013 +0100
outdent small block in menu idler
---
src/bin/e_menu.c | 66 +++++++++++++++++++++++++++-----------------------------
1 file changed, 32 insertions(+), 34 deletions(-)
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 54dd1f0..cff4eaf 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -1161,45 +1161,43 @@ e_menu_idler_before(void)
{
if (m->frozen) continue;
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)) ||
- ((m->cur.h) != (m->prev.h)))
- {
- int w, h;
-
- m->prev.w = m->cur.w;
- m->prev.h = m->cur.h;
- w = m->cur.w;
- h = m->cur.h;
- if (m->cw)
- e_comp_win_resize(m->cw, w, h);
- }
- if (((m->cur.x) != (m->prev.x)) ||
- ((m->cur.y) != (m->prev.y)))
+ int w, h;
+
+ m->prev.w = m->cur.w;
+ m->prev.h = m->cur.h;
+ w = m->cur.w;
+ h = m->cur.h;
+ if (m->cw)
+ e_comp_win_resize(m->cw, w, h);
+ }
+ if (((m->cur.x) != (m->prev.x)) ||
+ ((m->cur.y) != (m->prev.y)))
+ {
+ if (!m->parent_item)
{
- if (!m->parent_item)
- {
- int x, y, w, h;
+ int x, y, w, h;
- e_zone_useful_geometry_get(m->zone, &x, &y, &w, &h);
- if (m->cur.w <= w)
- {
- if ((m->cur.x + m->cur.w) > (x + w))
- m->cur.x = x + w - m->cur.w;
- }
- if (m->cur.h <= h)
- {
- if ((m->cur.y + m->cur.h) > (y + h))
- m->cur.y = y + h - m->cur.h;
- }
+ e_zone_useful_geometry_get(m->zone, &x, &y, &w, &h);
+ if (m->cur.w <= w)
+ {
+ if ((m->cur.x + m->cur.w) > (x + w))
+ m->cur.x = x + w - m->cur.w;
+ }
+ 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 */
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
