Changeset 54747 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter

Timestamp:

Mar 13, 2015 3:57:53 PM (10 years ago)

Author:

vboxsync

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

98921

Message:

Host 3D: prevent Presentation Framework assertion when setting scale factor.

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter

Files:

• server_presenter.h (modified) (1 diff)
• window.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/server_presenter.h

@@ -212 +212 @@
         int SetVisible(bool fVisible);
         int SetSize(uint32_t width, uint32_t height, bool fForced=false);
-        int SetPosition(int32_t x, int32_t y);
+        int SetPosition(int32_t x, int32_t y, bool fForced=false);
         int SetVisibleRegionsChanged();
         int SetCompositor(const struct VBOXVR_SCR_COMPOSITOR * pCompositor);

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/window.cpp

@@ -173 +173 @@
 
 
-int CrFbWindow::SetPosition(int32_t x, int32_t y)
-{
-    if (!checkInitedUpdating())
+int CrFbWindow::SetPosition(int32_t x, int32_t y, bool fForced)
+{
+    if (!fForced && !checkInitedUpdating())
     {
         crDebug("CrFbWindow: SetPosition request dropped because window is currently updating (x=%d, y=%d).", x, y);
@@ -253 +253 @@
          * events since they might not be running or installed at all. */
         SetSize(mWidth, mHeight, true);
-        SetPosition(mxPos, myPos);
+        SetPosition(mxPos, myPos, true);
 
         return true;