Changeset 52796 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Sep 19, 2014 3:26:52 PM (10 years ago)

Author:

vboxsync

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

96190

Message:

FE/Qt: Runtime UI: Reverting r95753 because this functionality still required.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/runtime/normal/UIMachineWindowNormal.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -110 +110 @@
         $(if $(VBOX_GUI_WITH_HIDPI),VBOX_GUI_WITH_HIDPI) \
         $(if $(VBOX_GUI_WITH_PIDFILE),VBOX_GUI_WITH_PIDFILE) \
-        $(if $(VBOX_GUI_WITH_KEYS_RESET_HANDLER),VBOX_GUI_WITH_KEYS_RESET_HANDLER)
+        $(if $(VBOX_GUI_WITH_KEYS_RESET_HANDLER),VBOX_GUI_WITH_KEYS_RESET_HANDLER) \
+        $(if $(VBOX_GUI_WITH_CUSTOMIZATIONS1),VBOX_GUI_WITH_CUSTOMIZATIONS1)
 ifdef VBOX_WITH_DEBUGGER_GUI
  VirtualBox_DEFS        += VBOX_WITH_DEBUGGER_GUI

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -292 +292 @@
     /* Call to base-class: */
     UIMachineWindow::prepareVisualState();
+
+#ifdef VBOX_GUI_WITH_CUSTOMIZATIONS1
+    /* Customer request: The background has to go black: */
+    QPalette palette(centralWidget()->palette());
+    palette.setColor(centralWidget()->backgroundRole(), Qt::black);
+    centralWidget()->setPalette(palette);
+    centralWidget()->setAutoFillBackground(true);
+    setAutoFillBackground(true);
+#endif /* VBOX_GUI_WITH_CUSTOMIZATIONS1 */
 
 #ifdef Q_WS_MAC
@@ -453 +462 @@
 void UIMachineWindowNormal::normalizeGeometry(bool fAdjustPosition)
 {
+#ifndef VBOX_GUI_WITH_CUSTOMIZATIONS1
     /* Skip if maximized: */
     if (isMaximized())
@@ -484 +494 @@
     setGeometry(frameGeo.left() + dl, frameGeo.top() + dt,
                 frameGeo.width() - dl - dr, frameGeo.height() - dt - db);
+#else /* VBOX_GUI_WITH_CUSTOMIZATIONS1 */
+    /* Customer request: There should no be
+     * machine-window resize on machine-view resize: */
+    Q_UNUSED(fAdjustPosition);
+#endif /* VBOX_GUI_WITH_CUSTOMIZATIONS1 */
 }