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

Timestamp:

Oct 29, 2015 2:28:05 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Runtime UI: Wipe out dock state overlay code for now.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin

Files:

• UIAbstractDockIconPreview.cpp (modified) (4 diffs)
• UIAbstractDockIconPreview.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp

@@ -74 +74 @@
     m_overlayImage   = ::darwinToCGImageRef(&overlayImage);
     Assert(m_overlayImage);
-
-    /* Determine desired icon size for the state-overlay: */
-    const QStyle *pStyle = QApplication::style();
-    const int iIconMetric = pStyle->pixelMetric(QStyle::PM_SmallIconSize);
-    const QSize iconSize = QSize(iIconMetric, iIconMetric);
-
-    /* Prepare 'Paused' state-overlay: */
-    const QPixmap statePaused = gpConverter->toIcon(KMachineState_Paused).pixmap(iconSize);
-    m_statePaused = ::darwinToCGImageRef(&statePaused);
-    Assert(m_statePaused);
-
-    /* Prepare 'Saving' state-overlay: */
-    const QPixmap stateSaving = gpConverter->toIcon(KMachineState_Saving).pixmap(iconSize);
-    m_stateSaving = ::darwinToCGImageRef(&stateSaving);
-    Assert(m_stateSaving);
-
-    /* Prepare 'Restoring' state-overlay: */
-    const QPixmap stateRestoring = gpConverter->toIcon(KMachineState_Restoring).pixmap(iconSize);
-    m_stateRestoring = ::darwinToCGImageRef(&stateRestoring);
-    Assert(m_stateRestoring);
 }
 
@@ -113 +93 @@
     if (m_dockMonitorGlossy)
         CGImageRelease(m_dockMonitorGlossy);
-
-    CGImageRelease(m_statePaused);
-    CGImageRelease(m_stateSaving);
-    CGImageRelease(m_stateRestoring);
 }
 
@@ -143 +119 @@
 }
 
-CGImageRef UIAbstractDockIconPreviewHelper::stateImage() const
-{
-    CGImageRef img;
-    if (   m_pSession->machineState() == KMachineState_Paused
-        || m_pSession->machineState() == KMachineState_TeleportingPausedVM)
-        img = m_statePaused;
-    else if (   m_pSession->machineState() == KMachineState_Restoring
-             || m_pSession->machineState() == KMachineState_TeleportingIn)
-        img = m_stateRestoring;
-    else if (   m_pSession->machineState() == KMachineState_Saving
-             || m_pSession->machineState() == KMachineState_LiveSnapshotting)
-        img = m_stateSaving;
-    else
-        img = NULL;
-    return img;
-}
-
 void UIAbstractDockIconPreviewHelper::drawOverlayIcons(CGContextRef context)
 {
@@ -177 +136 @@
             CGContextDrawImage(context, flipRect(overlayRect), m_overlayImage);
         }
-
-        /* Determine correct state-overlay image: */
-        CGImageRef sImage = stateImage();
-        /* Make sure state-overlay image is valid: */
-        if (sImage)
-        {
-            /* Draw state overlay image at top-left of guest-os overlay image: */
-            CGRect stateRect = CGRectMake(overlayRect.origin.x - CGImageGetWidth(sImage) / 2.0,
-                                          overlayRect.origin.y - CGImageGetHeight(sImage) / 2.0,
-                                          CGImageGetWidth(sImage),
-                                          CGImageGetHeight(sImage));
-            CGContextDrawImage(context, flipRect(stateRect), sImage);
-        }
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.h

@@ -49 +49 @@
     virtual ~UIAbstractDockIconPreviewHelper();
     void initPreviewImages();
-    inline CGImageRef stateImage() const;
     void drawOverlayIcons(CGContextRef context);
 
@@ -67 +66 @@
     CGImageRef m_dockMonitorGlossy;
 
-    CGImageRef m_statePaused;
-    CGImageRef m_stateSaving;
-    CGImageRef m_stateRestoring;
-
     CGRect m_updateRect;
     CGRect m_monitorRect;