VirtualBox

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


Ignore:
Timestamp:
Jun 5, 2020 2:40:35 PM (5 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:9753: A possibility to build GUI with option to prevent desktop-widget-watchdog from available-area recalculation and option to prevent VM from handling host-screen adding/removing/resizing when VBOX_GUI_WITH_CUSTOMIZATIONS1 is defined.

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r84436 r84696  
    258258        $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \
    259259        $(if $(VBOX_GUI_WITH_PIDFILE),VBOX_GUI_WITH_PIDFILE) \
     260        $(if $(VBOX_GUI_WITH_CUSTOMIZATIONS1),VBOX_GUI_WITH_CUSTOMIZATIONS1) \
    260261        $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE) \
    261262        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,)
    … …  
    10561057        src/platform/darwin/UIWindowMenuManager.cpp
    10571058
    1058 UICommon_QT_MOCSRCS.linux += \
     1059ifndef VBOX_GUI_WITH_CUSTOMIZATIONS1
     1060 UICommon_QT_MOCSRCS.linux += \
    10591061        src/globals/UIDesktopWidgetWatchdog.cpp
    1060 UICommon_QT_MOCSRCS.solaris += \
     1062 UICommon_QT_MOCSRCS.solaris += \
    10611063        src/globals/UIDesktopWidgetWatchdog.cpp
    1062 UICommon_QT_MOCSRCS.freebsd += \
     1064 UICommon_QT_MOCSRCS.freebsd += \
    10631065        src/globals/UIDesktopWidgetWatchdog.cpp
     1066endif
    10641067
    10651068

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

    r82968 r84696  
    9595
    9696
    97 #ifdef VBOX_WS_X11
     97#if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
    9898
    9999/** QWidget extension used as
    … …  
    225225}
    226226
    227 #endif /* VBOX_WS_X11 */
     227#endif /* VBOX_WS_X11 && !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    228228
    229229
    … …  
    338338
    339339#ifdef VBOX_WS_X11
     340# ifdef VBOX_GUI_WITH_CUSTOMIZATIONS1
     341    // WORKAROUND:
     342    // For customer WM we don't want Qt to return wrong available geometry,
     343    // so we are returning fallback screen geometry in any case..
     344    return QApplication::desktop()->screenGeometry(iHostScreenIndex);
     345# else /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    340346    /* Get cached available-geometry: */
    341347    const QRect availableGeometry = m_availableGeometryData.value(iHostScreenIndex);
    … …  
    343349    return availableGeometry.isValid() ? availableGeometry :
    344350           QApplication::desktop()->screenGeometry(iHostScreenIndex);
     351# endif /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    345352#else /* !VBOX_WS_X11 */
    346353    /* Redirect call to desktop-widget: */
    … …  
    459466        }
    460467    }
    461 
    462468#endif /* VBOX_WS_WIN */
    463469
    … …  
    482488            this, &UIDesktopWidgetWatchdog::sltHandleHostScreenWorkAreaResized);
    483489
    484 # ifdef VBOX_WS_X11
     490#if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
    485491    /* Update host-screen configuration: */
    486492    updateHostScreenConfiguration();
    487 # endif /* VBOX_WS_X11 */
     493#endif /* VBOX_WS_X11 && !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    488494
    489495    /* Notify listeners: */
    … …  
    501507               this, &UIDesktopWidgetWatchdog::sltHandleHostScreenWorkAreaResized);
    502508
    503 # ifdef VBOX_WS_X11
     509#if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
    504510    /* Update host-screen configuration: */
    505511    updateHostScreenConfiguration();
    506 # endif /* VBOX_WS_X11 */
     512#endif /* VBOX_WS_X11 && !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    507513
    508514    /* Notify listeners: */
    … …  
    524530            geometry.width(), geometry.height()));
    525531
    526 # ifdef VBOX_WS_X11
     532#if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
    527533    /* Update host-screen available-geometry: */
    528534    updateHostScreenAvailableGeometry(iHostScreenIndex);
    529 # endif /* VBOX_WS_X11 */
     535#endif /* VBOX_WS_X11 && !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    530536
    531537    /* Notify listeners: */
    … …  
    547553            availableGeometry.width(), availableGeometry.height()));
    548554
    549 # ifdef VBOX_WS_X11
     555#if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
    550556    /* Update host-screen available-geometry: */
    551557    updateHostScreenAvailableGeometry(iHostScreenIndex);
    552 # endif /* VBOX_WS_X11 */
     558#endif /* VBOX_WS_X11 && !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    553559
    554560    /* Notify listeners: */
    … …  
    556562}
    557563
    558 #ifdef VBOX_WS_X11
     564#if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
    559565void UIDesktopWidgetWatchdog::sltHandleHostScreenAvailableGeometryCalculated(int iHostScreenIndex, QRect availableGeometry)
    560566{
    … …  
    577583        emit sigHostScreenWorkAreaRecalculated(iHostScreenIndex);
    578584}
    579 #endif /* VBOX_WS_X11 */
     585#endif /* VBOX_WS_X11 && !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    580586
    581587void UIDesktopWidgetWatchdog::prepare()
    … …  
    594600    }
    595601
    596 #ifdef VBOX_WS_X11
     602#if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
    597603    /* Update host-screen configuration: */
    598604    updateHostScreenConfiguration();
    599 #endif /* VBOX_WS_X11 */
     605#endif /* VBOX_WS_X11 && !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    600606}
    601607
    … …  
    615621    }
    616622
    617 #ifdef VBOX_WS_X11
     623#if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
    618624    /* Cleanup existing workers finally: */
    619625    cleanupExistingWorkers();
    620 #endif /* VBOX_WS_X11 */
    621 }
    622 
    623 #ifdef VBOX_WS_X11
     626#endif /* VBOX_WS_X11 && !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
     627}
     628
     629#if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
    624630void UIDesktopWidgetWatchdog::updateHostScreenConfiguration(int cHostScreenCount /* = -1 */)
    625631{
    … …  
    679685
    680686# include "UIDesktopWidgetWatchdog.moc"
    681 #endif /* VBOX_WS_X11 */
    682 
     687#endif /* VBOX_WS_X11 && !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
     688

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

    r82968 r84696  
    5757    void sigHostScreenWorkAreaResized(int iHostScreenIndex);
    5858
    59 #ifdef VBOX_WS_X11
     59#if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
    6060    /** Notifies about work-area recalculated for the host-screen with @a iHostScreenIndex. */
    6161    void sigHostScreenWorkAreaRecalculated(int iHostScreenIndex);
    … …  
    140140#endif /* QT_VERSION != 0 */
    141141
    142 #ifdef VBOX_WS_X11
     142#if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
    143143    /** Handles @a availableGeometry calculation result for the host-screen with @a iHostScreenIndex. */
    144144    void sltHandleHostScreenAvailableGeometryCalculated(int iHostScreenIndex, QRect availableGeometry);
    … …  
    155155    static UIDesktopWidgetWatchdog *s_pInstance;
    156156
    157 #ifdef VBOX_WS_X11
     157#if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
    158158    /** Updates host-screen configuration according to new @a cHostScreenCount.
    159159      * @note If cHostScreenCount is equal to -1 we have to acquire it ourselves. */
    … …  
    167167
    168168    /** Holds current host-screen available-geometries. */
    169     QVector<QRect> m_availableGeometryData;
     169    QVector<QRect>    m_availableGeometryData;
    170170    /** Holds current workers determining host-screen available-geometries. */
    171171    QVector<QWidget*> m_availableGeometryWorkers;
    172 #endif /* VBOX_WS_X11 */
     172#endif /* VBOX_WS_X11 && !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    173173};
    174174

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

    r82968 r84696  
    796796void UIMachineLogic::sltHostScreenCountChange()
    797797{
     798#ifdef VBOX_GUI_WITH_CUSTOMIZATIONS1
     799    /* Customer request to skip host-screen count change: */
     800    LogRel(("GUI: UIMachineLogic: Host-screen count change skipped\n"));
     801#else /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    798802    LogRel(("GUI: UIMachineLogic: Host-screen count changed\n"));
    799803
    … …  
    801805    foreach (UIMachineWindow *pMachineWindow, machineWindows())
    802806        pMachineWindow->showInNecessaryMode();
     807#endif /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    803808}
    804809
    805810void UIMachineLogic::sltHostScreenGeometryChange()
    806811{
     812#ifdef VBOX_GUI_WITH_CUSTOMIZATIONS1
     813    /* Customer request to skip host-screen geometry change: */
     814    LogRel(("GUI: UIMachineLogic: Host-screen geometry change skipped\n"));
     815#else /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    807816    LogRel(("GUI: UIMachineLogic: Host-screen geometry changed\n"));
    808817
    … …  
    810819    foreach (UIMachineWindow *pMachineWindow, machineWindows())
    811820        pMachineWindow->showInNecessaryMode();
     821#endif /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    812822}
    813823
    814824void UIMachineLogic::sltHostScreenAvailableAreaChange()
    815825{
     826#ifdef VBOX_GUI_WITH_CUSTOMIZATIONS1
     827    /* Customer request to skip host-screen available-area change: */
     828    LogRel(("GUI: UIMachineLogic: Host-screen available-area change skipped\n"));
     829#else /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    816830    LogRel(("GUI: UIMachineLogic: Host-screen available-area changed\n"));
    817831
    … …  
    819833    foreach (UIMachineWindow *pMachineWindow, machineWindows())
    820834        pMachineWindow->showInNecessaryMode();
     835#endif /* !VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    821836}
    822837

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

    r84612 r84696  
    11261126    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenResized,
    11271127            this, &UISession::sltHandleHostScreenGeometryChange);
    1128 # ifdef VBOX_WS_X11
     1128# if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
    11291129    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenWorkAreaRecalculated,
    11301130            this, &UISession::sltHandleHostScreenAvailableAreaChange);
    1131 # else /* !VBOX_WS_X11 */
     1131# else /* !VBOX_WS_X11 || VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    11321132    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenWorkAreaResized,
    11331133            this, &UISession::sltHandleHostScreenAvailableAreaChange);
    1134 # endif /* !VBOX_WS_X11 */
     1134# endif /* !VBOX_WS_X11 || VBOX_GUI_WITH_CUSTOMIZATIONS1 */
    11351135#endif /* !VBOX_WS_MAC */
    11361136}
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