VirtualBox

Changeset 69824 in vbox


Ignore:
Timestamp:
Nov 24, 2017 12:50:34 PM (7 years ago)
Author:
vboxsync
Message:

FE/Qt: bugref:8694: Removing VBOX_GUI_WITH_HIDPI define since it was necessary for Qt4 only.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r69809 r69824  
    618618 VBOX_WITH_COCOA_QT = 1
    619619endif
    620 # HiDPI support for OS X
    621 VBOX_GUI_WITH_HIDPI = 1
    622620# The SDL based GUI.
    623621VBOX_WITH_VBOXSDL = 1
    … …  
    11901188  VBOX_WITH_AUDIO_VIDEOREC=
    11911189 endif
    1192  VBOX_GUI_WITH_HIDPI=
    11931190 # branding
    11941191 VBOX_BRAND_LICENSE_HTML             := $(PATH_ROOT)/doc/License-gpl-2.0.html

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r69518 r69824  
    136136        $(if $(VBOX_WITH_WDDM),VBOX_WITH_WDDM) \
    137137        $(if $(VBOX_WITH_CROGL),VBOX_WITH_CROGL) \
    138         $(if $(VBOX_GUI_WITH_HIDPI),VBOX_GUI_WITH_HIDPI) \
    139138        $(if $(VBOX_GUI_WITH_PIDFILE),VBOX_GUI_WITH_PIDFILE) \
    140139        $(if $(VBOX_GUI_WITH_KEYS_RESET_HANDLER),VBOX_GUI_WITH_KEYS_RESET_HANDLER) \

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp

    r68432 r69824  
    245245
    246246#ifdef VBOX_WS_MAC
    247 # ifdef VBOX_GUI_WITH_HIDPI
    248     /* Test if HiDPI icons are enabled. Works only with a patched version of Qt 4.x
    249      * with the changes from https://codereview.qt-project.org/#change,54636 applied. */
     247    /* Test if HiDPI icons are enabled: */
    250248    if (!qApp->testAttribute(Qt::AA_UseHighDpiPixmaps))
    251249        return;
    252 # else /* !VBOX_GUI_WITH_HIDPI */
    253     /* Otherwise HiDPI icons are useless: */
    254     return;
    255 # endif /* !VBOX_GUI_WITH_HIDPI */
    256250#endif /* VBOX_WS_MAC */
    257251

  • trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

    r69500 r69824  
    412412
    413413#ifdef VBOX_WS_MAC
    414 # ifdef VBOX_GUI_WITH_HIDPI
    415         /* Enable HiDPI icons.
    416          * For this we require a patched version of Qt 4.x with
    417          * the changes from https://codereview.qt-project.org/#change,54636 applied. */
     414        /* Enable HiDPI icons: */
    418415        a.setAttribute(Qt::AA_UseHighDpiPixmaps);
    419 # endif /* VBOX_GUI_WITH_HIDPI */
    420416
    421417        /* Disable menu icons on MacOS X host: */

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

    r69500 r69824  
    9191    NativeNSImageRef pNSImage = ::darwinToNSImageRef(pCGImage);
    9292    CGImageRelease(pCGImage);
    93 #ifdef VBOX_GUI_WITH_HIDPI
    9493    /* Apply device pixel ratio: */
    9594    double dScaleFactor = pImage->devicePixelRatio();
    … …  
    9796                         (CGFloat)pImage->height() / dScaleFactor };
    9897    [pNSImage setSize:imageSize];
    99 #endif /* VBOX_GUI_WITH_HIDPI */
    10098    /* Return result: */
    10199    return pNSImage;

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

    r69500 r69824  
    15211521
    15221522#ifdef VBOX_WS_MAC
    1523 # ifdef VBOX_GUI_WITH_HIDPI
    15241523        /* Should we
    1525          * do not perform logical HiDPI scaling or
     1524         * not perform logical HiDPI scaling or
    15261525         * perform logical HiDPI scaling and optimize it for performance? */
    15271526        if (fUseUnscaledHiDPIOutput || hiDPIOptimizationType == HiDPIOptimizationType_Performance)
    … …  
    15301529            subPixmap.setDevicePixelRatio(dBackingScaleFactor);
    15311530        }
    1532 # endif /* VBOX_GUI_WITH_HIDPI */
    15331531#endif /* VBOX_WS_MAC */
    15341532    }
    … …  
    15811579
    15821580#ifdef VBOX_WS_MAC
    1583 # ifdef VBOX_GUI_WITH_HIDPI
    15841581        /* Should we
    1585          * do not perform logical HiDPI scaling or
     1582         * not perform logical HiDPI scaling or
    15861583         * perform logical HiDPI scaling and optimize it for performance? */
    15871584        if (fUseUnscaledHiDPIOutput || hiDPIOptimizationType == HiDPIOptimizationType_Performance)
    … …  
    15901587            subPixmap.setDevicePixelRatio(dBackingScaleFactor);
    15911588        }
    1592 # endif /* VBOX_GUI_WITH_HIDPI */
    15931589#endif /* VBOX_WS_MAC */
    15941590    }

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

    r69500 r69824  
    11211121    m_pausePixmap = QPixmap::fromImage(screenShot);
    11221122#ifdef VBOX_WS_MAC
    1123 # ifdef VBOX_GUI_WITH_HIDPI
    11241123    /* Adjust backing-scale-factor if necessary: */
    11251124    const double dBackingScaleFactor = frameBuffer()->backingScaleFactor();
    11261125    if (dBackingScaleFactor > 1.0 && frameBuffer()->useUnscaledHiDPIOutput())
    11271126        m_pausePixmap.setDevicePixelRatio(dBackingScaleFactor);
    1128 # endif /* VBOX_GUI_WITH_HIDPI */
    11291127#endif /* VBOX_WS_MAC */
    11301128
    … …  
    11581156    m_pausePixmap = QPixmap::fromImage(screenShot);
    11591157#ifdef VBOX_WS_MAC
    1160 # ifdef VBOX_GUI_WITH_HIDPI
    11611158    /* Adjust backing-scale-factor if necessary: */
    11621159    const double dBackingScaleFactor = frameBuffer()->backingScaleFactor();
    11631160    if (dBackingScaleFactor > 1.0 && frameBuffer()->useUnscaledHiDPIOutput())
    11641161        m_pausePixmap.setDevicePixelRatio(dBackingScaleFactor);
    1165 # endif /* VBOX_GUI_WITH_HIDPI */
    11661162#endif /* VBOX_WS_MAC */
    11671163
    … …  
    11841180    m_pausePixmapScaled = pausePixmap().scaled(scaledSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
    11851181#ifdef VBOX_WS_MAC
    1186 # ifdef VBOX_GUI_WITH_HIDPI
    11871182    /* Adjust backing-scale-factor if necessary: */
    11881183    const double dBackingScaleFactor = frameBuffer()->backingScaleFactor();
    11891184    if (dBackingScaleFactor > 1.0 && frameBuffer()->useUnscaledHiDPIOutput())
    11901185        m_pausePixmapScaled.setDevicePixelRatio(dBackingScaleFactor);
    1191 # endif /* VBOX_GUI_WITH_HIDPI */
    11921186#endif /* VBOX_WS_MAC */
    11931187}

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

    r69500 r69824  
    17771777    QPixmap cursorPixmap = QPixmap::fromImage(image);
    17781778# ifdef VBOX_WS_MAC
    1779 #  ifdef VBOX_GUI_WITH_HIDPI
    17801779    /* Adjust backing-scale-factor: */
    17811780    /// @todo In case of multi-monitor setup check whether backing-scale factor and cursor are screen specific.
    … …  
    17911790        cursorPixmap.setDevicePixelRatio(dBackingScaleFactor);
    17921791    }
    1793 #  endif /* VBOX_GUI_WITH_HIDPI */
    17941792# endif /* VBOX_WS_MAC */
    17951793    /* Set the new cursor: */
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