Changeset 75645 in vbox

Timestamp:

Nov 21, 2018 3:32:58 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

126823

Message:

FE/Qt: bugref:8694: Make sure status-bar indicator context menu is opened at proper position in multi-screen environment with different system scale-factors; For that we have to use dynamical coordinate mapping instead of coordinates provided via QContextMenuEvent.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIIndicatorsPool.cpp (modified) (2 diffs)
• UIIndicatorsPool.h (modified) (1 diff)
• normal/UIMachineWindowNormal.cpp (modified) (2 diffs)
• normal/UIMachineWindowNormal.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

@@ -1273 +1273 @@
 }
 
+QPoint UIIndicatorsPool::mapIndicatorPositionToGlobal(IndicatorType enmIndicatorType, const QPoint &indicatorPosition)
+{
+    if (m_pool.contains(enmIndicatorType))
+        return m_pool.value(enmIndicatorType)->mapToGlobal(indicatorPosition);
+    return QPoint(0, 0);
+}
+
 void UIIndicatorsPool::sltHandleConfigurationChange(const QUuid &uMachineID)
 {
@@ -1336 +1343 @@
         {
             /* Notify listener: */
-            emit sigContextMenuRequest(indicatorType, pEvent->globalPos());
+            emit sigContextMenuRequest(indicatorType, pEvent->pos());
             return;
         }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h

@@ -64 +64 @@
     void setAutoUpdateIndicatorStates(bool fEnabled);
 
+    /** Returns global screen position corresponding to @a indicatorPosition inside indicator of @a enmIndicatorType. */
+    QPoint mapIndicatorPositionToGlobal(IndicatorType enmIndicatorType, const QPoint &indicatorPosition);
+
 private slots:
 

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

@@ -205 +205 @@
 }
 
-void UIMachineWindowNormal::sltHandleIndicatorContextMenuRequest(IndicatorType indicatorType, const QPoint &position)
+void UIMachineWindowNormal::sltHandleIndicatorContextMenuRequest(IndicatorType enmIndicatorType, const QPoint &indicatorPosition)
 {
     /* Determine action depending on indicator-type: */
     UIAction *pAction = 0;
-    switch (indicatorType)
+    switch (enmIndicatorType)
     {
         case IndicatorType_HardDisks:     pAction = actionPool()->action(UIActionIndexRT_M_Devices_M_HardDrives);     break;
@@ -226 +226 @@
     /* Raise action's context-menu: */
     if (pAction && pAction->isEnabled())
-        pAction->menu()->exec(position);
+        pAction->menu()->exec(m_pIndicatorsPool->mapIndicatorPositionToGlobal(enmIndicatorType, indicatorPosition));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h

@@ -78 +78 @@
     void sltHandleStatusBarContextMenuRequest(const QPoint &position);
     /** Handles status-bar indicator context-menu-request. */
-    void sltHandleIndicatorContextMenuRequest(IndicatorType indicatorType, const QPoint &position);
+    void sltHandleIndicatorContextMenuRequest(IndicatorType enmIndicatorType, const QPoint &indicatorPosition);
 
 #ifdef VBOX_WS_MAC