VirtualBox

Ignore:
Timestamp:
Oct 6, 2011 1:00:28 PM (13 years ago)
Author:
vboxsync
Message:

FE/Qt: clean up console size hint saving

Location:
trunk/src/VBox/Frontends/VirtualBox/src/runtime
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r38957 r38961  
    158158    AssertMsg(newSize.isValid(), ("Size should be valid!\n"));
    159159
    160     /* Remember the new size: */
    161     storeConsoleSize(newSize.width(), newSize.height());
    162 
    163160    /* Send new size-hint to the guest: */
    164161    session().GetConsole().GetDisplay().SetVideoModeHint(newSize.width(), newSize.height(), 0, screenId());
    … …  
    674671void UIMachineView::storeConsoleSize(int iWidth, int iHeight)
    675672{
    676     m_storedConsoleSize = QSize(iWidth, iHeight);
     673    if (m_desktopGeometryType == DesktopGeo_Automatic)
     674        m_storedConsoleSize = QSize(iWidth, iHeight);
    677675}
    678676

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

    r38957 r38961  
    126126            setMaximumSize(sizeHint());
    127127
    128             /* Store the new size to prevent unwanted resize hints being sent back: */
    129             storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
    130 
    131128            /* Perform machine-view resize: */
    132129            resize(pResizeEvent->width(), pResizeEvent->height());
    … …  
    186183                if (pResizeEvent->size() != workingArea().size())
    187184                    break;
     185                /* Store the new size */
     186                storeConsoleSize(pResizeEvent->size().width(), pResizeEvent->size().height());
    188187
    189188                if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

    r38957 r38961  
    7777UIMachineViewNormal::~UIMachineViewNormal()
    7878{
    79     /* Save machine view settings: */
    80     saveMachineViewSettings();
    81 
    8279    /* Cleanup frame buffer: */
    8380    cleanupFrameBuffer();
    … …  
    116113            setMaximumSize(sizeHint());
    117114
    118             /* Store the new size to prevent unwanted resize hints being sent back: */
    119             storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
    120 
    121115            /* Perform machine-view resize: */
    122116            resize(pResizeEvent->width(), pResizeEvent->height());
    … …  
    174168            case QEvent::Resize:
    175169            {
     170                const QSize *pSize = &static_cast<QResizeEvent *>(pEvent)
     171                                    ->size();
     172                /* Store the new size */
     173                storeConsoleSize(pSize->width(), pSize->height());
    176174                if (pEvent->spontaneous() && m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
    177175                    QTimer::singleShot(300, this, SLOT(sltPerformGuestResize()));
    … …  
    252250}
    253251
    254 void UIMachineViewNormal::saveMachineViewSettings()
    255 {
    256     /* Store guest size hint: */
    257     storeGuestSizeHint(QSize(frameBuffer()->width(), frameBuffer()->height()));
    258 }
    259 
    260252void UIMachineViewNormal::setGuestAutoresizeEnabled(bool fEnabled)
    261253{

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.h

    r38947 r38961  
    6767
    6868    /* Cleanup helpers: */
    69     void saveMachineViewSettings();
     69    // void saveMachineViewSettings();
    7070    //void cleanupConsoleConnections() {}
    7171    //void prepareConnections() {}

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

    r38949 r38961  
    7676UIMachineViewScale::~UIMachineViewScale()
    7777{
    78     /* Save machine view settings: */
    79     saveMachineViewSettings();
    80 
    8178    /* Cleanup frame buffer: */
    8279    cleanupFrameBuffer();
    … …  
    175172            frameBuffer()->setScaledSize(size());
    176173            frameBuffer()->resizeEvent(pResizeEvent);
    177 
    178             /* Store the new size to prevent unwanted resize hints being sent back: */
    179             storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
    180174
    181175            /* Let our toplevel widget calculate its sizeHint properly: */
    … …  
    353347}
    354348
    355 void UIMachineViewScale::saveMachineViewSettings()
    356 {
    357     /* Store guest size hint: */
    358     storeGuestSizeHint(QSize(frameBuffer()->width(), frameBuffer()->height()));
    359 }
    360 
    361349QSize UIMachineViewScale::sizeHint() const
    362350{

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.h

    r31341 r38961  
    6464
    6565    /* Cleanup helpers: */
    66     void saveMachineViewSettings();
     66    // void saveMachineViewSettings();
    6767    //void cleanupConnections() {}
    6868    //void cleanupFrameBuffer() {}

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

    r38957 r38961  
    137137            setMaximumSize(sizeHint());
    138138
    139             /* Store the new size to prevent unwanted resize hints being sent back: */
    140             storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
    141 
    142139            /* Perform machine-view resize: */
    143140            resize(pResizeEvent->width(), pResizeEvent->height());
    … …  
    194191                if (pResizeEvent->size() != workingArea().size())
    195192                    break;
     193                /* Store the new size to prevent unwanted resize hints being sent back: */
     194                storeConsoleSize(pResizeEvent->size().width(), pResizeEvent->size().height());
    196195
    197196                if (uisession()->isGuestSupportsGraphics())
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