VirtualBox

Changeset 71056 in vbox


Ignore:
Timestamp:
Feb 19, 2018 2:00:51 PM (7 years ago)
Author:
vboxsync
Message:

FE/Qt: macOS: Remove obsolete HiDPI optimization option, unused since 5.2.

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

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

    r70870 r71056  
    100100template<> bool canConvert<GuruMeditationHandlerType>();
    101101template<> bool canConvert<ScalingOptimizationType>();
    102 #ifdef VBOX_WS_MAC
    103 template<> bool canConvert<HiDPIOptimizationType>();
    104 #endif
    105102#ifndef VBOX_WS_MAC
    106103template<> bool canConvert<MiniToolbarAlignment>();
    … …  
    199196template<> QString toInternalString(const ScalingOptimizationType &optimizationType);
    200197template<> ScalingOptimizationType fromInternalString<ScalingOptimizationType>(const QString &strOptimizationType);
    201 #ifdef VBOX_WS_MAC
    202 template<> QString toInternalString(const HiDPIOptimizationType &optimizationType);
    203 template<> HiDPIOptimizationType fromInternalString<HiDPIOptimizationType>(const QString &strOptimizationType);
    204 #endif
    205198#ifndef VBOX_WS_MAC
    206199template<> QString toInternalString(const MiniToolbarAlignment &miniToolbarAlignment);

  • trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

    r70870 r71056  
    6868template<> bool canConvert<GuruMeditationHandlerType>() { return true; }
    6969template<> bool canConvert<ScalingOptimizationType>() { return true; }
    70 #ifdef VBOX_WS_MAC
    71 template<> bool canConvert<HiDPIOptimizationType>() { return true; }
    72 #endif
    7370#ifndef VBOX_WS_MAC
    7471template<> bool canConvert<MiniToolbarAlignment>() { return true; }
    … …  
    16511648}
    16521649
    1653 #ifdef VBOX_WS_MAC
    1654 /* QString <= HiDPIOptimizationType: */
    1655 template<> QString toInternalString(const HiDPIOptimizationType &optimizationType)
    1656 {
    1657     QString strResult;
    1658     switch (optimizationType)
    1659     {
    1660         case HiDPIOptimizationType_None:        strResult = "None"; break;
    1661         case HiDPIOptimizationType_Performance: strResult = "Performance"; break;
    1662         default:
    1663         {
    1664             AssertMsgFailed(("No text for type=%d", optimizationType));
    1665             break;
    1666         }
    1667     }
    1668     return strResult;
    1669 }
    1670 
    1671 /* HiDPIOptimizationType <= QString: */
    1672 template<> HiDPIOptimizationType fromInternalString<HiDPIOptimizationType>(const QString &strOptimizationType)
    1673 {
    1674     /* Here we have some fancy stuff allowing us
    1675      * to search through the keys using 'case-insensitive' rule: */
    1676     QStringList keys;      QList<HiDPIOptimizationType> values;
    1677     keys << "None";        values << HiDPIOptimizationType_None;
    1678     keys << "Performance"; values << HiDPIOptimizationType_Performance;
    1679     /* 'Performance' type for empty/unknown words (for trunk): */
    1680     if (!keys.contains(strOptimizationType, Qt::CaseInsensitive))
    1681         return HiDPIOptimizationType_Performance;
    1682     /* Corresponding type for known words: */
    1683     return values.at(keys.indexOf(QRegExp(strOptimizationType, Qt::CaseInsensitive)));
    1684 }
    1685 #endif /* VBOX_WS_MAC */
    1686 
    16871650#ifndef VBOX_WS_MAC
    16881651/* QString <= MiniToolbarAlignment: */

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

    r70870 r71056  
    156156#endif /* VBOX_WITH_VIDEOHWACCEL */
    157157const char* UIExtraDataDefs::GUI_HiDPI_UnscaledOutput = "GUI/HiDPI/UnscaledOutput";
    158 #ifdef VBOX_WS_MAC
    159 const char* UIExtraDataDefs::GUI_HiDPI_Optimization = "GUI/HiDPI/Optimization";
    160 #endif
    161158#ifndef VBOX_WS_MAC
    162159const char* UIExtraDataDefs::GUI_ShowMiniToolBar = "GUI/ShowMiniToolBar";

  • trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

    r70870 r71056  
    280280        /** Holds whether Runtime UI should use unscaled HiDPI output. */
    281281        extern const char* GUI_HiDPI_UnscaledOutput;
    282 #ifdef VBOX_WS_MAC
    283         /** Holds Runtime UI HiDPI optimization type. */
    284         extern const char* GUI_HiDPI_Optimization;
    285 #endif
    286282#ifndef VBOX_WS_MAC
    287283        /** Holds whether mini-toolbar is enabled for full and seamless screens. */
    … …  
    757753};
    758754
    759 #ifdef VBOX_WS_MAC
    760 /** Runtime UI: HiDPI optimization types. */
    761 enum HiDPIOptimizationType
    762 {
    763     HiDPIOptimizationType_None,
    764     HiDPIOptimizationType_Performance
    765 };
    766 #endif /* VBOX_WS_MAC */
    767 
    768755#ifndef VBOX_WS_MAC
    769756/** Runtime UI: Mini-toolbar alignment. */

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

    r71006 r71056  
    19971997#endif /* VBOX_WITH_VIDEOHWACCEL */
    19981998           << GUI_HiDPI_UnscaledOutput
    1999 #ifdef VBOX_WS_MAC
    2000            << GUI_HiDPI_Optimization
    2001 #endif
    20021999#ifndef VBOX_WS_MAC
    20032000           << GUI_ShowMiniToolBar << GUI_MiniToolBarAutoHide << GUI_MiniToolBarAlignment
    … …  
    37453742#endif
    37463743}
    3747 
    3748 #ifdef VBOX_WS_MAC
    3749 HiDPIOptimizationType UIExtraDataManager::hiDPIOptimizationType(const QString &strID)
    3750 {
    3751     return gpConverter->fromInternalString<HiDPIOptimizationType>(extraDataString(GUI_HiDPI_Optimization, strID));
    3752 }
    3753 #endif /* VBOX_WS_MAC */
    37543744
    37553745#ifndef VBOX_WS_MAC
    … …  
    44194409        else if (strKey == GUI_Scaling_Optimization)
    44204410            emit sigScalingOptimizationTypeChange(strMachineID);
    4421 #ifdef VBOX_WS_MAC
    4422         /* HiDPI optimization type change: */
    4423         else if (strKey == GUI_HiDPI_Optimization)
    4424             emit sigHiDPIOptimizationTypeChange(strMachineID);
    4425 #endif
    44264411        /* Unscaled HiDPI Output mode change: */
    44274412        else if (strKey == GUI_HiDPI_UnscaledOutput)

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

    r70870 r71056  
    534534        /** Defines whether Runtime UI should @a fUseUnscaledHiDPIOutput. */
    535535        void setUseUnscaledHiDPIOutput(bool fUseUnscaledHiDPIOutput, const QString &strID);
    536 
    537 #ifdef VBOX_WS_MAC
    538         /** Returns Runtime UI HiDPI optimization type. */
    539         HiDPIOptimizationType hiDPIOptimizationType(const QString &strID);
    540 #endif
    541536
    542537#ifndef VBOX_WS_MAC

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

    r71034 r71056  
    168168    void setScalingOptimizationType(ScalingOptimizationType type) { m_enmScalingOptimizationType = type; }
    169169
    170 #ifdef VBOX_WS_MAC
    171     /** Returns HiDPI frame-buffer optimization type. */
    172     HiDPIOptimizationType hiDPIOptimizationType() const { return m_hiDPIOptimizationType; }
    173     /** Defines HiDPI frame-buffer optimization type: */
    174     void setHiDPIOptimizationType(HiDPIOptimizationType type) { m_hiDPIOptimizationType = type; }
    175 #endif
    176 
    177170    DECLARE_NOT_AGGREGATABLE(UIFrameBufferPrivate)
    178171
    … …  
    302295    static void eraseImageRect(QPainter &painter, const QRect &rect,
    303296                               bool fUseUnscaledHiDPIOutput,
    304 #ifdef VBOX_WS_MAC
    305                                HiDPIOptimizationType hiDPIOptimizationType,
    306 #endif
    307297                               double dDevicePixelRatio);
    308298    /** Draws corresponding @a rect of passed @a image with @a painter. */
    … …  
    310300                              int iContentsShiftX, int iContentsShiftY,
    311301                              bool fUseUnscaledHiDPIOutput,
    312 #ifdef VBOX_WS_MAC
    313                               HiDPIOptimizationType hiDPIOptimizationType,
    314 #endif
    315302                              double dDevicePixelRatio);
    316303
    … …  
    392379    /** Holds whether frame-buffer should use unscaled HiDPI output. */
    393380    bool m_fUseUnscaledHiDPIOutput;
    394 #ifdef VBOX_WS_MAC
    395     /** Holds HiDPI frame-buffer optimization type. */
    396     HiDPIOptimizationType m_hiDPIOptimizationType;
    397 #endif
    398381    /** @} */
    399382
    … …  
    546529    , m_dDevicePixelRatio(1.0)
    547530    , m_fUseUnscaledHiDPIOutput(false)
    548 #ifdef VBOX_WS_MAC
    549     , m_hiDPIOptimizationType(HiDPIOptimizationType_None)
    550 #endif
    551531{
    552532    /* Update coordinate-system: */
    … …  
    12891269    {
    12901270        case UIVisualStateType_Scale:
    1291             m_scaledSize = m_scaledSize.width() == m_iWidth && m_scaledSize.height() == m_iHeight ? QSize() : m_scaledSize;
     1271            m_scaledSize = scaledSize().width() == m_iWidth && scaledSize().height() == m_iHeight ? QSize() : scaledSize();
    12921272            break;
    12931273        default:
    … …  
    14041384                  m_pMachineView->contentsX(), m_pMachineView->contentsY(),
    14051385                  useUnscaledHiDPIOutput(),
    1406 #ifdef VBOX_WS_MAC
    1407                   hiDPIOptimizationType(),
    1408 #endif
    14091386                  devicePixelRatio());
    14101387
    … …  
    14731450    eraseImageRect(painter, paintRectHiDPI,
    14741451                   useUnscaledHiDPIOutput(),
    1475 #ifdef VBOX_WS_MAC
    1476                    hiDPIOptimizationType(),
    1477 #endif
    14781452                   devicePixelRatio());
    14791453
    … …  
    14951469                  m_pMachineView->contentsX(), m_pMachineView->contentsY(),
    14961470                  useUnscaledHiDPIOutput(),
    1497 #ifdef VBOX_WS_MAC
    1498                   hiDPIOptimizationType(),
    1499 #endif
    15001471                  devicePixelRatio());
    15011472
    … …  
    15251496void UIFrameBufferPrivate::eraseImageRect(QPainter &painter, const QRect &rect,
    15261497                                          bool fUseUnscaledHiDPIOutput,
    1527 #ifdef VBOX_WS_MAC
    1528                                           HiDPIOptimizationType hiDPIOptimizationType,
    1529 #endif
    15301498                                          double dDevicePixelRatio)
    15311499{
    … …  
    15331501    QPixmap subPixmap = QPixmap(rect.width(), rect.height());
    15341502
    1535 #ifdef VBOX_WS_MAC
    1536     /* If HiDPI 'device-pixel-ratio' defined: */
    1537     if (dDevicePixelRatio > 1.0)
    1538     {
    1539         /* Should we perform logical HiDPI scaling and optimize it for performance? */
    1540         if (!fUseUnscaledHiDPIOutput && hiDPIOptimizationType == HiDPIOptimizationType_Performance)
    1541         {
    1542             /* Adjust sub-pixmap: */
    1543             subPixmap = QPixmap((int)(rect.width() * dDevicePixelRatio),
    1544                                 (int)(rect.height() * dDevicePixelRatio));
    1545         }
    1546 
    1547         /* Should we not perform logical HiDPI scaling or perform logical HiDPI scaling and optimize it for performance? */
    1548         if (fUseUnscaledHiDPIOutput || hiDPIOptimizationType == HiDPIOptimizationType_Performance)
    1549         {
    1550             /* Mark sub-pixmap as HiDPI: */
    1551             subPixmap.setDevicePixelRatio(dDevicePixelRatio);
    1552         }
    1553     }
    1554 #else /* !VBOX_WS_MAC */
    15551503    /* If HiDPI 'device-pixel-ratio' defined: */
    15561504    if (dDevicePixelRatio > 1.0)
    … …  
    15671515        subPixmap.setDevicePixelRatio(dDevicePixelRatio);
    15681516    }
    1569 #endif /* !VBOX_WS_MAC */
    15701517
    15711518    /* Which point we should draw corresponding sub-pixmap? */
    … …  
    15841531                                         int iContentsShiftX, int iContentsShiftY,
    15851532                                         bool fUseUnscaledHiDPIOutput,
    1586 #ifdef VBOX_WS_MAC
    1587                                          HiDPIOptimizationType hiDPIOptimizationType,
    1588 #endif
    15891533                                         double dDevicePixelRatio)
    15901534{
    15911535    /* Calculate offset: */
    1592     size_t offset = (rect.x() + iContentsShiftX) * image.depth() / 8 +
    1593                     (rect.y() + iContentsShiftY) * image.bytesPerLine();
     1536    const size_t offset = (rect.x() + iContentsShiftX) * image.depth() / 8 +
     1537                          (rect.y() + iContentsShiftY) * image.bytesPerLine();
    15941538
    15951539    /* Restrain boundaries: */
    1596     int iSubImageWidth = qMin(rect.width(), image.width() - rect.x() - iContentsShiftX);
    1597     int iSubImageHeight = qMin(rect.height(), image.height() - rect.y() - iContentsShiftY);
     1540    const int iSubImageWidth = qMin(rect.width(), image.width() - rect.x() - iContentsShiftX);
     1541    const int iSubImageHeight = qMin(rect.height(), image.height() - rect.y() - iContentsShiftY);
    15981542
    15991543    /* Create sub-image (no copy involved): */
    … …  
    16051549    QPixmap subPixmap = QPixmap::fromImage(subImage);
    16061550
    1607 #ifdef VBOX_WS_MAC
    1608     /* If HiDPI 'device-pixel-ratio' defined: */
    1609     if (dDevicePixelRatio > 1.0)
    1610     {
    1611         /* Should we perform logical HiDPI scaling and optimize it for performance? */
    1612         if (!fUseUnscaledHiDPIOutput && hiDPIOptimizationType == HiDPIOptimizationType_Performance)
    1613         {
    1614             /* Fast scale sub-pixmap (2nd copy involved): */
    1615             subPixmap = subPixmap.scaled(subPixmap.size() * dDevicePixelRatio,
    1616                                          Qt::IgnoreAspectRatio, Qt::FastTransformation);
    1617         }
    1618 
    1619         /* Should we not perform logical HiDPI scaling or perform logical HiDPI scaling and optimize it for performance? */
    1620         if (fUseUnscaledHiDPIOutput || hiDPIOptimizationType == HiDPIOptimizationType_Performance)
    1621         {
    1622             /* Mark sub-pixmap as HiDPI: */
    1623             subPixmap.setDevicePixelRatio(dDevicePixelRatio);
    1624         }
    1625     }
    1626 #else /* !VBOX_WS_MAC */
    16271551    /* If HiDPI 'device-pixel-ratio' defined: */
    16281552    if (dDevicePixelRatio > 1.0)
    … …  
    16391563        subPixmap.setDevicePixelRatio(dDevicePixelRatio);
    16401564    }
    1641 #endif /* !VBOX_WS_MAC */
    16421565
    16431566    /* Which point we should draw corresponding sub-pixmap? */
    … …  
    18041727}
    18051728
    1806 #ifdef VBOX_WS_MAC
    1807 HiDPIOptimizationType UIFrameBuffer::hiDPIOptimizationType() const
    1808 {
    1809     return m_pFrameBuffer->hiDPIOptimizationType();
    1810 }
    1811 
    1812 void UIFrameBuffer::setHiDPIOptimizationType(HiDPIOptimizationType type)
    1813 {
    1814     m_pFrameBuffer->setHiDPIOptimizationType(type);
    1815 }
    1816 #endif
    1817 
    18181729void UIFrameBuffer::handleNotifyChange(int iWidth, int iHeight)
    18191730{

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h

    r70870 r71056  
    121121    void setScalingOptimizationType(ScalingOptimizationType type);
    122122
    123 #ifdef VBOX_WS_MAC
    124     /** Returns HiDPI frame-buffer optimization type. */
    125     HiDPIOptimizationType hiDPIOptimizationType() const;
    126     /** Defines HiDPI frame-buffer optimization type: */
    127     void setHiDPIOptimizationType(HiDPIOptimizationType type);
    128 #endif
    129 
    130123    /** Handles frame-buffer notify-change-event. */
    131124    void handleNotifyChange(int iWidth, int iHeight);

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

    r70870 r71056  
    540540}
    541541
    542 #ifdef VBOX_WS_MAC
    543 void UIMachineView::sltHandleHiDPIOptimizationChange(const QString &strMachineID)
    544 {
    545     /* Skip unrelated machine IDs: */
    546     if (strMachineID != vboxGlobal().managedVMUuid())
    547         return;
    548 
    549     /* Take the HiDPI-optimization type into account: */
    550     frameBuffer()->setHiDPIOptimizationType(gEDataManager->hiDPIOptimizationType(vboxGlobal().managedVMUuid()));
    551 
    552     /* Update viewport: */
    553     viewport()->update();
    554 }
    555 #endif /* VBOX_WS_MAC */
    556 
    557542void UIMachineView::sltHandleUnscaledHiDPIOutputModeChange(const QString &strMachineID)
    558543{
    … …  
    719704#endif /* !VBOX_WITH_VIDEOHWACCEL */
    720705
    721 #ifdef VBOX_WS_MAC
    722         /* Take HiDPI optimization type into account: */
    723         m_pFrameBuffer->setHiDPIOptimizationType(gEDataManager->hiDPIOptimizationType(vboxGlobal().managedVMUuid()));
    724 #endif
    725 
    726706        /* Take scaling optimization type into account: */
    727707        m_pFrameBuffer->setScalingOptimizationType(gEDataManager->scalingOptimizationType(vboxGlobal().managedVMUuid()));
    … …  
    850830    connect(gEDataManager, SIGNAL(sigScalingOptimizationTypeChange(const QString&)),
    851831            this, SLOT(sltHandleScalingOptimizationChange(const QString&)));
    852 #ifdef VBOX_WS_MAC
    853     /* HiDPI-optimization change: */
    854     connect(gEDataManager, SIGNAL(sigHiDPIOptimizationTypeChange(const QString&)),
    855             this, SLOT(sltHandleHiDPIOptimizationChange(const QString&)));
    856 #endif
    857832    /* Unscaled HiDPI output mode change: */
    858833    connect(gEDataManager, SIGNAL(sigUnscaledHiDPIOutputModeChange(const QString&)),

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h

    r70870 r71056  
    131131    /** Handles the scaling-optimization change. */
    132132    void sltHandleScalingOptimizationChange(const QString &strMachineID);
    133 
    134 #ifdef VBOX_WS_MAC
    135     /** Handles the HiDPI-optimization change. */
    136     void sltHandleHiDPIOptimizationChange(const QString &strMachineID);
    137 #endif
    138133
    139134    /** Handles the unscaled HiDPI output mode change. */
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