Tiled Fusion: Improved visibility of group box frame in dark style

mapeditor · Aug 12, 2016 · 6deefd5 · 6deefd5
1 parent 3f1b8ff
commit 6deefd5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/tiled/tiledproxystyle.cpp b/src/tiled/tiledproxystyle.cpp
@@ -264,6 +264,21 @@ void TiledProxyStyle::drawPrimitive(PrimitiveElement element,
                                     const QWidget *widget) const
 {
     switch (element) {
+    case PE_FrameGroupBox:
+    {
+        int topMargin = qMax(pixelMetric(PM_ExclusiveIndicatorHeight), option->fontMetrics.height()) + 3;
+        QRect frame = option->rect.adjusted(0, topMargin, -1, -1);
+        QColor tabFrameColor = getTabFrameColor(option->palette);
+
+        painter->save();
+        painter->setRenderHint(QPainter::Antialiasing);
+        painter->translate(0.5, 0.5);
+        painter->setPen(mergedColors(getOutlineColor(option->palette), tabFrameColor));
+        painter->setBrush(mergedColors(option->palette.window().color(), tabFrameColor));
+        painter->drawRoundedRect(frame, 2.0, 2.0);
+        painter->restore();
+        break;
+    }
     case PE_FrameTabBarBase:
         if (const QStyleOptionTabBarBase *tbb
                 = qstyleoption_cast<const QStyleOptionTabBarBase *>(option)) {

diff --git a/src/tiled/tiledproxystyle.h b/src/tiled/tiledproxystyle.h
@@ -51,8 +51,8 @@ class TiledProxyStyle : public QProxyStyle
                             const QWidget *widget = nullptr) const override;
 
     int pixelMetric(PixelMetric metric,
-                    const QStyleOption *option,
-                    const QWidget *widget) const override;
+                    const QStyleOption *option = nullptr,
+                    const QWidget *widget = nullptr) const override;
 
     QSize sizeFromContents(ContentsType type,
                            const QStyleOption *option,