Changeset 48 for psi/trunk/src/common.cpp

Timestamp:

09/11/06 00:08:07 (2 years ago)

Author:

dmik

Message:

Psi: General: bringToFront() can now move a window from an inactive (invisible) XPager's page to the current (visible) one (using a bit hackish trick).

Files:

• psi/trunk/src/common.cpp (modified) (3 diffs)

psi/trunk/src/common.cpp

@@ -1744 +1744 @@
 void bringToFront(QWidget *w, bool grabFocus /* = true */)
 {
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11)
         // If we're not on the current desktop, do the hide/show trick
         long dsk, curr_dsk;
@@ -1754 +1754 @@
                 }
         }
-
+#else
         // FIXME: multi-desktop hacks for Win and Mac required
 #endif
@@ -1777 +1777 @@
                 w->raise();
 #endif
+
+#if defined(Q_WS_PM)
+        // When the widget is totally outside the screen bounds after making it shown,
+        // we assume it's on a different (invisible) XPager's page. The assumption is
+        // not so safe, but is there any other way to determine XPager is in action?..
+        QRect geo = w->frameGeometry();
+        QRect scrGeo = qApp->desktop()->screenGeometry();
+        if (!w->isMinimized() && !scrGeo.contains(geo)) {
+                // We assume that XPager stores invisible pages in the coordinate space
+                // beyond (0,0)x(screen_width,screen_height) wiht a 8 px gap between
+                // pages. Move it to the visible page.
+                int sw = scrGeo.width() + 8;
+                int sh = scrGeo.height() + 8;
+                int x = geo.x() % sw;
+                if (x < 0) x = sw + x;
+                int y = geo.y() % sh;
+                if (y < 0) y = sh + y;
+                w->move (x, y);
+        }
+#endif
 }