儲存庫 vbox 的更動 42922

時間撮記:

2012-8-22 下午02:36:27 (12 年 以前)

作者:

vboxsync

訊息:

FE/Qt: 6234: Support for VM groups: Chooser-view: Switch from physical to logical text-boundary while painting.

位置:

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

檔案:

• UIGChooserItem.cpp (修改) (1 筆差異)
• UIGChooserItem.h (修改) (1 筆差異)
• UIGChooserItemGroup.cpp (修改) (3 筆差異)
• UIGChooserItemMachine.cpp (修改) (3 筆差異)

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

@@ -328 +328 @@
 
 /* static */
-void UIGChooserItem::paintText(QPainter *pPainter, const QRect &rect, const QFont &font, const QString &strText)
-{
+void UIGChooserItem::paintText(QPainter *pPainter, QPoint point,
+                               const QFont &font, QPaintDevice *pPaintDevice,
+                               const QString &strText)
+{
+    /* Prepare variables: */
+    QFontMetrics fm(font, pPaintDevice);
+    point += QPoint(0, fm.ascent());
+
+    /* Draw text: */
     pPainter->save();
     pPainter->setFont(font);
-    pPainter->drawText(rect, strText);
+    pPainter->drawText(point, strText);
     pPainter->restore();
 }

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

@@ -134 +134 @@
     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 paintText(QPainter *pPainter, const QRect &rect, const QFont &font, const QString &strText);
+    static void paintText(QPainter *pPainter, QPoint point,
+                          const QFont &font, QPaintDevice *pPaintDevice,
+                          const QString &strText);
 
     /* Helpers: Drag and drop stuff: */

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

@@ -1240 +1240 @@
     paintText(/* Painter: */
               pPainter,
-              /* Rectangle to paint in: */
-              QRect(QPoint(iNameX, iNameY), nameSize),
+              /* Point to paint in: */
+              QPoint(iNameX, iNameY),
               /* Font to paint text: */
               data(GroupItemData_NameFont).value<QFont>(),
+              /* Paint device: */
+              model()->paintDevice(),
               /* Text to paint: */
               data(GroupItemData_Name).toString());
@@ -1282 +1284 @@
             paintText(/* Painter: */
                       pPainter,
-                      /* Rectangle to paint in: */
-                      QRect(QPoint(iMachineCountTextX, iMachineCountTextY), machineCountTextSize),
+                      /* Point to paint in: */
+                      QPoint(iMachineCountTextX, iMachineCountTextY),
                       /* Font to paint text: */
                       infoFont,
+                      /* Paint device: */
+                      model()->paintDevice(),
                       /* Text to paint: */
                       strMachineCountText);
@@ -1310 +1314 @@
             paintText(/* Painter: */
                       pPainter,
-                      /* Rectangle to paint in: */
-                      QRect(QPoint(iGroupCountTextX, iGroupCountTextY), groupCountTextSize),
+                      /* Point to paint in: */
+                      QPoint(iGroupCountTextX, iGroupCountTextY),
                       /* Font to paint text: */
                       infoFont,
+                      /* Paint device: */
+                      model()->paintDevice(),
                       /* Text to paint: */
                       strGroupCountText);

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

@@ -707 +707 @@
                 paintText(/* Painter: */
                           pPainter,
-                          /* Rectangle to paint in: */
-                          QRect(QPoint(iNameX, iNameY), machineNameSize),
+                          /* Point to paint in: */
+                          QPoint(iNameX, iNameY),
                           /* Font to paint text: */
                           data(MachineItemData_NameFont).value<QFont>(),
+                          /* Paint device: */
+                          model()->paintDevice(),
                           /* Text to paint: */
                           data(MachineItemData_Name).toString());
@@ -729 +731 @@
                 paintText(/* Painter: */
                           pPainter,
-                          /* Rectangle to paint in: */
-                          QRect(QPoint(iSnapshotNameX, iSnapshotNameY), snapshotNameSize),
+                          /* Point to paint in: */
+                          QPoint(iSnapshotNameX, iSnapshotNameY),
                           /* Font to paint text: */
                           data(MachineItemData_SnapshotNameFont).value<QFont>(),
+                          /* Paint device: */
+                          model()->paintDevice(),
                           /* Text to paint: */
                           data(MachineItemData_SnapshotName).toString());
@@ -770 +774 @@
                 paintText(/* Painter: */
                           pPainter,
-                          /* Rectangle to paint in: */
-                          QRect(QPoint(iMachineStateTextX, iMachineStateTextY), machineStateTextSize),
+                          /* Point to paint in: */
+                          QPoint(iMachineStateTextX, iMachineStateTextY),
                           /* Font to paint text: */
                           data(MachineItemData_StateTextFont).value<QFont>(),
+                          /* Paint device: */
+                          model()->paintDevice(),
                           /* Text to paint: */
                           data(MachineItemData_StateText).toString());