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

Timestamp:

Aug 6, 2014 4:37:41 PM (11 years ago)

Author:

vboxsync

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

95410

Message:

FE/Qt: Runtime UI: More wise window-flags substitution for various visual states.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineLogic.h (modified) (1 diff)
• UIMachineWindow.cpp (modified) (2 diffs)
• UIMachineWindow.h (modified) (1 diff)
• fullscreen/UIMachineLogicFullscreen.h (modified) (1 diff)
• normal/UIMachineLogicNormal.h (modified) (1 diff)
• scale/UIMachineLogicScale.h (modified) (1 diff)
• seamless/UIMachineLogicSeamless.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -68 +68 @@
     /* Check if this logic is available: */
     virtual bool checkAvailability() = 0;
+
+    /** Returns machine-window flags for current machine-logic and passed @a uScreenId. */
+    virtual Qt::WindowFlags windowFlags(ulong uScreenId) const = 0;
 
     /* Prepare/cleanup the logic: */

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

@@ -164 +164 @@
 
 UIMachineWindow::UIMachineWindow(UIMachineLogic *pMachineLogic, ulong uScreenId)
-    : QIWithRetranslateUI2<QMainWindow>(0, windowFlags(pMachineLogic->visualStateType()))
+    : QIWithRetranslateUI2<QMainWindow>(0, pMachineLogic->windowFlags(uScreenId))
     , m_pMachineLogic(pMachineLogic)
     , m_pMachineView(0)
@@ -496 +496 @@
 
 /* static */
-Qt::WindowFlags UIMachineWindow::windowFlags(UIVisualStateType visualStateType)
-{
-    switch (visualStateType)
-    {
-        case UIVisualStateType_Normal: return Qt::Window;
-        case UIVisualStateType_Fullscreen: return Qt::FramelessWindowHint;
-        case UIVisualStateType_Seamless: return Qt::FramelessWindowHint;
-        case UIVisualStateType_Scale: return Qt::Window;
-    }
-    AssertMsgFailed(("Incorrect visual state!"));
-    return 0;
-}
-
-/* static */
 Qt::Alignment UIMachineWindow::viewAlignment(UIVisualStateType visualStateType)
 {

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

@@ -136 +136 @@
     /* Helpers: */
     const QString& defaultWindowTitle() const { return m_strWindowTitlePrefix; }
-    static Qt::WindowFlags windowFlags(UIVisualStateType visualStateType);
     static Qt::Alignment viewAlignment(UIVisualStateType visualStateType);
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.h

@@ -50 +50 @@
     /* Check if this logic is available: */
     bool checkAvailability();
+
+    /** Returns machine-window flags for 'Fullscreen' machine-logic and passed @a uScreenId. */
+    virtual Qt::WindowFlags windowFlags(ulong uScreenId) const { Q_UNUSED(uScreenId); return Qt::FramelessWindowHint; }
 
     /* Helpers: Multi-screen stuff: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.h

@@ -34 +34 @@
     bool checkAvailability();
 
+    /** Returns machine-window flags for 'Normal' machine-logic and passed @a uScreenId. */
+    virtual Qt::WindowFlags windowFlags(ulong uScreenId) const { Q_UNUSED(uScreenId); return Qt::Window; }
+
 private slots:
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.h

@@ -33 +33 @@
     /* Check if this logic is available: */
     bool checkAvailability();
+
+    /** Returns machine-window flags for 'Scale' machine-logic and passed @a uScreenId. */
+    virtual Qt::WindowFlags windowFlags(ulong uScreenId) const { Q_UNUSED(uScreenId); return Qt::Window; }
 
 #ifndef RT_OS_DARWIN

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.h

@@ -37 +37 @@
     /* Check if this logic is available: */
     bool checkAvailability();
+
+    /** Returns machine-window flags for 'Seamless' machine-logic and passed @a uScreenId. */
+    virtual Qt::WindowFlags windowFlags(ulong uScreenId) const { Q_UNUSED(uScreenId); return Qt::FramelessWindowHint; }
 
     /* Helpers: Multi-screen stuff: */