VirtualBox

Changeset 98421 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Feb 2, 2023 9:21:40 AM (23 months ago)
Author:
vboxsync
Message:

Merging r155511 from gui4 branch: FE/Qt: Runtime UI: Pass uimachine instead of uisession to dock icon preview object.

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:mergeinfo

      •  

        old new  
        1919/branches/dsen/gui2:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
        2020/branches/dsen/gui3:79645-79692
        21 /branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155510
         21/branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155511
        2222/trunk/src:92342,154921

  • trunk/src/VBox

    • Property svn:mergeinfo

      •  

        old new  
        1919/branches/dsen/gui2/src/VBox:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
        2020/branches/dsen/gui3/src/VBox:79645-79692
        21 /branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155510
         21/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155511

  • trunk/src/VBox/Frontends

    • Property svn:mergeinfo

      •  

        old new  
        1616/branches/dsen/gui2/src/VBox/Frontends:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
        1717/branches/dsen/gui3/src/VBox/Frontends:79645-79692
        18 /branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155510
         18/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288,155311,155316,155336,155342,155344,155437-155438,155441,155443,155488,155509-155511

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/DockIconPreview.h

    r98103 r98421  
    4141public:
    4242
    43     /** Constructor taking passed @a pSession and @a overlayImage. */
    44     UIDockIconPreview(UISession *pSession, const QPixmap& overlayImage)
    45         : UICocoaDockIconPreview(pSession, overlayImage) {}
     43    /** Constructor taking passed @a pMachine and @a overlayImage. */
     44    UIDockIconPreview(UIMachine *pMachine, const QPixmap& overlayImage)
     45        : UICocoaDockIconPreview(pMachine, overlayImage) {}
    4646};
    4747

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

    r98103 r98421  
    3131/* GUI includes: */
    3232#include "UIAbstractDockIconPreview.h"
     33#include "UICommon.h"
    3334#include "UIConverter.h"
    3435#include "UIExtraDataManager.h"
    3536#include "UIFrameBuffer.h"
     37#include "UIMachine.h"
    3638#include "UIMachineLogic.h"
    3739#include "UIMachineView.h"
    38 #include "UISession.h"
    39 #include "UICommon.h"
    4040
    4141/* COM includes: */
    … …  
    4343
    4444
    45 UIAbstractDockIconPreview::UIAbstractDockIconPreview(UISession * /* pSession */, const QPixmap& /* overlayImage */)
     45UIAbstractDockIconPreview::UIAbstractDockIconPreview(UIMachine *, const QPixmap &)
    4646{
    4747}
    … …  
    6868}
    6969
    70 UIAbstractDockIconPreviewHelper::UIAbstractDockIconPreviewHelper(UISession *pSession, const QPixmap& overlayImage)
    71     : m_pSession(pSession)
     70UIAbstractDockIconPreviewHelper::UIAbstractDockIconPreviewHelper(UIMachine *pMachine, const QPixmap& overlayImage)
     71    : m_pMachine(pMachine)
    7272    , m_dockIconRect(CGRectMake(0, 0, 128, 128))
    7373    , m_dockMonitor(NULL)
    … …  
    8484    /* Get the MachineView which is currently previewed and return the win id
    8585       of the viewport. */
    86     UIMachineView* pView = m_pSession->machineLogic()->dockPreviewView();
     86    UIMachineView* pView = m_pMachine->machineLogic()->dockPreviewView();
    8787    if (pView)
    8888        return (void*)pView->viewport()->winId();

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

    r98103 r98421  
    3939
    4040class UIFrameBuffer;
    41 class UISession;
     41class UIMachine;
    4242
    4343class QPixmap;
    … …  
    4646{
    4747public:
    48     UIAbstractDockIconPreview(UISession *pSession, const QPixmap& overlayImage);
     48    UIAbstractDockIconPreview(UIMachine *pMachine, const QPixmap& overlayImage);
    4949    virtual ~UIAbstractDockIconPreview() {}
    5050
    … …  
    5959{
    6060public:
    61     UIAbstractDockIconPreviewHelper(UISession *pSession, const QPixmap& overlayImage);
     61    UIAbstractDockIconPreviewHelper(UIMachine *pMachine, const QPixmap& overlayImage);
    6262    virtual ~UIAbstractDockIconPreviewHelper();
    6363    void initPreviewImages();
    … …  
    7272
    7373    /* Private member vars */
    74     UISession *m_pSession;
     74    UIMachine *m_pMachine;
    7575    const CGRect m_dockIconRect;
    7676

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaDockIconPreview.h

    r98103 r98421  
    4040{
    4141public:
    42     UICocoaDockIconPreview(UISession *pSession, const QPixmap& overlayImage);
     42    UICocoaDockIconPreview(UIMachine *pMachine, const QPixmap& overlayImage);
    4343    ~UICocoaDockIconPreview();
    4444

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaDockIconPreview.mm

    r98103 r98421  
    7979{
    8080public:
    81     inline UICocoaDockIconPreviewPrivate(UISession *pSession, const QPixmap& overlayImage)
    82       :UIAbstractDockIconPreviewHelper(pSession, overlayImage)
     81    inline UICocoaDockIconPreviewPrivate(UIMachine *pMachine, const QPixmap& overlayImage)
     82        : UIAbstractDockIconPreviewHelper(pMachine, overlayImage)
    8383    {
    8484        mUIDockTile = [[UIDockTile alloc] initWithParent:this];
    … …  
    9898 * Cocoa wrapper for the abstract dock icon preview class
    9999 */
    100 UICocoaDockIconPreview::UICocoaDockIconPreview(UISession *pSession, const QPixmap& overlayImage)
    101   : UIAbstractDockIconPreview(pSession, overlayImage)
    102 {
    103     CocoaAutoreleasePool pool;
    104 
    105     d = new UICocoaDockIconPreviewPrivate(pSession, overlayImage);
     100UICocoaDockIconPreview::UICocoaDockIconPreview(UIMachine *pMachine, const QPixmap& overlayImage)
     101    : UIAbstractDockIconPreview(pMachine, overlayImage)
     102{
     103    CocoaAutoreleasePool pool;
     104
     105    d = new UICocoaDockIconPreviewPrivate(pMachine, overlayImage);
    106106}
    107107

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

    r98419 r98421  
    12421242    if (pixmap.isNull())
    12431243        pixmap = generalIconPool().guestOSTypePixmap(guest().GetOSTypeId(), QSize(42, 42));
    1244     m_pDockIconPreview = new UIDockIconPreview(uisession(), pixmap);
     1244    m_pDockIconPreview = new UIDockIconPreview(uimachine(), pixmap);
    12451245
    12461246    /* Should the dock-icon be updated at runtime? */
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette