Changeset 74082 in vbox for trunk

Timestamp:

Sep 5, 2018 12:51:57 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VirtualBox Manager UI: Details pane re-styling: Move painting stuff to appropriate place.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/details

Files:

• UIDetailsElement.cpp (modified) (1 diff)
• UIDetailsElement.h (modified) (1 diff)
• UIDetailsItem.cpp (modified) (1 diff)
• UIDetailsItem.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp

@@ -756 +756 @@
     pPainter->restore();
 }
+
+/* static */
+void UIDetailsElement::configurePainterShape(QPainter *pPainter,
+                                          const QStyleOptionGraphicsItem *pOptions,
+                                          int iRadius)
+{
+    /* Rounded corners? */
+    if (iRadius)
+    {
+        /* Setup clipping: */
+        QPainterPath roundedPath;
+        roundedPath.addRoundedRect(pOptions->rect, iRadius, iRadius);
+        pPainter->setRenderHint(QPainter::Antialiasing);
+        pPainter->setClipPath(roundedPath);
+    }
+}
+
+/* static */
+void UIDetailsElement::paintFrameRect(QPainter *pPainter, const QRect &rect, int iRadius)
+{
+    pPainter->save();
+    QPalette pal = QApplication::palette();
+    QColor base = pal.color(QPalette::Active, QPalette::Window);
+    pPainter->setPen(base.darker(160));
+    if (iRadius)
+        pPainter->drawRoundedRect(rect, iRadius, iRadius);
+    else
+        pPainter->drawRect(rect);
+    pPainter->restore();
+}
+
+/* static */
+void UIDetailsElement::paintPixmap(QPainter *pPainter, const QRect &rect, const QPixmap &pixmap)
+{
+    pPainter->drawPixmap(rect, pixmap);
+}
+
+/* static */
+void UIDetailsElement::paintText(QPainter *pPainter, QPoint point,
+                              const QFont &font, QPaintDevice *pPaintDevice,
+                              const QString &strText, const QColor &color)
+{
+    /* Prepare variables: */
+    QFontMetrics fm(font, pPaintDevice);
+    point += QPoint(0, fm.ascent());
+
+    /* Draw text: */
+    pPainter->save();
+    pPainter->setFont(font);
+    pPainter->setPen(color);
+    pPainter->drawText(point, strText);
+    pPainter->restore();
+}

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.h

@@ -283 +283 @@
         /** Paints background using specified @a pPainter and certain @a pOptions. */
         void paintBackground(QPainter *pPainter, const QStyleOptionGraphicsItem *pOptions);
+
+        /** Configures painting shape using passed @a pPainter, @a pOptions and spified @a iRadius. */
+        static void configurePainterShape(QPainter *pPainter, const QStyleOptionGraphicsItem *pOptions, int iRadius);
+        /** Paints frame @a rect using passed @a pPainter and spified @a iRadius. */
+        static void paintFrameRect(QPainter *pPainter, const QRect &rect, int iRadius);
+        /** Paints @a pixmap using passed @a pPainter and spified @a rect. */
+        static void paintPixmap(QPainter *pPainter, const QRect &rect, const QPixmap &pixmap);
+        /** Paints @a strText using passed @a pPainter, @a font, @a color, @a pPaintDevice and spified @a point. */
+        static void paintText(QPainter *pPainter, QPoint point,
+                              const QFont &font, QPaintDevice *pPaintDevice,
+                              const QString &strText, const QColor &color);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsItem.cpp

@@ -276 +276 @@
 }
 
-/* static */
-void UIDetailsItem::configurePainterShape(QPainter *pPainter,
-                                          const QStyleOptionGraphicsItem *pOptions,
-                                          int iRadius)
-{
-    /* Rounded corners? */
-    if (iRadius)
-    {
-        /* Setup clipping: */
-        QPainterPath roundedPath;
-        roundedPath.addRoundedRect(pOptions->rect, iRadius, iRadius);
-        pPainter->setRenderHint(QPainter::Antialiasing);
-        pPainter->setClipPath(roundedPath);
-    }
-}
-
-/* static */
-void UIDetailsItem::paintFrameRect(QPainter *pPainter, const QRect &rect, int iRadius)
-{
-    pPainter->save();
-    QPalette pal = QApplication::palette();
-    QColor base = pal.color(QPalette::Active, QPalette::Window);
-    pPainter->setPen(base.darker(160));
-    if (iRadius)
-        pPainter->drawRoundedRect(rect, iRadius, iRadius);
-    else
-        pPainter->drawRect(rect);
-    pPainter->restore();
-}
-
-/* static */
-void UIDetailsItem::paintPixmap(QPainter *pPainter, const QRect &rect, const QPixmap &pixmap)
-{
-    pPainter->drawPixmap(rect, pixmap);
-}
-
-/* static */
-void UIDetailsItem::paintText(QPainter *pPainter, QPoint point,
-                              const QFont &font, QPaintDevice *pPaintDevice,
-                              const QString &strText, const QColor &color)
-{
-    /* Prepare variables: */
-    QFontMetrics fm(font, pPaintDevice);
-    point += QPoint(0, fm.ascent());
-
-    /* Draw text: */
-    pPainter->save();
-    pPainter->setFont(font);
-    pPainter->setPen(color);
-    pPainter->drawText(point, strText);
-    pPainter->restore();
-}
-
 
 /*********************************************************************************************************************************

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsItem.h

@@ -137 +137 @@
     /** @} */
 
-    /** @name Painting stuff.
-      * @{ */
-        /** Configures painting shape using passed @a pPainter, @a pOptions and spified @a iRadius. */
-        static void configurePainterShape(QPainter *pPainter, const QStyleOptionGraphicsItem *pOptions, int iRadius);
-        /** Paints frame @a rect using passed @a pPainter and spified @a iRadius. */
-        static void paintFrameRect(QPainter *pPainter, const QRect &rect, int iRadius);
-        /** Paints @a pixmap using passed @a pPainter and spified @a rect. */
-        static void paintPixmap(QPainter *pPainter, const QRect &rect, const QPixmap &pixmap);
-        /** Paints @a strText using passed @a pPainter, @a font, @a color, @a pPaintDevice and spified @a point. */
-        static void paintText(QPainter *pPainter, QPoint point,
-                              const QFont &font, QPaintDevice *pPaintDevice,
-                              const QString &strText, const QColor &color);
-    /** @} */
-
 private: