Changeset 50932 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 31, 2014 4:01:12 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Selector UI: Chooser pane: Position icons by top-left point, not by rectangle (requirement for HiDPI painting support).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser

Files:

• UIGChooserItem.cpp (modified) (1 diff)
• UIGChooserItem.h (modified) (1 diff)
• UIGChooserItemGroup.cpp (modified) (2 diffs)
• UIGChooserItemMachine.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItem.cpp

@@ -354 +354 @@
 
 /* static */
-void UIGChooserItem::paintPixmap(QPainter *pPainter, const QRect &rect, const QPixmap &pixmap)
-{
-    pPainter->drawPixmap(rect, pixmap);
+void UIGChooserItem::paintPixmap(QPainter *pPainter, const QPoint &point, const QPixmap &pixmap)
+{
+    pPainter->drawPixmap(point, pixmap);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItem.h

@@ -162 +162 @@
     static void configurePainterShape(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, int iRadius);
     static void paintFrameRect(QPainter *pPainter, const QRect &rect, bool fIsSelected, int iRadius);
-    static void paintPixmap(QPainter *pPainter, const QRect &rect, const QPixmap &pixmap);
+    static void paintPixmap(QPainter *pPainter, const QPoint &point, const QPixmap &pixmap);
     static void paintText(QPainter *pPainter, QPoint point,
                           const QFont &font, QPaintDevice *pPaintDevice,

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp

@@ -1735 +1735 @@
             paintPixmap(/* Painter: */
                         pPainter,
-                        /* Rectangle to paint in: */
-                        QRect(QPoint(iMachinePixmapX, iMachinePixmapY), m_pixmapSizeMachines),
+                        /* Point to paint in: */
+                        QPoint(iMachinePixmapX, iMachinePixmapY),
                         /* Pixmap to paint: */
                         m_machinesPixmap);
@@ -1765 +1765 @@
             paintPixmap(/* Painter: */
                         pPainter,
-                        /* Rectangle to paint in: */
-                        QRect(QPoint(iGroupPixmapX, iGroupPixmapY), m_pixmapSizeGroups),
+                        /* Point to paint in: */
+                        QPoint(iGroupPixmapX, iGroupPixmapY),
                         /* Pixmap to paint: */
                         m_groupsPixmap);

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp

@@ -952 +952 @@
         paintPixmap(/* Painter: */
                     pPainter,
-                    /* Rectangle to paint in: */
-                    QRect(QPoint(iMachinePixmapX, iMachinePixmapY), m_pixmapSize),
+                    /* Point to paint in: */
+                    QPoint(iMachinePixmapX, iMachinePixmapY),
                     /* Pixmap to paint: */
                     m_pixmap);
@@ -1029 +1029 @@
                 paintPixmap(/* Painter: */
                             pPainter,
-                            /* Rectangle to paint in: */
-                            QRect(QPoint(iMachineStatePixmapX, iMachineStatePixmapY), m_statePixmapSize),
+                            /* Point to paint in: */
+                            QPoint(iMachineStatePixmapX, iMachineStatePixmapY),
                             /* Pixmap to paint: */
                             m_statePixmap);