Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (revision 55186) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (revision 55187) @@ -94,4 +94,5 @@ template<> bool canConvert(); template<> bool canConvert(); +template<> bool canConvert(); template<> bool canConvert(); #ifndef Q_WS_MAC @@ -178,4 +179,6 @@ template<> QString toInternalString(const GuruMeditationHandlerType &guruMeditationHandlerType); template<> GuruMeditationHandlerType fromInternalString(const QString &strGuruMeditationHandlerType); +template<> QString toInternalString(const ScalingOptimizationType &optimizationType); +template<> ScalingOptimizationType fromInternalString(const QString &strOptimizationType); template<> QString toInternalString(const HiDPIOptimizationType &optimizationType); template<> HiDPIOptimizationType fromInternalString(const QString &strOptimizationType); Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 55186) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (revision 55187) @@ -62,4 +62,5 @@ template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } +template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } #ifndef Q_WS_MAC @@ -1411,4 +1412,36 @@ } +/* QString <= ScalingOptimizationType: */ +template<> QString toInternalString(const ScalingOptimizationType &optimizationType) +{ + QString strResult; + switch (optimizationType) + { + case ScalingOptimizationType_None: strResult = "None"; break; + case ScalingOptimizationType_Performance: strResult = "Performance"; break; + default: + { + AssertMsgFailed(("No text for type=%d", optimizationType)); + break; + } + } + return strResult; +} + +/* ScalingOptimizationType <= QString: */ +template<> ScalingOptimizationType 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 << ScalingOptimizationType_None; + keys << "Performance"; values << ScalingOptimizationType_Performance; + /* 'None' type for empty/unknown words: */ + if (!keys.contains(strOptimizationType, Qt::CaseInsensitive)) + return ScalingOptimizationType_None; + /* Corresponding type for known words: */ + return values.at(keys.indexOf(QRegExp(strOptimizationType, Qt::CaseInsensitive))); +} + /* QString <= HiDPIOptimizationType: */ template<> QString toInternalString(const HiDPIOptimizationType &optimizationType) Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp (revision 55186) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp (revision 55187) @@ -143,4 +143,5 @@ const char* UIExtraDataDefs::GUI_HidLedsSync = "GUI/HidLedsSync"; const char* UIExtraDataDefs::GUI_ScaleFactor = "GUI/ScaleFactor"; +const char* UIExtraDataDefs::GUI_Scaling_Optimization = "GUI/Scaling/Optimization"; /* Virtual Machine: Information dialog: */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 55186) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h (revision 55187) @@ -247,4 +247,6 @@ /** Holds the scale-factor. */ extern const char* GUI_ScaleFactor; + /** Holds the scaling optimization type. */ + extern const char* GUI_Scaling_Optimization; /** @} */ @@ -622,4 +624,11 @@ }; +/** Runtime UI: Scaling optimization types. */ +enum ScalingOptimizationType +{ + ScalingOptimizationType_None, + ScalingOptimizationType_Performance +}; + /** Runtime UI: HiDPI optimization types. */ enum HiDPIOptimizationType Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 55186) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp (revision 55187) @@ -1796,5 +1796,5 @@ << GUI_GuruMeditationHandler << GUI_HidLedsSync - << GUI_ScaleFactor + << GUI_ScaleFactor << GUI_Scaling_Optimization << GUI_InformationWindowGeometry << GUI_DefaultCloseAction << GUI_RestrictedCloseActions @@ -3390,4 +3390,9 @@ /* Set corresponding extra-data value: */ setExtraDataString(GUI_ScaleFactor, QString::number(dScaleFactor), strID); +} + +ScalingOptimizationType UIExtraDataManager::scalingOptimizationType(const QString &strID) +{ + return gpConverter->fromInternalString(extraDataString(GUI_Scaling_Optimization, strID)); } @@ -3692,4 +3697,8 @@ else if (strKey == GUI_ScaleFactor) emit sigScaleFactorChange(strMachineID); + /* Scaling optimization type change: */ + else if (strKey == GUI_Scaling_Optimization) + emit sigScalingOptimizationTypeChange(strMachineID); + /* Unscaled HiDPI Output mode change: */ else if (strKey == GUI_HiDPI_UnscaledOutput) emit sigUnscaledHiDPIOutputModeChange(strMachineID); Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 55186) +++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h (revision 55187) @@ -78,4 +78,7 @@ /** Notifies about the scale-factor change. */ void sigScaleFactorChange(const QString &strMachineID); + + /** Notifies about the scaling optimization type change. */ + void sigScalingOptimizationTypeChange(const QString &strMachineID); /** Notifies about unscaled HiDPI output mode change. */ @@ -475,4 +478,7 @@ /** Defines the @a dScaleFactor. */ void setScaleFactor(double dScaleFactor, const QString &strID); + + /** Returns the scaling optimization type. */ + ScalingOptimizationType scalingOptimizationType(const QString &strID); /** @} */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (revision 55186) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp (revision 55187) @@ -159,8 +159,13 @@ void setUseUnscaledHiDPIOutput(bool fUseUnscaledHiDPIOutput) { m_fUseUnscaledHiDPIOutput = fUseUnscaledHiDPIOutput; } - /** Return HiDPI frame-buffer optimization type. */ + /** Returns frame-buffer scaling optimization type. */ + ScalingOptimizationType scalingOptimizationType() const { return m_enmScalingOptimizationType; } + /** Defines frame-buffer scaling optimization type: */ + void setScalingOptimizationType(ScalingOptimizationType type) { m_enmScalingOptimizationType = type; } + + /** Returns HiDPI frame-buffer optimization type. */ HiDPIOptimizationType hiDPIOptimizationType() const { return m_hiDPIOptimizationType; } - /** Define HiDPI frame-buffer optimization type: */ - void setHiDPIOptimizationType(HiDPIOptimizationType optimizationType) { m_hiDPIOptimizationType = optimizationType; } + /** Defines HiDPI frame-buffer optimization type: */ + void setHiDPIOptimizationType(HiDPIOptimizationType type) { m_hiDPIOptimizationType = type; } DECLARE_NOT_AGGREGATABLE(UIFrameBufferPrivate) @@ -285,4 +290,7 @@ void paintSeamless(QPaintEvent *pEvent); + /** Returns the transformation mode corresponding to the passed ScalingOptimizationType. */ + static Qt::TransformationMode transformationMode(ScalingOptimizationType type); + /** Erases corresponding @a rect with @a painter. */ static void eraseImageRect(QPainter &painter, const QRect &rect, @@ -293,4 +301,5 @@ static void drawImageRect(QPainter &painter, const QImage &image, const QRect &rect, int iContentsShiftX, int iContentsShiftY, + ScalingOptimizationType enmScalingOptimizationType, bool fUseUnscaledHiDPIOutput, HiDPIOptimizationType hiDPIOptimizationType, @@ -342,4 +351,6 @@ /** Holds the scale-factor used by the scaled-size. */ double m_dScaleFactor; + /** Holds the scaling optimization type used by the scaling mechanism. */ + ScalingOptimizationType m_enmScalingOptimizationType; /** Holds the coordinate-system for the scale-factor above. */ QTransform m_transform; @@ -524,4 +535,5 @@ , m_fAutoEnabled(false) , m_dScaleFactor(1.0) + , m_enmScalingOptimizationType(ScalingOptimizationType_None) , m_dBackingScaleFactor(1.0) , m_fUseUnscaledHiDPIOutput(false) @@ -1328,5 +1340,6 @@ scaledImage = m_image.copy(); /* And scaling the image to predefined scaled-factor: */ - scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio, Qt::FastTransformation); + scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio, + transformationMode(scalingOptimizationType())); } /* Finally we are choosing image to paint from: */ @@ -1354,5 +1367,6 @@ drawImageRect(painter, sourceImage, paintRect, m_pMachineView->contentsX(), m_pMachineView->contentsY(), - useUnscaledHiDPIOutput(), hiDPIOptimizationType(), backingScaleFactor()); + scalingOptimizationType(), useUnscaledHiDPIOutput(), + hiDPIOptimizationType(), backingScaleFactor()); } @@ -1368,5 +1382,6 @@ scaledImage = m_image.copy(); /* And scaling the image to predefined scaled-factor: */ - scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio, Qt::FastTransformation); + scaledImage = scaledImage.scaled(m_scaledSize, Qt::IgnoreAspectRatio, + transformationMode(scalingOptimizationType())); } /* Finally we are choosing image to paint from: */ @@ -1420,5 +1435,17 @@ drawImageRect(painter, sourceImage, paintRect, m_pMachineView->contentsX(), m_pMachineView->contentsY(), - useUnscaledHiDPIOutput(), hiDPIOptimizationType(), backingScaleFactor()); + scalingOptimizationType(), useUnscaledHiDPIOutput(), + hiDPIOptimizationType(), backingScaleFactor()); +} + +/* static */ +Qt::TransformationMode UIFrameBufferPrivate::transformationMode(ScalingOptimizationType type) +{ + switch (type) + { + case ScalingOptimizationType_Performance: return Qt::FastTransformation; + default: break; + } + return Qt::SmoothTransformation; } @@ -1472,4 +1499,5 @@ void UIFrameBufferPrivate::drawImageRect(QPainter &painter, const QImage &image, const QRect &rect, int iContentsShiftX, int iContentsShiftY, + ScalingOptimizationType enmScalingOptimizationType, bool fUseUnscaledHiDPIOutput, HiDPIOptimizationType hiDPIOptimizationType, @@ -1501,5 +1529,5 @@ /* Fast scale sub-pixmap (2nd copy involved): */ subPixmap = subPixmap.scaled(subPixmap.size() * dBackingScaleFactor, - Qt::IgnoreAspectRatio, Qt::FastTransformation); + Qt::IgnoreAspectRatio, transformationMode(enmScalingOptimizationType)); } @@ -1671,4 +1699,14 @@ } +ScalingOptimizationType UIFrameBuffer::scalingOptimizationType() const +{ + return m_pFrameBuffer->scalingOptimizationType(); +} + +void UIFrameBuffer::setScalingOptimizationType(ScalingOptimizationType type) +{ + m_pFrameBuffer->setScalingOptimizationType(type); +} + HiDPIOptimizationType UIFrameBuffer::hiDPIOptimizationType() const { @@ -1676,7 +1714,7 @@ } -void UIFrameBuffer::setHiDPIOptimizationType(HiDPIOptimizationType optimizationType) -{ - m_pFrameBuffer->setHiDPIOptimizationType(optimizationType); +void UIFrameBuffer::setHiDPIOptimizationType(HiDPIOptimizationType type) +{ + m_pFrameBuffer->setHiDPIOptimizationType(type); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h (revision 55186) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h (revision 55187) @@ -115,8 +115,13 @@ void setUseUnscaledHiDPIOutput(bool fUseUnscaledHiDPIOutput); - /** Return HiDPI frame-buffer optimization type. */ + /** Returns the frame-buffer scaling optimization type. */ + ScalingOptimizationType scalingOptimizationType() const; + /** Defines the frame-buffer scaling optimization type. */ + void setScalingOptimizationType(ScalingOptimizationType type); + + /** Returns HiDPI frame-buffer optimization type. */ HiDPIOptimizationType hiDPIOptimizationType() const; - /** Define HiDPI frame-buffer optimization type: */ - void setHiDPIOptimizationType(HiDPIOptimizationType optimizationType); + /** Defines HiDPI frame-buffer optimization type: */ + void setHiDPIOptimizationType(HiDPIOptimizationType type); /** Handles frame-buffer notify-change-event. */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (revision 55186) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (revision 55187) @@ -402,4 +402,17 @@ } +void UIMachineView::sltHandleScalingOptimizationChange(const QString &strMachineID) +{ + /* Skip unrelated machine IDs: */ + if (strMachineID != vboxGlobal().managedVMUuid()) + return; + + /* Take the scale-factor into account: */ + frameBuffer()->setScalingOptimizationType(gEDataManager->scalingOptimizationType(vboxGlobal().managedVMUuid())); + + /* Update viewport: */ + viewport()->update(); +} + void UIMachineView::sltHandleUnscaledHiDPIOutputModeChange(const QString &strMachineID) { @@ -675,4 +688,7 @@ connect(gEDataManager, SIGNAL(sigScaleFactorChange(const QString&)), this, SLOT(sltHandleScaleFactorChange(const QString&))); + /* Scaling-optimization change: */ + connect(gEDataManager, SIGNAL(sigScalingOptimizationTypeChange(const QString&)), + this, SLOT(sltHandleScalingOptimizationChange(const QString&))); /* 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 55186) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h (revision 55187) @@ -122,4 +122,7 @@ /** Handles the scale-factor change. */ void sltHandleScaleFactorChange(const QString &strMachineID); + + /** Handles the scaling-optimization change. */ + void sltHandleScalingOptimizationChange(const QString &strMachineID); /** Handles the unscaled HiDPI output mode change. */