Changeset 70756 in vbox

Timestamp:

Jan 26, 2018 10:06:28 AM (7 years ago)

Author:

vboxsync

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

120525

Message:

FE/Qt bugref:9027 Set wm_class after vm window transparancy settings to fix seamless mode issue

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/UIMachineWindow.cpp (modified) (3 diffs)
• selector/UISelectorWindow.cpp (modified) (1 diff)

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

@@ -96 +96 @@
 void UIMachineWindow::prepare()
 {
+    /* Prepare session-connections: */
+    prepareSessionConnections();
+
+    /* Prepare main-layout: */
+    prepareMainLayout();
+
+    /* Prepare menu: */
+    prepareMenu();
+
+    /* Prepare status-bar: */
+    prepareStatusBar();
+
+    /* Prepare visual-state: */
+    prepareVisualState();
+
+    /* Prepare machine-view: */
+    prepareMachineView();
+
+    /* Prepare handlers: */
+    prepareHandlers();
+
+    /* Load settings: */
+    loadSettings();
+
+    /* Retranslate window: */
+    retranslateUi();
+
+    /* Show (must be done before updating the appearance): */
+    showInNecessaryMode();
+
+    /* Update all the elements: */
+    updateAppearanceOf(UIVisualElement_AllStuff);
+
 #ifdef VBOX_WS_X11
     /* Prepare default class/name values: */
@@ -104 +137 @@
         strWindowName = QString("VirtualBox Machine UUID: %1").arg(vboxGlobal().managedVMUuid());
     /* Assign WM_CLASS property: */
-    vboxGlobal().setWMClass(this, strWindowName, strWindowClass);
+    VBoxGlobal::setWMClass(this, strWindowName, strWindowClass);
 #endif
-
-    /* Prepare session-connections: */
-    prepareSessionConnections();
-
-    /* Prepare main-layout: */
-    prepareMainLayout();
-
-    /* Prepare menu: */
-    prepareMenu();
-
-    /* Prepare status-bar: */
-    prepareStatusBar();
-
-    /* Prepare visual-state: */
-    prepareVisualState();
-
-    /* Prepare machine-view: */
-    prepareMachineView();
-
-    /* Prepare handlers: */
-    prepareHandlers();
-
-    /* Load settings: */
-    loadSettings();
-
-    /* Retranslate window: */
-    retranslateUi();
-
-    /* Show (must be done before updating the appearance): */
-    showInNecessaryMode();
-
-    /* Update all the elements: */
-    updateAppearanceOf(UIVisualElement_AllStuff);
 }
 
@@ -631 +631 @@
 }
 #endif /* VBOX_WS_MAC */
-

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -1371 +1371 @@
 #ifdef VBOX_WS_X11
     /* Assign same name to both WM_CLASS name & class for now: */
-    vboxGlobal().setWMClass(this, "VirtualBox Manager", "VirtualBox Manager");
+    VBoxGlobal::setWMClass(this, "VirtualBox Manager", "VirtualBox Manager");
 #endif