Changeset 95100 in vbox

Timestamp:

May 25, 2022 12:59:54 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt/Ds: macOS: HiDPI support for BETA label stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIImageTools.cpp (modified) (4 diffs)
• globals/UIImageTools.h (modified) (1 diff)
• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• platform/darwin/VBoxUtils-darwin-cocoa.mm (modified) (2 diffs)
• platform/darwin/VBoxUtils-darwin.cpp (modified) (1 diff)
• platform/darwin/VBoxUtils-darwin.h (modified) (1 diff)
• runtime/normal/UIMachineWindowNormal.cpp (modified) (1 diff)
• runtime/scale/UIMachineWindowScale.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp

@@ -22 +22 @@
 
 /* GUI include */
+#include "UIDesktopWidgetWatchdog.h"
 #include "UIImageTools.h"
 
@@ -201 +202 @@
 }
 
-static QImage betaLabelImage(const QSize &size)
-{
+static QImage betaLabelImage(QSize size, QWidget *pHint)
+{
+    /* Calculate device pixel ratio: */
+    const double dDpr = pHint ? gpDesktop->devicePixelRatio(pHint) : gpDesktop->devicePixelRatio(-1);
+    if (dDpr > 1.0)
+        size *= dDpr;
+
     /* Beta label: */
     QColor bgc(246, 179, 0);
@@ -224 +230 @@
     /* The text: */
     QFont f = p.font();
+    if (dDpr > 1.0)
+        f.setPointSize(f.pointSize() * dDpr);
     f.setBold(true);
     QPainterPath tp;
@@ -254 +262 @@
     p1.fillRect(0, 0, size.width(), size.height(), lg);
     p1.end();
+    if (dDpr > 1.0)
+        i1.setDevicePixelRatio(dDpr);
 
     return i1;
 }
 
-QPixmap UIImageTools::betaLabel(const QSize &size /* = QSize(80, 16) */)
-{
-    return QPixmap::fromImage(betaLabelImage(size));
-}
+QPixmap UIImageTools::betaLabel(const QSize &size /* = QSize(80, 16) */, QWidget *pHint /* = 0 */)
+{
+    return QPixmap::fromImage(betaLabelImage(size, pHint));
+}

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.h

@@ -46 +46 @@
 
     /** Applies BET-label of passed @a size. */
-    SHARED_LIBRARY_STUFF QPixmap betaLabel(const QSize &size = QSize(80, 16));
+    SHARED_LIBRARY_STUFF QPixmap betaLabel(const QSize &size = QSize(80, 16), QWidget *pHint = 0);
 }
 using namespace UIImageTools /* if header included */;

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -2031 +2031 @@
     if (uiCommon().isBeta())
     {
-        QPixmap betaLabel = ::betaLabel(QSize(74, 26));
+        QPixmap betaLabel = ::betaLabel(QSize(74, darwinWindowTitleHeight(this) - 1));
         ::darwinLabelWindow(this, &betaLabel);
     }

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

@@ -132 +132 @@
 }
 
-void darwinLabelWindow(NativeNSWindowRef pWindow, NativeNSImageRef pImage)
+void darwinLabelWindow(NativeNSWindowRef pWindow, NativeNSImageRef pImage, double dDpr)
 {
     /* Get the parent view of the close button. */
@@ -142 +142 @@
         NSSize s1 = [wv frame].size;
         /* Correctly position the label. */
-        NSImageView *iv = [[NSImageView alloc] initWithFrame:NSMakeRect(s1.width - s.width,
-                                                                        s1.height - s.height - 1,
-                                                                        s.width, s.height)];
+        NSImageView *iv = [[NSImageView alloc] initWithFrame:NSMakeRect(s1.width - s.width / dDpr,
+                                                                        s1.height - s.height / dDpr - 1,
+                                                                        s.width / dDpr, s.height / dDpr)];
         /* Configure the NSImageView for auto moving. */
         [iv setImage:pImage];

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.cpp

@@ -75 +75 @@
 void darwinLabelWindow(QWidget *pWidget, QPixmap *pPixmap)
 {
-    ::darwinLabelWindow(::darwinToNativeWindow(pWidget), ::darwinToNSImageRef(pPixmap));
+    ::darwinLabelWindow(::darwinToNativeWindow(pWidget), ::darwinToNSImageRef(pPixmap), pPixmap->devicePixelRatio());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.h

@@ -88 +88 @@
 void darwinSetShowsResizeIndicatorImpl(NativeNSWindowRef pWindow, bool fEnabled);
 void darwinSetHidesAllTitleButtonsImpl(NativeNSWindowRef pWindow);
-SHARED_LIBRARY_STUFF void darwinLabelWindow(NativeNSWindowRef pWindow, NativeNSImageRef pImage);
+SHARED_LIBRARY_STUFF void darwinLabelWindow(NativeNSWindowRef pWindow, NativeNSImageRef pImage, double dDpr);
 void darwinSetShowsWindowTransparentImpl(NativeNSWindowRef pWindow, bool fEnabled);
 SHARED_LIBRARY_STUFF void darwinSetWindowHasShadow(NativeNSWindowRef pWindow, bool fEnabled);

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

@@ -347 +347 @@
     if (uiCommon().isBeta())
     {
-        QPixmap betaLabel = ::betaLabel(QSize(74, 26));
+        QPixmap betaLabel = ::betaLabel(QSize(74, darwinWindowTitleHeight(this) - 1));
         ::darwinLabelWindow(this, &betaLabel);
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -74 +74 @@
     if (uiCommon().isBeta())
     {
-        QPixmap betaLabel = ::betaLabel(QSize(74, 26));
+        QPixmap betaLabel = ::betaLabel(QSize(74, darwinWindowTitleHeight(this) - 1));
         ::darwinLabelWindow(this, &betaLabel);
     }