Changeset 53857 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 16, 2015 2:38:01 PM (10 years ago)

Author:

vboxsync

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

97681

Message:

FE/Qt: 6278: Support for scaled video-output: 3D Acceleration support.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -27 +27 @@
 # include <QScrollBar>
 # include <QMainWindow>
-# include <iprt/asm.h>
 
 /* GUI includes: */
@@ -44 +43 @@
 # include "UIMachineViewScale.h"
 # include "UIExtraDataManager.h"
-
 # ifdef VBOX_WITH_DRAG_AND_DROP
 #  include "UIDnDHandler.h"
@@ -53 +51 @@
 # include "CConsole.h"
 # include "CDisplay.h"
+# include "CFramebuffer.h"
 # ifdef VBOX_WITH_DRAG_AND_DROP
 #  include "CDnDSource.h"
 #  include "CDnDTarget.h"
 #  include "CGuest.h"
+#  include "CGuestDnDSource.h"
+#  include "CGuestDnDTarget.h"
 # endif /* VBOX_WITH_DRAG_AND_DROP */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
+
+/* Other VBox includes: */
+#include <iprt/asm.h>
+#include <VBox/VBoxOGL.h>
 #include <VBox/VBoxVideo.h>
 
-#include "CFramebuffer.h"
-#ifdef VBOX_WITH_DRAG_AND_DROP
-# include "CGuestDnDTarget.h"
-# include "CGuestDnDSource.h"
-#endif
-
-
-/* Other VBox includes: */
 #ifdef Q_WS_X11
 # include <X11/XKBlib.h>
@@ -243 +240 @@
             const double dScaleFactor = gEDataManager->scaleFactor(vboxGlobal().managedVMUuid());
             frameBuffer()->setScaledSize(dScaleFactor == 1.0 ? QSize() : QSize(iWidth * dScaleFactor, iHeight * dScaleFactor));
+            display().NotifyScaleFactorChange(m_uScreenId,
+                                              (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
+                                              (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
         }
 
@@ -514 +514 @@
                                       QSize(m_pFrameBuffer->width() * dScaleFactor,
                                             m_pFrameBuffer->height() * dScaleFactor));
+        display().NotifyScaleFactorChange(m_uScreenId,
+                                          (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
+                                          (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
         uisession()->setFrameBuffer(screenId(), m_pFrameBuffer);
     }
@@ -559 +562 @@
                                      QSize(frameBuffer()->width() * dScaleFactor,
                                            frameBuffer()->height() * dScaleFactor));
+        display().NotifyScaleFactorChange(m_uScreenId,
+                                          (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER),
+                                          (uint32_t)(dScaleFactor * VBOX_OGL_SCALE_FACTOR_MULTIPLIER));
     }
 }