VirtualBox

Changeset 97682 in vbox for trunk


Ignore:
Timestamp:
Nov 25, 2022 12:57:28 PM (2 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9898: Reverting half of r154736 cause it was too fast; X11 isn't ready to this yet.

Location:
trunk/src/VBox/Frontends/VirtualBox/src
Files:
36 edited

Legend:

Unmodified
Added
Removed

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

    r97681 r97682  
    164164    {
    165165        /* On the basis of current host-screen geometry if possible: */
    166         const QRect screenGeometry = UIDesktopWidgetWatchdog::screenGeometry(iHostScreen);
     166        const QRect screenGeometry = gpDesktop->screenGeometry(iHostScreen);
    167167        if (screenGeometry.isValid())
    168168            minimumSize = screenGeometry.size() / 4;

  • trunk/src/VBox/Frontends/VirtualBox/src/cloud/machinesettings/UICloudMachineSettingsDialog.cpp

    r97599 r97682  
    8989{
    9090    /* Explicit centering according to our parent: */
    91     UIDesktopWidgetWatchdog::centerWidget(this, parentWidget(), false);
     91    gpDesktop->centerWidget(this, parentWidget(), false);
    9292    /* Call for load stuff asynchronously: */
    9393    QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection);

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp

    r97681 r97682  
    9191
    9292    /* Get 40% of the screen-area to limit the resulting hint: */
    93     const QSize screenGeometryDot4 = UIDesktopWidgetWatchdog::screenGeometry(this).size() * .4;
     93    const QSize screenGeometryDot4 = gpDesktop->screenGeometry(this).size() * .4;
    9494
    9595    /* Calculate minimum size-hint which is document-size limited by screen-area: */

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp

    r96407 r97682  
    135135
    136136    /* Explicit centering according to our parent: */
    137     UIDesktopWidgetWatchdog::centerWidget(this, parentWidget(), false);
     137    gpDesktop->centerWidget(this, parentWidget(), false);
    138138}

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp

    r97132 r97682  
    245245    /* Explicit centering according to our parent: */
    246246    if (m_fIsAutoCentering)
    247         UIDesktopWidgetWatchdog::centerWidget(this, parentWidget(), false);
     247        gpDesktop->centerWidget(this, parentWidget(), false);
    248248}
    249249

  • trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp

    r97681 r97682  
    105105    {
    106106        /* On the basis of current host-screen geometry if possible: */
    107         const QRect screenGeometry = UIDesktopWidgetWatchdog::screenGeometry(iHostScreen);
     107        const QRect screenGeometry = gpDesktop->screenGeometry(iHostScreen);
    108108        if (screenGeometry.isValid())
    109109            proposedSize = screenGeometry.size() * 7 / 15;
    … …  
    131131
    132132    /* Center according requested widget: */
    133     UIDesktopWidgetWatchdog::centerWidget(this, m_pCenterWidget, false);
     133    gpDesktop->centerWidget(this, m_pCenterWidget, false);
    134134
    135135    /* Load the dialog's settings from extradata */

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

    r97681 r97682  
    750750    activateWindow();
    751751//    /* Center according passed widget: */
    752 //    UIDesktopWidgetWatchdog::centerWidget(this, pCenterWidget, false);
     752//    gpDesktop->centerWidget(this, pCenterWidget, false);
    753753}
    754754
    … …  
    51035103
    51045104    /* Get available-geometry [of screen with point (iX, iY) if possible]: */
    5105     const QRect availableGeometry = fOk ? UIDesktopWidgetWatchdog::availableGeometry(QPoint(iX, iY)) :
    5106                                           UIDesktopWidgetWatchdog::availableGeometry();
     5105    const QRect availableGeometry = fOk ? gpDesktop->availableGeometry(QPoint(iX, iY)) :
     5106                                          gpDesktop->availableGeometry();
    51075107
    51085108    /* Use geometry (loaded or default): */

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

    r97681 r97682  
    24982498    for (int i = 0; i < cHostScreens; ++i)
    24992499    {
    2500         QRect r = UIDesktopWidgetWatchdog::screenGeometry(i);
     2500        QRect r = gpDesktop->screenGeometry(i);
    25012501        screenSize[i] = r.width() * r.height();
    25022502    }

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp

    r97681 r97682  
    402402}
    403403
    404 /* static */
    405 QRect UIDesktopWidgetWatchdog::screenGeometry(int iHostScreenIndex /* = -1 */)
     404QRect UIDesktopWidgetWatchdog::screenGeometry(int iHostScreenIndex /* = -1 */) const
    406405{
    407406#ifdef VBOX_IS_QT6_OR_LATER
    … …  
    418417}
    419418
    420 /* static */
    421 QRect UIDesktopWidgetWatchdog::screenGeometry(const QWidget *pWidget)
     419QRect UIDesktopWidgetWatchdog::screenGeometry(const QWidget *pWidget) const
    422420{
    423421    /* Redirect call to wrapper above: */
    … …  
    425423}
    426424
    427 /* static */
    428 QRect UIDesktopWidgetWatchdog::screenGeometry(const QPoint &point)
     425QRect UIDesktopWidgetWatchdog::screenGeometry(const QPoint &point) const
    429426{
    430427    /* Redirect call to wrapper above: */
    … …  
    432429}
    433430
    434 /* static */
    435 QRect UIDesktopWidgetWatchdog::availableGeometry(int iHostScreenIndex /* = -1 */)
     431QRect UIDesktopWidgetWatchdog::availableGeometry(int iHostScreenIndex /* = -1 */) const
    436432{
    437433#ifdef VBOX_IS_QT6_OR_LATER
    … …  
    464460}
    465461
    466 /* static */
    467 QRect UIDesktopWidgetWatchdog::availableGeometry(const QWidget *pWidget)
     462QRect UIDesktopWidgetWatchdog::availableGeometry(const QWidget *pWidget) const
    468463{
    469464#ifdef VBOX_IS_QT6_OR_LATER
    … …  
    477472}
    478473
    479 /* static */
    480 QRect UIDesktopWidgetWatchdog::availableGeometry(const QPoint &point)
     474QRect UIDesktopWidgetWatchdog::availableGeometry(const QPoint &point) const
    481475{
    482476#ifdef VBOX_IS_QT6_OR_LATER
    … …  
    491485}
    492486
    493 /* static */
    494 QRegion UIDesktopWidgetWatchdog::overallScreenRegion()
     487QRegion UIDesktopWidgetWatchdog::overallScreenRegion() const
    495488{
    496489    /* Calculate region: */
    … …  
    512505}
    513506
    514 /* static */
    515 QRegion UIDesktopWidgetWatchdog::overallAvailableRegion()
     507QRegion UIDesktopWidgetWatchdog::overallAvailableRegion() const
    516508{
    517509    /* Calculate region: */
    … …  
    750742}
    751743
    752 /* static */
    753744void UIDesktopWidgetWatchdog::centerWidget(QWidget *pWidget,
    754745                                           QWidget *pRelative,
    755                                            bool fCanResize /* = true */)
     746                                           bool fCanResize /* = true */) const
    756747{
    757748    /* If necessary, pWidget's position is adjusted to make it fully visible within

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.h

    r97681 r97682  
    101101    /** Returns the geometry of the host-screen with @a iHostScreenIndex.
    102102      * @note The default screen is used if @a iHostScreenIndex is -1. */
    103     static QRect screenGeometry(int iHostScreenIndex = -1);
     103    QRect screenGeometry(int iHostScreenIndex = -1) const;
    104104    /** Returns the geometry of the host-screen which contains @a pWidget. */
    105     static QRect screenGeometry(const QWidget *pWidget);
     105    QRect screenGeometry(const QWidget *pWidget) const;
    106106    /** Returns the geometry of the host-screen which contains @a point. */
    107     static QRect screenGeometry(const QPoint &point);
     107    QRect screenGeometry(const QPoint &point) const;
    108108
    109109    /** Returns the available-geometry of the host-screen with @a iHostScreenIndex.
    110110      * @note The default screen is used if @a iHostScreenIndex is -1. */
    111     static QRect availableGeometry(int iHostScreenIndex = -1);
     111    QRect availableGeometry(int iHostScreenIndex = -1) const;
    112112    /** Returns the available-geometry of the host-screen which contains @a pWidget. */
    113     static QRect availableGeometry(const QWidget *pWidget);
     113    QRect availableGeometry(const QWidget *pWidget) const;
    114114    /** Returns the available-geometry of the host-screen which contains @a point. */
    115     static QRect availableGeometry(const QPoint &point);
     115    QRect availableGeometry(const QPoint &point) const;
    116116
    117117    /** Returns overall region unifying all the host-screen geometries. */
    118     static QRegion overallScreenRegion();
     118    QRegion overallScreenRegion() const;
    119119    /** Returns overall region unifying all the host-screen available-geometries. */
    120     static QRegion overallAvailableRegion();
     120    QRegion overallAvailableRegion() const;
    121121
    122122#ifdef VBOX_WS_X11
    … …  
    147147    /** Aligns the center of @a pWidget with the center
    148148      * of @a pRelative, performing resize if allowed. */
    149     static void centerWidget(QWidget *pWidget,
    150                              QWidget *pRelative,
    151                              bool fCanResize = true);
     149    void centerWidget(QWidget *pWidget,
     150                      QWidget *pRelative,
     151                      bool fCanResize = true) const;
    152152    /** Restores and exposes the @a pWidget on desktop. */
    153153    static void restoreWidget(QWidget *pWidget);

  • trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlDialog.cpp

    r97681 r97682  
    117117{
    118118    /* Invent default window geometry: */
    119     const QRect availableGeo = UIDesktopWidgetWatchdog::availableGeometry(this);
     119    const QRect availableGeo = gpDesktop->availableGeometry(this);
    120120    const int iDefaultWidth = availableGeo.width() / 2;
    121121    const int iDefaultHeight = availableGeo.height() * 3 / 4;

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserDialog.cpp

    r97681 r97682  
    141141void UIHelpBrowserDialog::loadSettings()
    142142{
    143     const QRect availableGeo = UIDesktopWidgetWatchdog::availableGeometry(this);
     143    const QRect availableGeo = gpDesktop->availableGeometry(this);
    144144    int iDefaultWidth = availableGeo.width() / 2;
    145145    int iDefaultHeight = availableGeo.height() * 3 / 4;

  • trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp

    r97681 r97682  
    189189{
    190190
    191     const QRect availableGeo = UIDesktopWidgetWatchdog::availableGeometry(this);
     191    const QRect availableGeo = gpDesktop->availableGeometry(this);
    192192    int iDefaultWidth = availableGeo.width() / 2;
    193193    int iDefaultHeight = availableGeo.height() * 3 / 4;

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

    r97681 r97682  
    291291            /* Configure help-viewer: */
    292292            m_pHelpViewer->setHidden(true);
    293             m_pHelpViewer->setMinimumTextWidth(UIDesktopWidgetWatchdog::screenGeometry(window()).width() / 5);
     293            m_pHelpViewer->setMinimumTextWidth(gpDesktop->screenGeometry(window()).width() / 5);
    294294            m_pHelpViewer->registerPixmap(icon.pixmap(window()->windowHandle(), QSize(iMetric, iMetric)), "manager://copy");
    295295            connect(m_pHelpViewer, &QIRichTextLabel::sigLinkClicked, this, &UIAcquirePublicKeyDialog::sltHandleHelpViewerLinkClick);

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.cpp

    r97681 r97682  
    996996
    997997    /* Adjust the menu then show it: */
    998     const QRect availableGeo = UIDesktopWidgetWatchdog::availableGeometry(pEvent->screenPos());
     998    const QRect availableGeo = gpDesktop->availableGeometry(pEvent->screenPos());
    999999    QRect geo(pEvent->screenPos(), m_pContextMenu->minimumSizeHint());
    10001000    if (geo.topRight().x() > availableGeo.topRight().x())

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp

    r97681 r97682  
    797797void UIMediumSelector::loadSettings()
    798798{
    799     const QRect availableGeo = UIDesktopWidgetWatchdog::availableGeometry(this);
     799    const QRect availableGeo = gpDesktop->availableGeometry(this);
    800800    int iDefaultWidth = availableGeo.width() / 2;
    801801    int iDefaultHeight = availableGeo.height() * 3 / 4;

  • trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

    r97681 r97682  
    752752void UIVisoCreatorDialog::loadSettings()
    753753{
    754     const QRect availableGeo = UIDesktopWidgetWatchdog::availableGeometry(this);
     754    const QRect availableGeo = gpDesktop->availableGeometry(this);
    755755    int iDefaultWidth = availableGeo.width() / 2;
    756756    int iDefaultHeight = availableGeo.height() * 3 / 4;

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

    r96407 r97682  
    223223{
    224224    if (m_pParent)
    225         UIDesktopWidgetWatchdog::centerWidget(this, m_pParent, false);
     225        gpDesktop->centerWidget(this, m_pParent, false);
    226226    QIWithRetranslateUI<QIMainDialog>::showEvent(pEvent);
    227227

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

    r97681 r97682  
    179179        QPoint visibleRectanglePos = m_views[m_iMouseCaptureViewIndex]->mapToGlobal(m_viewports[m_iMouseCaptureViewIndex]->pos());
    180180        visibleRectangle.translate(visibleRectanglePos);
    181         visibleRectangle = visibleRectangle.intersected(UIDesktopWidgetWatchdog::availableGeometry(machineLogic()->machineWindows()[m_iMouseCaptureViewIndex]));
     181        visibleRectangle = visibleRectangle.intersected(gpDesktop->availableGeometry(machineLogic()->machineWindows()[m_iMouseCaptureViewIndex]));
    182182
    183183#ifdef VBOX_WS_WIN
    … …  
    10231023            const double dDprPrimary = UIDesktopWidgetWatchdog::devicePixelRatio(UIDesktopWidgetWatchdog::primaryScreen());
    10241024            const double dDprCurrent = UIDesktopWidgetWatchdog::devicePixelRatio(m_windows.value(m_iMouseCaptureViewIndex));
    1025             const QRect screenGeometry = UIDesktopWidgetWatchdog::screenGeometry(m_windows.value(m_iMouseCaptureViewIndex));
     1025            const QRect screenGeometry = gpDesktop->screenGeometry(m_windows.value(m_iMouseCaptureViewIndex));
    10261026            QPoint requiredMousePos = (m_viewports[uScreenId]->mapToGlobal(p) - screenGeometry.topLeft()) * dDprCurrent + screenGeometry.topLeft();
    10271027            QCursor::setPos(requiredMousePos / dDprPrimary);
    … …  
    13001300
    13011301        /* Trim full-viewport-rectangle by available geometry: */
    1302         viewportRectangle = viewportRectangle.intersected(UIDesktopWidgetWatchdog::availableGeometry(machineLogic()->machineWindows()[m_iMouseCaptureViewIndex]));
     1302        viewportRectangle = viewportRectangle.intersected(gpDesktop->availableGeometry(machineLogic()->machineWindows()[m_iMouseCaptureViewIndex]));
    13031303
    13041304        /* Trim partial-viewport-rectangle by top-most windows: */
    … …  
    13251325        // But we will have to map to relative origin (to make logical=>physical conversion) first.
    13261326        const double dDpr = UIDesktopWidgetWatchdog::devicePixelRatio(m_windows.value(m_iMouseCaptureViewIndex));
    1327         const QRect screenGeometry = UIDesktopWidgetWatchdog::screenGeometry(m_windows.value(m_iMouseCaptureViewIndex));
     1327        const QRect screenGeometry = gpDesktop->screenGeometry(m_windows.value(m_iMouseCaptureViewIndex));
    13281328        viewportRectangle.moveTo((viewportRectangle.topLeft() - screenGeometry.topLeft()) * dDpr + screenGeometry.topLeft());
    13291329        viewportRectangle.setSize(viewportRectangle.size() * dDpr);

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

    r97681 r97682  
    312312        QRect screen;
    313313        if (m_pMachineLogic->visualStateType() == UIVisualStateType_Seamless)
    314             screen = UIDesktopWidgetWatchdog::availableGeometry(screenLayout.value(iGuestScreen, 0));
     314            screen = gpDesktop->availableGeometry(screenLayout.value(iGuestScreen, 0));
    315315        else
    316             screen = UIDesktopWidgetWatchdog::screenGeometry(screenLayout.value(iGuestScreen, 0));
     316            screen = gpDesktop->screenGeometry(screenLayout.value(iGuestScreen, 0));
    317317        KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
    318318        m_pMachineLogic->display().GetScreenResolution(iGuestScreen, width, height, guestBpp, xOrigin, yOrigin, monitorStatus);

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

    r97681 r97682  
    752752        for (int iScreenIndex = 0; iScreenIndex < UIDesktopWidgetWatchdog::screenCount(); ++iScreenIndex)
    753753        {
    754             if (UIDesktopWidgetWatchdog::screenGeometry(iScreenIndex) != m_hostScreens.at(iScreenIndex))
     754            if (gpDesktop->screenGeometry(iScreenIndex) != m_hostScreens.at(iScreenIndex))
    755755            {
    756756                /* Reset watchdog: */
    … …  
    20812081    m_hostScreens.clear();
    20822082    for (int iScreenIndex = 0; iScreenIndex < UIDesktopWidgetWatchdog::screenCount(); ++iScreenIndex)
    2083         m_hostScreens << UIDesktopWidgetWatchdog::screenGeometry(iScreenIndex);
     2083        m_hostScreens << gpDesktop->screenGeometry(iScreenIndex);
    20842084
    20852085    /* Make sure action-pool knows host-screen count: */

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

    r97681 r97682  
    777777            const int iCurrentHostScreenIndex = UIDesktopWidgetWatchdog::screenNumber(pMachineWindow);
    778778            const QSize frameBufferSize((int)uisession()->frameBuffer(uScreenID)->width(), (int)uisession()->frameBuffer(uScreenID)->height());
    779             const QSize screenSize = UIDesktopWidgetWatchdog::screenGeometry(iWantedHostScreenIndex).size();
     779            const QSize screenSize = gpDesktop->screenGeometry(iWantedHostScreenIndex).size();
    780780
    781781            /* If that window

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

    r97681 r97682  
    208208    int iScreen = static_cast<UIMachineLogicFullscreen*>(machineLogic())->hostScreenForGuestScreen(screenId());
    209209    /* Return available geometry for that screen: */
    210     return UIDesktopWidgetWatchdog::screenGeometry(iScreen);
     210    return gpDesktop->screenGeometry(iScreen);
    211211}
    212212

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

    r97681 r97682  
    359359    const int iHostScreen = pFullscreenLogic->hostScreenForGuestScreen(m_uScreenId);
    360360    /* And corresponding working area: */
    361     const QRect workingArea = UIDesktopWidgetWatchdog::screenGeometry(iHostScreen);
     361    const QRect workingArea = gpDesktop->screenGeometry(iHostScreen);
    362362    Q_UNUSED(workingArea);
    363363

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

    r97681 r97682  
    229229QRect UIMachineViewNormal::workingArea() const
    230230{
    231     return UIDesktopWidgetWatchdog::availableGeometry(this);
     231    return gpDesktop->availableGeometry(this);
    232232}
    233233

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

    r97681 r97682  
    422422            /* Move it to the screen-center: */
    423423            m_geometry = geometry();
    424             m_geometry.moveCenter(UIDesktopWidgetWatchdog::availableGeometry(this).center());
     424            m_geometry.moveCenter(gpDesktop->availableGeometry(this).center());
    425425            UIDesktopWidgetWatchdog::setTopLevelGeometry(this, m_geometry);
    426426        }
    … …  
    683683    /* Adjust size/position if necessary: */
    684684    QRect frGeoNew = fAdjustPosition
    685                    ? UIDesktopWidgetWatchdog::normalizeGeometry(frGeo, UIDesktopWidgetWatchdog::overallAvailableRegion())
     685                   ? UIDesktopWidgetWatchdog::normalizeGeometry(frGeo, gpDesktop->overallAvailableRegion())
    686686                   : frGeo;
    687687
    … …  
    705705
    706706        /* Adjust size/position again: */
    707         frGeoNew = UIDesktopWidgetWatchdog::normalizeGeometry(frGeoNew, UIDesktopWidgetWatchdog::overallAvailableRegion());
     707        frGeoNew = UIDesktopWidgetWatchdog::normalizeGeometry(frGeoNew, gpDesktop->overallAvailableRegion());
    708708    }
    709709

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

    r97681 r97682  
    190190QRect UIMachineViewScale::workingArea() const
    191191{
    192     return UIDesktopWidgetWatchdog::availableGeometry(this);
     192    return gpDesktop->availableGeometry(this);
    193193}
    194194

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

    r97681 r97682  
    128128        {
    129129            /* Get available geometry, for screen with (x,y) coords if possible: */
    130             QRect availableGeo = !geo.isNull() ? UIDesktopWidgetWatchdog::availableGeometry(QPoint(geo.x(), geo.y())) :
    131                                                  UIDesktopWidgetWatchdog::availableGeometry(this);
     130            QRect availableGeo = !geo.isNull() ? gpDesktop->availableGeometry(QPoint(geo.x(), geo.y())) :
     131                                                 gpDesktop->availableGeometry(this);
    132132
    133133            /* Resize to default size: */
    … …  
    207207    /* Adjust position if necessary: */
    208208    if (fAdjustPosition)
    209         frGeo = UIDesktopWidgetWatchdog::normalizeGeometry(frGeo, UIDesktopWidgetWatchdog::overallAvailableRegion());
     209        frGeo = UIDesktopWidgetWatchdog::normalizeGeometry(frGeo, gpDesktop->overallAvailableRegion());
    210210
    211211    /* Finally, set the frame geometry: */

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

    r97681 r97682  
    212212    int iScreen = static_cast<UIMachineLogicSeamless*>(machineLogic())->hostScreenForGuestScreen(screenId());
    213213    /* Return available geometry for that screen: */
    214     return UIDesktopWidgetWatchdog::availableGeometry(iScreen);
     214    return gpDesktop->availableGeometry(iScreen);
    215215}
    216216

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

    r97681 r97682  
    198198    const int iHostScreen = pSeamlessLogic->hostScreenForGuestScreen(m_uScreenId);
    199199    /* And corresponding working area: */
    200     const QRect workingArea = UIDesktopWidgetWatchdog::availableGeometry(iHostScreen);
     200    const QRect workingArea = gpDesktop->availableGeometry(iHostScreen);
    201201    Q_UNUSED(workingArea);
    202202

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

    r97435 r97682  
    355355
    356356    /* Explicit centering according to our parent: */
    357     UIDesktopWidgetWatchdog::centerWidget(this, parentWidget(), false);
     357    gpDesktop->centerWidget(this, parentWidget(), false);
    358358}
    359359

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp

    r97681 r97682  
    7474
    7575    /* Limit the minimum size to 33% of screen size: */
    76     setMinimumSize(UIDesktopWidgetWatchdog::screenGeometry(this).size() / 3);
     76    setMinimumSize(gpDesktop->screenGeometry(this).size() / 3);
    7777}
    7878

  • trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp

    r97681 r97682  
    579579
    580580    /* Center according requested widget: */
    581     UIDesktopWidgetWatchdog::centerWidget(this, parentWidget(), false);
     581    gpDesktop->centerWidget(this, parentWidget(), false);
    582582}
    583583
    … …  
    585585{
    586586    /* Acquire current host-screen size, fallback to 1024x768 if failed: */
    587     QSize screenSize = UIDesktopWidgetWatchdog::screenGeometry(parentWidget()).size();
     587    QSize screenSize = gpDesktop->screenGeometry(parentWidget()).size();
    588588    if (!screenSize.isValid())
    589589        screenSize = QSize(1024, 768);

  • trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

    r97681 r97682  
    43844384    if (m_pKeyboardWidget)
    43854385        fKeyboardAspectRatio = m_pKeyboardWidget->layoutAspectRatio();
    4386     const QRect availableGeo = UIDesktopWidgetWatchdog::availableGeometry(this);
     4386    const QRect availableGeo = gpDesktop->availableGeometry(this);
    43874387    const int iDefaultWidth = availableGeo.width() / 2;
    43884388    const int iDefaultHeight = iDefaultWidth * fKeyboardAspectRatio;

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp

    r97681 r97682  
    745745    switch (m_geometryType)
    746746    {
    747         case GeometryType_Available: workingArea = UIDesktopWidgetWatchdog::availableGeometry(iHostScreen); break;
    748         case GeometryType_Full:      workingArea = UIDesktopWidgetWatchdog::screenGeometry(iHostScreen); break;
     747        case GeometryType_Available: workingArea = gpDesktop->availableGeometry(iHostScreen); break;
     748        case GeometryType_Full:      workingArea = gpDesktop->screenGeometry(iHostScreen); break;
    749749    }
    750750    Q_UNUSED(workingArea);
    … …  
    10791079                /* Skip if parent is outside of full-screen geometry: */
    10801080                QMoveEvent *pMoveEvent = static_cast<QMoveEvent*>(pEvent);
    1081                 if (!UIDesktopWidgetWatchdog::screenGeometry(m_pParent).contains(pMoveEvent->pos()))
     1081                if (!gpDesktop->screenGeometry(m_pParent).contains(pMoveEvent->pos()))
    10821082                    break;
    10831083                /* Skip if parent or we are invisible: */

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/UINativeWizard.cpp

    r97681 r97682  
    599599        const int iStepWidth = 100;
    600600        const int iMinWidth = qMax(100, m_pWidgetStack->minimumSizeHint().width());
    601         const int iMaxWidth = qMax(iMinWidth, UIDesktopWidgetWatchdog::availableGeometry(this).width() * 3 / 4);
     601        const int iMaxWidth = qMax(iMinWidth, gpDesktop->availableGeometry(this).width() * 3 / 4);
    602602        /* Show all the QIRichTextLabel(s) again, they were hidden above: */
    603603        foreach (QIRichTextLabel *pLabel, findChildren<QIRichTextLabel*>())
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