Changeset 21479 in vbox for trunk/src

Timestamp:

Jul 10, 2009 1:22:57 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: remove all ARGB hacks again

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxConsoleView.cpp (modified) (1 diff)
• VBoxConsoleWnd.cpp (modified) (1 diff)
• VBoxFrameBuffer.cpp (modified) (1 diff)
• VBoxGlobal.cpp (modified) (1 diff)

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

@@ -686 +686 @@
     {
         /* No need for background drawing */
-//        setAttribute (Qt::WA_OpaquePaintEvent);
+        setAttribute (Qt::WA_OpaquePaintEvent);
     }
     virtual QPaintEngine * paintEngine() const
     {
-//        if (testAttribute (Qt::WA_PaintOnScreen))
-//            return NULL;
-//        else
+        if (testAttribute (Qt::WA_PaintOnScreen))
+            return NULL;
+        else
             return QWidget::paintEngine();
     }

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

@@ -807 +807 @@
     AssertWrapperOk (csession);
 
-#ifdef Q_WS_X11
-    setenv ("XLIB_SKIP_ARGB_VISUALS", "1", 1);
-#endif
     console = new VBoxConsoleView (this, cconsole, mode, centralWidget());
-#ifdef Q_WS_X11
-    unsetenv ("XLIB_SKIP_ARGB_VISUALS");
-#endif
     static_cast <QGridLayout*> (centralWidget()->layout())->addWidget (console, 1, 1, Qt::AlignVCenter | Qt::AlignHCenter);
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFrameBuffer.cpp

@@ -297 +297 @@
     VBoxFrameBuffer (aView)
 {
-    /* There are some buggy/strange driver/compiz combinations which lead to
-     * transparent backgrounds on ARGB visuals. Try to fix it by painting
-     * always a black background. */
-    aView->viewport()->setAttribute (Qt::WA_OpaquePaintEvent, false);
-    aView->viewport()->setAttribute (Qt::WidgetAttribute(120), false);
-    aView->viewport()->setAttribute (Qt::WA_NoSystemBackground, false);
-    QPalette pal = aView->viewport()->palette();
-    pal.setColor (QPalette::Window, Qt::black);
-    aView->viewport()->setPalette (pal);
     /* Initialize the framebuffer the first time */
     resizeEvent (new VBoxResizeEvent (FramebufferPixelFormat_Opaque,

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -722 +722 @@
          *  from the below constructor or from constructors/methods it calls.
          */
-#ifdef Q_WS_X11
-        setenv ("XLIB_SKIP_ARGB_VISUALS", "1", 1);
-#endif
         VBoxConsoleWnd *w = new VBoxConsoleWnd (&mConsoleWnd, 0);
         Assert (w == mConsoleWnd);
         NOREF(w);
-#ifdef Q_WS_X11
-        unsetenv ("XLIB_SKIP_ARGB_VISUALS");
-#endif
     }