Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (revision 71055) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (revision 71056) @@ -100,7 +100,4 @@ template<> bool canConvert(); template<> bool canConvert(); -#ifdef VBOX_WS_MAC -template<> bool canConvert(); -#endif #ifndef VBOX_WS_MAC template<> bool canConvert(); @@ -199,8 +196,4 @@ template<> QString toInternalString(const ScalingOptimizationType &optimizationType); template<> ScalingOptimizationType fromInternalString(const QString &strOptimizationType); -#ifdef VBOX_WS_MAC -template<> QString toInternalString(const HiDPIOptimizationType &optimizationType); -template<> HiDPIOptimizationType fromInternalString(const QString &strOptimizationType); -#endif #ifndef VBOX_WS_MAC template<> QString toInternalString(const MiniToolbarAlignment &miniToolbarAlignment); Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 71055) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 71056) @@ -68,7 +68,4 @@ template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } -#ifdef VBOX_WS_MAC -template<> bool canConvert() { return true; } -#endif #ifndef VBOX_WS_MAC template<> bool canConvert() { return true; } @@ -1651,38 +1648,4 @@ } -#ifdef VBOX_WS_MAC -/* QString <= HiDPIOptimizationType: */ -template<> QString toInternalString(const HiDPIOptimizationType &optimizationType) -{ - QString strResult; - switch (optimizationType) - { - case HiDPIOptimizationType_None: strResult = "None"; break; - case HiDPIOptimizationType_Performance: strResult = "Performance"; break; - default: - { - AssertMsgFailed(("No text for type=%d", optimizationType)); - break; - } - } - return strResult; -} - -/* HiDPIOptimizationType <= QString: */ -template<> HiDPIOptimizationType fromInternalString(const QString &strOptimizationType) -{ - /* Here we have some fancy stuff allowing us - * to search through the keys using 'case-insensitive' rule: */ - QStringList keys; QList values; - keys << "None"; values << HiDPIOptimizationType_None; - keys << "Performance"; values << HiDPIOptimizationType_Performance; - /* 'Performance' type for empty/unknown words (for trunk): */ - if (!keys.contains(strOptimizationType, Qt::CaseInsensitive)) - return HiDPIOptimizationType_Performance; - /* Corresponding type for known words: */ - return values.at(keys.indexOf(QRegExp(strOptimizationType, Qt::CaseInsensitive))); -} -#endif /* VBOX_WS_MAC */ - #ifndef VBOX_WS_MAC /* QString <= MiniToolbarAlignment: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp (revision 71055) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp (revision 71056) @@ -156,7 +156,4 @@ #endif /* VBOX_WITH_VIDEOHWACCEL */ const char* UIExtraDataDefs::GUI_HiDPI_UnscaledOutput = "GUI/HiDPI/UnscaledOutput"; -#ifdef VBOX_WS_MAC -const char* UIExtraDataDefs::GUI_HiDPI_Optimization = "GUI/HiDPI/Optimization"; -#endif #ifndef VBOX_WS_MAC const char* UIExtraDataDefs::GUI_ShowMiniToolBar = "GUI/ShowMiniToolBar"; Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 71055) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 71056) @@ -280,8 +280,4 @@ /** Holds whether Runtime UI should use unscaled HiDPI output. */ extern const char* GUI_HiDPI_UnscaledOutput; -#ifdef VBOX_WS_MAC - /** Holds Runtime UI HiDPI optimization type. */ - extern const char* GUI_HiDPI_Optimization; -#endif #ifndef VBOX_WS_MAC /** Holds whether mini-toolbar is enabled for full and seamless screens. */ @@ -757,13 +753,4 @@ }; -#ifdef VBOX_WS_MAC -/** Runtime UI: HiDPI optimization types. */ -enum HiDPIOptimizationType -{ - HiDPIOptimizationType_None, - HiDPIOptimizationType_Performance -}; -#endif /* VBOX_WS_MAC */ - #ifndef VBOX_WS_MAC /** Runtime UI: Mini-toolbar alignment. */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 71055) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 71056) @@ -1997,7 +1997,4 @@ #endif /* VBOX_WITH_VIDEOHWACCEL */ << GUI_HiDPI_UnscaledOutput -#ifdef VBOX_WS_MAC - << GUI_HiDPI_Optimization -#endif #ifndef VBOX_WS_MAC << GUI_ShowMiniToolBar << GUI_MiniToolBarAutoHide << GUI_MiniToolBarAlignment @@ -3745,11 +3742,4 @@ #endif } - -#ifdef VBOX_WS_MAC -HiDPIOptimizationType UIExtraDataManager::hiDPIOptimizationType(const QString &strID) -{ - return gpConverter->fromInternalString(extraDataString(GUI_HiDPI_Optimization, strID)); -} -#endif /* VBOX_WS_MAC */ #ifndef VBOX_WS_MAC @@ -4419,9 +4409,4 @@ else if (strKey == GUI_Scaling_Optimization) emit sigScalingOptimizationTypeChange(strMachineID); -#ifdef VBOX_WS_MAC - /* HiDPI optimization type change: */ - else if (strKey == GUI_HiDPI_Optimization) - emit sigHiDPIOptimizationTypeChange(strMachineID); -#endif /* Unscaled HiDPI Output mode change: */ else if (strKey == GUI_HiDPI_UnscaledOutput) Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 71055) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 71056) @@ -534,9 +534,4 @@ /** Defines whether Runtime UI should @a fUseUnscaledHiDPIOutput. */ void setUseUnscaledHiDPIOutput(bool fUseUnscaledHiDPIOutput, const QString &strID); - -#ifdef VBOX_WS_MAC - /** Returns Runtime UI HiDPI optimization type. */ - HiDPIOptimizationType hiDPIOptimizationType(const QString &strID); -#endif #ifndef VBOX_WS_MAC Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (revision 71055) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (revision 71056) @@ -168,11 +168,4 @@ void setScalingOptimizationType(ScalingOptimizationType type) { m_enmScalingOptimizationType = type; } -#ifdef VBOX_WS_MAC - /** Returns HiDPI frame-buffer optimization type. */ - HiDPIOptimizationType hiDPIOptimizationType() const { return m_hiDPIOptimizationType; } - /** Defines HiDPI frame-buffer optimization type: */ - void setHiDPIOptimizationType(HiDPIOptimizationType type) { m_hiDPIOptimizationType = type; } -#endif - DECLARE_NOT_AGGREGATABLE(UIFrameBufferPrivate) @@ -302,7 +295,4 @@ static void eraseImageRect(QPainter &painter, const QRect &rect, bool fUseUnscaledHiDPIOutput, -#ifdef VBOX_WS_MAC - HiDPIOptimizationType hiDPIOptimizationType, -#endif double dDevicePixelRatio); /** Draws corresponding @a rect of passed @a image with @a painter. */ @@ -310,7 +300,4 @@ int iContentsShiftX, int iContentsShiftY, bool fUseUnscaledHiDPIOutput, -#ifdef VBOX_WS_MAC - HiDPIOptimizationType hiDPIOptimizationType, -#endif double dDevicePixelRatio); @@ -392,8 +379,4 @@ /** Holds whether frame-buffer should use unscaled HiDPI output. */ bool m_fUseUnscaledHiDPIOutput; -#ifdef VBOX_WS_MAC - /** Holds HiDPI frame-buffer optimization type. */ - HiDPIOptimizationType m_hiDPIOptimizationType; -#endif /** @} */ @@ -546,7 +529,4 @@ , m_dDevicePixelRatio(1.0) , m_fUseUnscaledHiDPIOutput(false) -#ifdef VBOX_WS_MAC - , m_hiDPIOptimizationType(HiDPIOptimizationType_None) -#endif { /* Update coordinate-system: */ @@ -1289,5 +1269,5 @@ { case UIVisualStateType_Scale: - m_scaledSize = m_scaledSize.width() == m_iWidth && m_scaledSize.height() == m_iHeight ? QSize() : m_scaledSize; + m_scaledSize = scaledSize().width() == m_iWidth && scaledSize().height() == m_iHeight ? QSize() : scaledSize(); break; default: @@ -1404,7 +1384,4 @@ m_pMachineView->contentsX(), m_pMachineView->contentsY(), useUnscaledHiDPIOutput(), -#ifdef VBOX_WS_MAC - hiDPIOptimizationType(), -#endif devicePixelRatio()); @@ -1473,7 +1450,4 @@ eraseImageRect(painter, paintRectHiDPI, useUnscaledHiDPIOutput(), -#ifdef VBOX_WS_MAC - hiDPIOptimizationType(), -#endif devicePixelRatio()); @@ -1495,7 +1469,4 @@ m_pMachineView->contentsX(), m_pMachineView->contentsY(), useUnscaledHiDPIOutput(), -#ifdef VBOX_WS_MAC - hiDPIOptimizationType(), -#endif devicePixelRatio()); @@ -1525,7 +1496,4 @@ void UIFrameBufferPrivate::eraseImageRect(QPainter &painter, const QRect &rect, bool fUseUnscaledHiDPIOutput, -#ifdef VBOX_WS_MAC - HiDPIOptimizationType hiDPIOptimizationType, -#endif double dDevicePixelRatio) { @@ -1533,24 +1501,4 @@ QPixmap subPixmap = QPixmap(rect.width(), rect.height()); -#ifdef VBOX_WS_MAC - /* If HiDPI 'device-pixel-ratio' defined: */ - if (dDevicePixelRatio > 1.0) - { - /* Should we perform logical HiDPI scaling and optimize it for performance? */ - if (!fUseUnscaledHiDPIOutput && hiDPIOptimizationType == HiDPIOptimizationType_Performance) - { - /* Adjust sub-pixmap: */ - subPixmap = QPixmap((int)(rect.width() * dDevicePixelRatio), - (int)(rect.height() * dDevicePixelRatio)); - } - - /* Should we not perform logical HiDPI scaling or perform logical HiDPI scaling and optimize it for performance? */ - if (fUseUnscaledHiDPIOutput || hiDPIOptimizationType == HiDPIOptimizationType_Performance) - { - /* Mark sub-pixmap as HiDPI: */ - subPixmap.setDevicePixelRatio(dDevicePixelRatio); - } - } -#else /* !VBOX_WS_MAC */ /* If HiDPI 'device-pixel-ratio' defined: */ if (dDevicePixelRatio > 1.0) @@ -1567,5 +1515,4 @@ subPixmap.setDevicePixelRatio(dDevicePixelRatio); } -#endif /* !VBOX_WS_MAC */ /* Which point we should draw corresponding sub-pixmap? */ @@ -1584,16 +1531,13 @@ int iContentsShiftX, int iContentsShiftY, bool fUseUnscaledHiDPIOutput, -#ifdef VBOX_WS_MAC - HiDPIOptimizationType hiDPIOptimizationType, -#endif double dDevicePixelRatio) { /* Calculate offset: */ - size_t offset = (rect.x() + iContentsShiftX) * image.depth() / 8 + - (rect.y() + iContentsShiftY) * image.bytesPerLine(); + const size_t offset = (rect.x() + iContentsShiftX) * image.depth() / 8 + + (rect.y() + iContentsShiftY) * image.bytesPerLine(); /* Restrain boundaries: */ - int iSubImageWidth = qMin(rect.width(), image.width() - rect.x() - iContentsShiftX); - int iSubImageHeight = qMin(rect.height(), image.height() - rect.y() - iContentsShiftY); + const int iSubImageWidth = qMin(rect.width(), image.width() - rect.x() - iContentsShiftX); + const int iSubImageHeight = qMin(rect.height(), image.height() - rect.y() - iContentsShiftY); /* Create sub-image (no copy involved): */ @@ -1605,24 +1549,4 @@ QPixmap subPixmap = QPixmap::fromImage(subImage); -#ifdef VBOX_WS_MAC - /* If HiDPI 'device-pixel-ratio' defined: */ - if (dDevicePixelRatio > 1.0) - { - /* Should we perform logical HiDPI scaling and optimize it for performance? */ - if (!fUseUnscaledHiDPIOutput && hiDPIOptimizationType == HiDPIOptimizationType_Performance) - { - /* Fast scale sub-pixmap (2nd copy involved): */ - subPixmap = subPixmap.scaled(subPixmap.size() * dDevicePixelRatio, - Qt::IgnoreAspectRatio, Qt::FastTransformation); - } - - /* Should we not perform logical HiDPI scaling or perform logical HiDPI scaling and optimize it for performance? */ - if (fUseUnscaledHiDPIOutput || hiDPIOptimizationType == HiDPIOptimizationType_Performance) - { - /* Mark sub-pixmap as HiDPI: */ - subPixmap.setDevicePixelRatio(dDevicePixelRatio); - } - } -#else /* !VBOX_WS_MAC */ /* If HiDPI 'device-pixel-ratio' defined: */ if (dDevicePixelRatio > 1.0) @@ -1639,5 +1563,4 @@ subPixmap.setDevicePixelRatio(dDevicePixelRatio); } -#endif /* !VBOX_WS_MAC */ /* Which point we should draw corresponding sub-pixmap? */ @@ -1804,16 +1727,4 @@ } -#ifdef VBOX_WS_MAC -HiDPIOptimizationType UIFrameBuffer::hiDPIOptimizationType() const -{ - return m_pFrameBuffer->hiDPIOptimizationType(); -} - -void UIFrameBuffer::setHiDPIOptimizationType(HiDPIOptimizationType type) -{ - m_pFrameBuffer->setHiDPIOptimizationType(type); -} -#endif - void UIFrameBuffer::handleNotifyChange(int iWidth, int iHeight) { Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h (revision 71055) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h (revision 71056) @@ -121,11 +121,4 @@ void setScalingOptimizationType(ScalingOptimizationType type); -#ifdef VBOX_WS_MAC - /** Returns HiDPI frame-buffer optimization type. */ - HiDPIOptimizationType hiDPIOptimizationType() const; - /** Defines HiDPI frame-buffer optimization type: */ - void setHiDPIOptimizationType(HiDPIOptimizationType type); -#endif - /** Handles frame-buffer notify-change-event. */ void handleNotifyChange(int iWidth, int iHeight); Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (revision 71055) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (revision 71056) @@ -540,19 +540,4 @@ } -#ifdef VBOX_WS_MAC -void UIMachineView::sltHandleHiDPIOptimizationChange(const QString &strMachineID) -{ - /* Skip unrelated machine IDs: */ - if (strMachineID != vboxGlobal().managedVMUuid()) - return; - - /* Take the HiDPI-optimization type into account: */ - frameBuffer()->setHiDPIOptimizationType(gEDataManager->hiDPIOptimizationType(vboxGlobal().managedVMUuid())); - - /* Update viewport: */ - viewport()->update(); -} -#endif /* VBOX_WS_MAC */ - void UIMachineView::sltHandleUnscaledHiDPIOutputModeChange(const QString &strMachineID) { @@ -719,9 +704,4 @@ #endif /* !VBOX_WITH_VIDEOHWACCEL */ -#ifdef VBOX_WS_MAC - /* Take HiDPI optimization type into account: */ - m_pFrameBuffer->setHiDPIOptimizationType(gEDataManager->hiDPIOptimizationType(vboxGlobal().managedVMUuid())); -#endif - /* Take scaling optimization type into account: */ m_pFrameBuffer->setScalingOptimizationType(gEDataManager->scalingOptimizationType(vboxGlobal().managedVMUuid())); @@ -850,9 +830,4 @@ connect(gEDataManager, SIGNAL(sigScalingOptimizationTypeChange(const QString&)), this, SLOT(sltHandleScalingOptimizationChange(const QString&))); -#ifdef VBOX_WS_MAC - /* HiDPI-optimization change: */ - connect(gEDataManager, SIGNAL(sigHiDPIOptimizationTypeChange(const QString&)), - this, SLOT(sltHandleHiDPIOptimizationChange(const QString&))); -#endif /* Unscaled HiDPI output mode change: */ connect(gEDataManager, SIGNAL(sigUnscaledHiDPIOutputModeChange(const QString&)), Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h (revision 71055) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h (revision 71056) @@ -131,9 +131,4 @@ /** Handles the scaling-optimization change. */ void sltHandleScalingOptimizationChange(const QString &strMachineID); - -#ifdef VBOX_WS_MAC - /** Handles the HiDPI-optimization change. */ - void sltHandleHiDPIOptimizationChange(const QString &strMachineID); -#endif /** Handles the unscaled HiDPI output mode change. */