[EGIT] [core/enlightenment] master 02/02: Bugfix: e fileman: Fixe information popup placement.

[Chidambar Zinnoury]

illogict pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=07cd656320c08018621188feb2a84e6ae0ab3c3f

commit 07cd656320c08018621188feb2a84e6ae0ab3c3f
Author: Chidambar Zinnoury <chidambar.zinno...@zefla.fr>
Date:   Mon Apr 21 19:36:37 2014 +0200

     Bugfix: e fileman: Fixe information popup placement.
    
    – Use zone coordinates on desktop icons to have the popup placed where it 
should be with multiple screens.
    – Use correct window content coordinates to account for the client frame.
---
 src/modules/fileman/e_fwin.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 2230a51..7c29d09 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -833,10 +833,13 @@ _e_fwin_icon_popup(void *data)
    zone = fwin->zone ?: fwin->win->client->zone;
    e_fm2_icon_geometry_get(fwin->popup_icon->ic, &x, &y, &w, &h);
    if (fwin->zone)
-     evas_object_geometry_get(fwin->popup_icon->fm, &fx, &fy, NULL, NULL);
+     {
+        evas_object_geometry_get(fwin->popup_icon->fm, &fx, &fy, NULL, NULL);
+        fx -= zone->x, fy -= zone->y;
+     }
    else
-     fx = fwin->win->client->x, fy = fwin->win->client->y;
-   
+     fx = fwin->win->client->client.x, fy = fwin->win->client->client.y;
+
    bg = edje_object_add(e_comp_get(zone)->evas);
    e_theme_edje_object_set(bg, "base/theme/fileman",
                            "e/fileman/popup/default");
@@ -862,7 +865,7 @@ _e_fwin_icon_popup(void *data)
    /* prefer tooltip left of icon */
    px = (fx + x) - mw - 3;
    /* if it's offscreen, try right of icon */
-   if (px < 0) px = (fx + x + w) + 3;
+   if (px < zone->x) px = (fx + x + w) + 3;
    /* fuck this, stick it right on the icon */
    if ((px + mw + 3 > zone->x + zone->w) && (!e_zone_exists_direction(zone, 
E_ZONE_EDGE_RIGHT)))
      px = (x + w / 2) - (mw / 2);
@@ -872,7 +875,7 @@ _e_fwin_icon_popup(void *data)
    /* prefer tooltip above icon */
    py = (fy + y) - mh - 3;
    /* if it's offscreen, try below icon */
-   if (py < 0) py = (fy + y + h) + 3;
+   if (py < zone->y) py = (fy + y + h) + 3;
    /* fuck this, stick it right on the icon */
    if ((py + mh + 3 > zone->x + zone->h) && (!e_zone_exists_direction(zone, 
E_ZONE_EDGE_BOTTOM)))
      py = (y + h / 2) - (mh / 2);

--