Changeset 8717
- Timestamp:
- 05/08/08 17:42:24 (2 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp
r8440 r8717 676 676 ::memset (mPressedKeys, 0, SIZEOF_ARRAY (mPressedKeys)); 677 677 678 /* This timer is used as 'last resort' which toggles f/s mode 679 in case of guest additions are not responding. */ 678 680 mToggleFSModeTimer = new QTimer (this); 679 681 mToggleFSModeTimer->setSingleShot (true); … … 2233 2235 void VBoxConsoleView::toggleFSMode() 2234 2236 { 2235 if (mIsAdditionsActive && mAutoresizeGuest) 2237 if ((mIsAdditionsActive && mAutoresizeGuest) || 2238 mMainWnd->isTrueFullscreen()) 2236 2239 { 2237 2240 QSize newSize = QSize(); … … 2245 2248 doResizeHint (newSize); 2246 2249 } 2247 mToggleFSModeTimer->start (2000); 2250 /* Currently there is 2000 msec pause before timer transfers 2251 * console into desired mode "if GA are active and auto-resize 2252 * feature enabled" and 100 msec pause before it transfers 2253 * console into this mode "if GA are not active or auto-resize 2254 * feature disabled". 100 msec pause required for resizing 2255 * before normalizing geometry. */ 2256 mToggleFSModeTimer->start (mIsAdditionsActive && mAutoresizeGuest ? 2257 2000 : 100); 2258 2259 /// @todo (r=dsen) perform roll-back after 'entering' mode in case 2260 // we got no resizing response from the guest. 2248 2261 } 2249 2262 … … 3492 3505 void VBoxConsoleView::doResizeHint (const QSize &aToSize) 3493 3506 { 3494 if (mIsAdditionsActive && mAutoresizeGuest) 3507 if ((mIsAdditionsActive && mAutoresizeGuest) || 3508 mMainWnd->isTrueFullscreen()) 3495 3509 { 3496 3510 /* If this slot is invoked directly then use the passed size … … 3506 3520 setDesktopGeometry(sz.width(), sz.height()); 3507 3521 3508 mConsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0, 0); 3522 if (mIsAdditionsActive && mAutoresizeGuest) 3523 mConsole.GetDisplay().SetVideoModeHint (sz.width(), sz.height(), 0, 0); 3509 3524 } 3510 3525 } trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp
r8704 r8717 1038 1038 * we requested. So after all the resizing stuff set the clipping 1039 1039 * mask and the spacing shifter to the corresponding values. */ 1040 setViewInSeamlessMode (QRect (console->mapToGlobal (QPoint(0, 0)), console->size()));1040 setViewInSeamlessMode (QRect (console->mapToGlobal (QPoint (0, 0)), console->size())); 1041 1041 #ifdef Q_WS_MAC 1042 1042 if (!mIsSeamless) … … 1052 1052 if (mIsSeamless) 1053 1053 connect (console, SIGNAL (resizeHintDone()), 1054 this, SLOT(exitSeamless())); 1055 else if (mIsFullscreen) 1056 connect (console, SIGNAL (resizeHintDone()), 1057 this, SLOT(exitFullscreen())); 1054 this, SLOT (exitSeamless())); 1055 /* disabled for now */ 1056 //else if (mIsFullscreen) 1057 // connect (console, SIGNAL (resizeHintDone()), 1058 // this, SLOT (exitFullscreen())); 1058 1059 } 1059 1060 … … 1087 1088 void VBoxConsoleWnd::exitFullscreen() 1088 1089 { 1090 Assert (0); /* disabled for now */ 1089 1091 if (mIsFullscreen && vmFullscreenAction->isEnabled()) 1090 1092 vmFullscreenAction->toggle();
