[EGIT] [e16/e16] master 01/02: Slightly different fix to pager zoom/focus issue.

[Kim Woelders]

kwo pushed a commit to branch master.

http://git.enlightenment.org/e16/e16.git/commit/?id=45bf0da80df6d0db0de043c8860c238e8fd7c98d

commit 45bf0da80df6d0db0de043c8860c238e8fd7c98d
Author: Kim Woelders <k...@woelders.dk>
Date:   Mon Mar 23 19:27:53 2015 +0100

    Slightly different fix to pager zoom/focus issue.
---
 src/hiwin.c | 8 ++++----
 src/hiwin.h | 2 +-
 src/pager.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hiwin.c b/src/hiwin.c
index 8df5572..c3b8bd5 100644
--- a/src/hiwin.c
+++ b/src/hiwin.c
@@ -27,7 +27,6 @@
 
 #include "E.h"
 #include "cursors.h"
-#include "desktops.h"
 #include "eobj.h"
 #include "events.h"
 #include "ewins.h"
@@ -265,7 +264,7 @@ HiwinSetGeom(Hiwin * phi, int x, int y, int w, int h)
 }
 
 void
-HiwinInit(Hiwin * phi, EWin * ewin)
+HiwinInit(Hiwin * phi, EWin * ewin, EObj * parent)
 {
    if (ewin == phi->ewin)
       return;
@@ -281,7 +280,8 @@ HiwinInit(Hiwin * phi, EWin * ewin)
 #endif
 
    phi->ewin = ewin;
-   EoReparent(phi, EoObj(DesksGetCurrent()), 0, 0);
+   if (parent)
+      EoReparent(phi, parent, 0, 0);
 
 #if USE_COMPOSITE
    if (phi->ewin)
@@ -342,7 +342,7 @@ HiwinHide(Hiwin * phi)
    if (EoIsShown(phi))
      {
        GrabPointerRelease();
-       HiwinInit(phi, NULL);
+       HiwinInit(phi, NULL, NULL);
        EoUnmap(phi);
      }
 
diff --git a/src/hiwin.h b/src/hiwin.h
index 522b010..03f0715 100644
--- a/src/hiwin.h
+++ b/src/hiwin.h
@@ -30,7 +30,7 @@ typedef struct _hiwin Hiwin;
 
 Hiwin              *HiwinCreate(void);
 void                HiwinSetGeom(Hiwin * phi, int x, int y, int w, int h);
-void                HiwinInit(Hiwin * phi, EWin * ewin);
+void                HiwinInit(Hiwin * phi, EWin * ewin, EObj * parent);
 void                HiwinSetCallback(Hiwin * phi,
                                     void (*func) (Win win, XEvent * ev,
                                                   void *data), void *data);
diff --git a/src/pager.c b/src/pager.c
index cf0387c..e661058 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -1130,7 +1130,7 @@ PagerHiwinInit(Pager * p, EWin * ewin)
    wh = (EoGetH(ewin) * p->dh) / WinGetH(VROOT);
    ETranslateCoordinates(p->win, VROOT, 0, 0, &px, &py, NULL);
 
-   HiwinInit(phi, ewin);
+   HiwinInit(phi, ewin, EoObj(EoGetDesk(p->ewin)));
    HiwinSetGeom(phi, px + wx, py + wy, ww, wh);
    HiwinSetCallback(phi, PagerHiwinEvent, p);
 }

--