VirtualBox

Changeset 38962 in vbox


Ignore:
Timestamp:
Oct 6, 2011 8:37:52 PM (13 years ago)
Author:
vboxsync
Message:

FE/Qt: Reverted r74332 as it removes too much

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

Legend:

Unmodified
Added
Removed

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

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

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

    r38961 r38962  
    126126            setMaximumSize(sizeHint());
    127127
     128            /* Store the new size to prevent unwanted resize hints being sent back: */
     129            storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
     130
    128131            /* Perform machine-view resize: */
    129132            resize(pResizeEvent->width(), pResizeEvent->height());
    … …  
    183186                if (pResizeEvent->size() != workingArea().size())
    184187                    break;
    185                 /* Store the new size */
    186                 storeConsoleSize(pResizeEvent->size().width(), pResizeEvent->size().height());
    187188
    188189                if (m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())

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

    r38961 r38962  
    7777UIMachineViewNormal::~UIMachineViewNormal()
    7878{
     79    /* Save machine view settings: */
     80    saveMachineViewSettings();
     81
    7982    /* Cleanup frame buffer: */
    8083    cleanupFrameBuffer();
    … …  
    113116            setMaximumSize(sizeHint());
    114117
     118            /* Store the new size to prevent unwanted resize hints being sent back: */
     119            storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
     120
    115121            /* Perform machine-view resize: */
    116122            resize(pResizeEvent->width(), pResizeEvent->height());
    … …  
    168174            case QEvent::Resize:
    169175            {
    170                 const QSize *pSize = &static_cast<QResizeEvent *>(pEvent)
    171                                     ->size();
    172                 /* Store the new size */
    173                 storeConsoleSize(pSize->width(), pSize->height());
    174176                if (pEvent->spontaneous() && m_bIsGuestAutoresizeEnabled && uisession()->isGuestSupportsGraphics())
    175177                    QTimer::singleShot(300, this, SLOT(sltPerformGuestResize()));
    … …  
    250252}
    251253
     254void UIMachineViewNormal::saveMachineViewSettings()
     255{
     256    /* Store guest size hint: */
     257    storeGuestSizeHint(QSize(frameBuffer()->width(), frameBuffer()->height()));
     258}
     259
    252260void UIMachineViewNormal::setGuestAutoresizeEnabled(bool fEnabled)
    253261{

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

    r38961 r38962  
    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

    r38961 r38962  
    7676UIMachineViewScale::~UIMachineViewScale()
    7777{
     78    /* Save machine view settings: */
     79    saveMachineViewSettings();
     80
    7881    /* Cleanup frame buffer: */
    7982    cleanupFrameBuffer();
    … …  
    172175            frameBuffer()->setScaledSize(size());
    173176            frameBuffer()->resizeEvent(pResizeEvent);
     177
     178            /* Store the new size to prevent unwanted resize hints being sent back: */
     179            storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
    174180
    175181            /* Let our toplevel widget calculate its sizeHint properly: */
    … …  
    347353}
    348354
     355void UIMachineViewScale::saveMachineViewSettings()
     356{
     357    /* Store guest size hint: */
     358    storeGuestSizeHint(QSize(frameBuffer()->width(), frameBuffer()->height()));
     359}
     360
    349361QSize UIMachineViewScale::sizeHint() const
    350362{

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

    r38961 r38962  
    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

    r38961 r38962  
    137137            setMaximumSize(sizeHint());
    138138
     139            /* Store the new size to prevent unwanted resize hints being sent back: */
     140            storeConsoleSize(pResizeEvent->width(), pResizeEvent->height());
     141
    139142            /* Perform machine-view resize: */
    140143            resize(pResizeEvent->width(), pResizeEvent->height());
    … …  
    191194                if (pResizeEvent->size() != workingArea().size())
    192195                    break;
    193                 /* Store the new size to prevent unwanted resize hints being sent back: */
    194                 storeConsoleSize(pResizeEvent->size().width(), pResizeEvent->size().height());
    195196
    196197                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