VirtualBox

Changeset 8513 in vbox for trunk/src/VBox/Frontends


Ignore:
Timestamp:
Apr 30, 2008 3:15:49 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
30408
Message:

Frontends/VirtualBox3/4: backed out r30319 as it caused problems with Windows guests

Location:
trunk/src/VBox/Frontends
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

    r8456 r8513  
    190190    void onEnterFullscreen();
    191191    void onExitFullscreen();
     192    void exitFullscreen();
    192193    void exitSeamless();
    193194

  • trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

    r8477 r8513  
    10241024void VBoxConsoleWnd::onEnterFullscreen()
    10251025{
    1026     LogFlowThisFunc(("\n"));
    10271026    disconnect (console, SIGNAL (resizeHintDone()), 0, 0);
    10281027    /* It isn't guaranteed that the guest os set the video mode that
    … …  
    10441043        connect (console, SIGNAL (resizeHintDone()),
    10451044                 this, SLOT(exitSeamless()));
    1046     LogFlowThisFunc(("return\n"));
     1045    else if (mIsFullscreen)
     1046        connect (console, SIGNAL (resizeHintDone()),
     1047                 this, SLOT(exitFullscreen()));
    10471048}
    10481049
    … …  
    10531054void VBoxConsoleWnd::onExitFullscreen()
    10541055{
    1055     LogFlowThisFunc(("\n"));
    10561056    disconnect (console, SIGNAL (resizeHintDone()), 0, 0);
    10571057#ifdef Q_WS_MAC
    … …  
    10691069    console->setIgnoreMainwndResize (false);
    10701070    console->normalizeGeometry (true /* adjustPosition */);
    1071     LogFlowThisFunc(("returning\n"));
     1071}
     1072
     1073/**
     1074 *  This slot is called if the guest changes resolution while in fullscreen
     1075 *  mode.
     1076 */
     1077void VBoxConsoleWnd::exitFullscreen()
     1078{
     1079    if (mIsFullscreen && vmFullscreenAction->isEnabled())
     1080        vmFullscreenAction->toggle();
    10721081}
    10731082
    … …  
    10781087void VBoxConsoleWnd::exitSeamless()
    10791088{
    1080     vmSeamlessAction->setOn (false);
     1089    if (mIsSeamless && vmSeamlessAction->isEnabled())
     1090        vmSeamlessAction->toggle();
    10811091}
    10821092
    … …  
    19461956bool VBoxConsoleWnd::toggleFullscreenMode (bool aOn, bool aSeamless)
    19471957{
    1948         LogFlowThisFunc(("aOn=%s, aSeamless=%s\n", aOn ? "true" : "false", aSeamless ? "true" : "false"));
    19491958    disconnect (console, SIGNAL (resizeHintDone()), 0, 0);
    19501959    if (aSeamless)
    … …  
    22102219        hide();
    22112220#endif
    2212     LogFlowThisFunc(("true\n"));
    22132221    return true;
    22142222}
    … …  
    32393247        /* If seamless mode should be enabled then check if it is enabled
    32403248         * currently and re-enable it if open-view procedure is finished */
    3241         if (vmSeamlessAction->isOn())
    3242         {
    3243             if (   mIsOpenViewFinished
    3244                 && aSeamlessSupported
    3245                 && aGraphicsSupported)
    3246             {
    3247                 if (!mIsSeamless)
    3248                     toggleFullscreenMode (true /* aOn */, true /* aSeamless */);
    3249             }
    3250             else
    3251             {
    3252                 if (mIsSeamless)
    3253                     toggleFullscreenMode (false /* aOn */, true /* aSeamless */);
    3254             }
    3255         }
     3249        if (   vmSeamlessAction->isOn()
     3250            && mIsOpenViewFinished
     3251            && aSeamlessSupported
     3252            && aGraphicsSupported)
     3253            toggleFullscreenMode (true, true);
    32563254        /* Disable auto-resizing if advanced graphics are not available */
    32573255        console->setAutoresizeGuest (   mIsGraphicsSupported

  • trunk/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleWnd.h

    r8456 r8513  
    190190    void onEnterFullscreen();
    191191    void onExitFullscreen();
     192    void exitFullscreen();
    192193    void exitSeamless();
    193194

  • trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

    r8477 r8513  
    10351035void VBoxConsoleWnd::onEnterFullscreen()
    10361036{
    1037     LogFlowFuncEnter();
    10381037    disconnect (console, SIGNAL (resizeHintDone()), 0, 0);
    10391038    /* It isn't guaranteed that the guest os set the video mode that
    … …  
    10551054        connect (console, SIGNAL (resizeHintDone()),
    10561055                 this, SLOT(exitSeamless()));
    1057     LogFlowFuncLeave();
     1056    else if (mIsFullscreen)
     1057        connect (console, SIGNAL (resizeHintDone()),
     1058                 this, SLOT(exitFullscreen()));
    10581059}
    10591060
    … …  
    10641065void VBoxConsoleWnd::onExitFullscreen()
    10651066{
    1066         LogFlowFuncEnter();
    10671067    disconnect (console, SIGNAL (resizeHintDone()), 0, 0);
    10681068#ifdef Q_WS_MAC
    … …  
    10801080    console->setIgnoreMainwndResize (false);
    10811081    console->normalizeGeometry (true /* adjustPosition */);
    1082     LogFlowFuncLeave();
     1082}
     1083
     1084/**
     1085 *  This slot is called if the guest changes resolution while in fullscreen
     1086 *  mode.
     1087 */
     1088void VBoxConsoleWnd::exitFullscreen()
     1089{
     1090    if (mIsFullscreen && vmFullscreenAction->isEnabled())
     1091        vmFullscreenAction->toggle();
    10831092}
    10841093
    … …  
    10891098void VBoxConsoleWnd::exitSeamless()
    10901099{
    1091     vmSeamlessAction->setChecked (false);
     1100    if (mIsSeamless && vmSeamlessAction->isEnabled())
     1101        vmSeamlessAction->toggle();
    10921102}
    10931103
    … …  
    19691979bool VBoxConsoleWnd::toggleFullscreenMode (bool aOn, bool aSeamless)
    19701980{
    1971         LogFlowThisFunc(("aOn=%s, aSeamless=%s\n", aOn ? "true" : "false", aSeamless ? "true" : "false"));
    19721981    disconnect (console, SIGNAL (resizeHintDone()), 0, 0);
    19731982    if (aSeamless)
    … …  
    22402249        hide();
    22412250#endif
    2242     LogFlowThisFunc(("true\n"));
    22432251    return true;
    22442252}
    … …  
    32803288        /* If seamless mode should be enabled then check if it is enabled
    32813289         * currently and re-enable it if open-view procedure is finished */
    3282         if (vmSeamlessAction->isOn())
    3283         {
    3284             if (   mIsOpenViewFinished
    3285                 && aSeamlessSupported
    3286                 && aGraphicsSupported)
    3287             {
    3288                 if (!mIsSeamless)
    3289                     toggleFullscreenMode (true /* aOn */, true /* aSeamless */);
    3290             }
    3291             else
    3292             {
    3293                 if (mIsSeamless)
    3294                     toggleFullscreenMode (false /* aOn */, true /* aSeamless */);
    3295             }
    3296         }
     3290        if (   vmSeamlessAction->isChecked()
     3291            && mIsOpenViewFinished
     3292            && aSeamlessSupported
     3293            && aGraphicsSupported)
     3294            toggleFullscreenMode (true, true);
    32973295        /* Disable auto-resizing if advanced graphics are not available */
    32983296        console->setAutoresizeGuest (   mIsGraphicsSupported
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