fix: Missing radius for tray's background

Add a common function to draw rounded background. Issue: linuxdeepin/developer-center#3744
18202781743 · Mar 8, 2023 · 83421d0 · 83421d0
1 parent 724edd7
commit 83421d0
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/frame/window/components/datetimedisplayer.cpp b/frame/window/components/datetimedisplayer.cpp
@@ -8,6 +8,7 @@
 #include "dockpopupwindow.h"
 #include "utils.h"
 #include "dbusutil.h"
+#include "traymanagerwindow.h"
 
 #include <DFontSizeManager>
 #include <DDBusSender>
@@ -272,12 +273,8 @@ void DateTimeDisplayer::paintEvent(QPaintEvent *e)
     painter.setPen(QPen(palette().brightText(), 1));
 
     // 绘制背景色
-    if (m_isEnter) {
-        QColor backColor = DGuiApplicationHelper::ColorType::DarkType == DGuiApplicationHelper::instance()->themeType() ? QColor(20, 20, 20) : Qt::white;
-        backColor.setAlphaF(0.2);
-        // 鼠标进入的时候，绘制底色
-        painter.fillRect(rect(), backColor);
-    }
+    if (m_isEnter)
+        TrayManagerWindow::drawHoveredRoundedAreaBackground(this);
 
     int timeAlignFlag = Qt::AlignCenter;
     int dateAlignFlag = Qt::AlignCenter;

diff --git a/frame/window/systempluginwindow.cpp b/frame/window/systempluginwindow.cpp
@@ -7,6 +7,7 @@
 #include "systempluginitem.h"
 #include "quicksettingcontroller.h"
 #include "utils.h"
+#include "traymanagerwindow.h"
 
 #include <DListView>
 #include <DGuiApplicationHelper>
@@ -266,12 +267,9 @@ void StretchPluginsItem::paintEvent(QPaintEvent *event)
         rctPixmap.setHeight(ICONSIZE);
     }
 
-    if (m_isEnter) {
-        QColor backColor = DGuiApplicationHelper::ColorType::DarkType == DGuiApplicationHelper::instance()->themeType() ? QColor(20, 20, 20) : Qt::white;
-        backColor.setAlphaF(0.2);
-        // 鼠标进入的时候，绘制底色
-        painter.fillRect(rect(), backColor);
-    }
+    if (m_isEnter)
+        TrayManagerWindow::drawHoveredRoundedAreaBackground(this);
+
     // 绘制图标
     int iconSize = static_cast<int>(ICONSIZE * (QCoreApplication::testAttribute(Qt::AA_UseHighDpiPixmaps) ? 1 : qApp->devicePixelRatio()));
     painter.drawPixmap(rctPixmap, icon.pixmap(iconSize, iconSize));

diff --git a/frame/window/traymanagerwindow.cpp b/frame/window/traymanagerwindow.cpp
@@ -205,6 +205,21 @@ QSize TrayManagerWindow::suitableSize(const Dock::Position &position) const
     return QSize(QWIDGETSIZE_MAX, height);
 }
 
+void TrayManagerWindow::drawHoveredRoundedAreaBackground(QWidget *widget)
+{
+    const int radius = qApp->property("trayBorderRadius").toInt();
+    if (Q_UNLIKELY(!widget) || radius <= 0)
+        return;
+
+    QPainter painter(widget);
+    QColor backColor = DGuiApplicationHelper::ColorType::DarkType == DGuiApplicationHelper::instance()->themeType() ? QColor(20, 20, 20) : Qt::white;
+    backColor.setAlphaF(0.2);
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(backColor);
+
+    painter.drawRoundedRect(widget->rect(), radius, radius);
+}
+
 // 用于返回需要绘制的圆形区域
 QPainterPath TrayManagerWindow::roundedPaths()
 {

diff --git a/frame/window/traymanagerwindow.h b/frame/window/traymanagerwindow.h
@@ -45,6 +45,8 @@ class TrayManagerWindow : public QWidget
     QSize suitableSize() const;
     QSize suitableSize(const Dock::Position &position) const;
 
+    static void drawHoveredRoundedAreaBackground(QWidget *widget);
+
 Q_SIGNALS:
     void requestUpdate();