← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-07-04 13:02:31 UTC
  • mfrom: (3.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110704130231-l843es6wqhx614n7
Tags: 4.0.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add the Modaliases control field manually for maximum backportability.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp
320
320
 
321
321
void UIMachineViewNormal::normalizeGeometry(bool bAdjustPosition)
322
322
{
 
323
#ifndef VBOX_GUI_WITH_CUSTOMIZATIONS1
323
324
    QWidget *pTopLevelWidget = window();
324
325
 
325
326
    /* Make no normalizeGeometry in case we are in manual resize mode or main window is maximized: */
364
365
 
365
366
    /* Finally, set the frame geometry */
366
367
    pTopLevelWidget->setGeometry(frameGeo.left() + dl, frameGeo.top() + dt, frameGeo.width() - dl - dr, frameGeo.height() - dt - db);
 
368
 
 
369
#else /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
 
370
    Q_UNUSED(bAdjustPosition);
 
371
#endif /* VBOX_GUI_WITH_CUSTOMIZATIONS1 */
367
372
}
368
373
 
369
374
QRect UIMachineViewNormal::workingArea()