Changeset 12007 in vbox

Timestamp:

Sep 2, 2008 7:12:42 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

35918

Message:

Fe/Qt4: One more try to fix the seamless.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxConsoleWnd.h (modified) (1 diff)
• src/VBoxConsoleView.cpp (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleWnd.h

@@ -83 +83 @@
     void setMask (const QRegion &aRegion);
 
+    void clearMask();
+
 #ifdef Q_WS_MAC
     CGImageRef dockImageState () const;

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp

@@ -1176 +1176 @@
                          !mMainWnd->isTrueSeamless())
                     mLastVisibleRegion = QRegion();
-
-                if (!mMainWnd->isTrueSeamless())
-                    mMainWnd->clearMask();
                 return true;
             }

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

@@ -2211 +2211 @@
 
         /* Adjust colors and appearance. */
+        clearMask();
         centralWidget()->setPalette (mErasePalette);
-        centralWidget()->setAutoFillBackground (true);
+        centralWidget()->setAutoFillBackground (false);
         console->setFrameStyle (console_style);
         console->setMaximumSize (console->sizeHint());
@@ -2297 +2298 @@
         hide();
 #endif
-    clearMask();
     return true;
 }
@@ -2842 +2842 @@
 #else
     QMainWindow::setMask (region);
+#endif
+}
+
+void VBoxConsoleWnd::clearMask()
+{
+#ifdef Q_WS_WIN
+    SetWindowRgn (winId(), 0, TRUE);
+#else
+    QMainWindow::clearMask();
 #endif
 }