Changeset 51265 in vbox for trunk

Timestamp:

May 15, 2014 6:04:22 PM (11 years ago)

Author:

vboxsync

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

93725

Message:

FE/Qt: Mac OS X: HiDPI: Fixing few native cases.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/darwin/UICocoaSpecialControls.mm (modified) (1 diff)
• platform/darwin/VBoxUtils-darwin-cocoa.mm (modified) (1 diff)
• selector/UIVMDesktop.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm

@@ -398 +398 @@
 void UICocoaSegmentedButton::setIcon(int iSegment, const QIcon& icon)
 {
-    QImage image = toGray(icon.pixmap(icon.actualSize(QSize(13, 13))).toImage());
+    QImage image = toGray(icon.pixmap(icon.availableSizes().first()).toImage());
 
     NSImage *pNSimage = [::darwinToNSImageRef(&image) autorelease];

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm

@@ -70 +70 @@
 NativeNSImageRef darwinToNSImageRef(const QImage *pImage)
 {
-   CGImageRef pCGImage = ::darwinToCGImageRef(pImage);
-   NativeNSImageRef pNSImage = ::darwinToNSImageRef(pCGImage);
-   CGImageRelease(pCGImage);
-   return pNSImage;
+    /* Create CGImage on the basis of passed QImage: */
+    CGImageRef pCGImage = ::darwinToCGImageRef(pImage);
+    NativeNSImageRef pNSImage = ::darwinToNSImageRef(pCGImage);
+    CGImageRelease(pCGImage);
+    /* Apply device pixel ratio: */
+    double dScaleFactor = pImage->devicePixelRatio();
+    NSSize imageSize = { (CGFloat)pImage->width() / dScaleFactor,
+                         (CGFloat)pImage->height() / dScaleFactor };
+    [pNSImage setSize:imageSize];
+    /* Return result: */
+    return pNSImage;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp

@@ -229 +229 @@
     /* Prepare buttons: */
     m_pHeaderBtn = new UITexturedSegmentedButton(2);
-    m_pHeaderBtn->setIcon(Dtls, UIIconPool::iconSet(":/vm_settings_16px.png"));
+    m_pHeaderBtn->setIcon(Dtls, UIIconPool::iconSet(":/vm_settings_16px.png",
+                                                    ":/vm_settings_disabled_16px.png"));
     m_pHeaderBtn->setIcon(Snap, UIIconPool::iconSet(":/snapshot_take_16px.png",
                                                     ":/snapshot_take_disabled_16px.png"));