diff --git a/plugins/dde-dock/brightness/CMakeLists.txt b/plugins/dde-dock/brightness/CMakeLists.txt index 050c5690c..04dae682b 100644 --- a/plugins/dde-dock/brightness/CMakeLists.txt +++ b/plugins/dde-dock/brightness/CMakeLists.txt @@ -14,8 +14,6 @@ file(GLOB_RECURSE SRCS "../widgets/*.cpp" "../common/*.h" "../common/*.cpp" - "../util/roundscrollarea.h" - "../util/roundscrollarea.cpp" "../dbus/types/*.h" "../dbus/types/*.cpp" ) diff --git a/plugins/dde-dock/brightness/brightnessapplet.cpp b/plugins/dde-dock/brightness/brightnessapplet.cpp index 6c5bcb1ee..149347f7c 100644 --- a/plugins/dde-dock/brightness/brightnessapplet.cpp +++ b/plugins/dde-dock/brightness/brightnessapplet.cpp @@ -22,7 +22,7 @@ DWIDGET_USE_NAMESPACE BrightnessApplet::BrightnessApplet(QWidget* parent) : QWidget(parent) , m_titleWidget(new QWidget(this)) - , m_scrollArea(new RoundScrollArea(this)) + , m_scrollArea(new QScrollArea(this)) , m_monitorsLayout(nullptr) , m_jumpSettingButton(new JumpSettingButton(this)) , m_minHeight(-1) @@ -58,7 +58,6 @@ void BrightnessApplet::initUI() widget->setAttribute(Qt::WA_TranslucentBackground); widget->setLayout(m_monitorsLayout); m_scrollArea->setWidget(widget); - m_scrollArea->setRadius(0); m_scrollArea->setWidgetResizable(true); m_scrollArea->setFrameStyle(QFrame::NoFrame); m_scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); diff --git a/plugins/dde-dock/brightness/brightnessapplet.h b/plugins/dde-dock/brightness/brightnessapplet.h index dbdd50277..b6d1ac434 100644 --- a/plugins/dde-dock/brightness/brightnessapplet.h +++ b/plugins/dde-dock/brightness/brightnessapplet.h @@ -8,7 +8,6 @@ #include "jumpsettingbutton.h" #include "monitor.h" #include "slidercontainer.h" -#include "roundscrollarea.h" #include #include @@ -39,7 +38,7 @@ class BrightnessApplet : public QWidget private: QWidget *m_titleWidget; - RoundScrollArea *m_scrollArea; + QScrollArea *m_scrollArea; QVBoxLayout *m_monitorsLayout; JumpSettingButton *m_jumpSettingButton; int m_minHeight; diff --git a/plugins/dde-dock/util/roundscrollarea.cpp b/plugins/dde-dock/util/roundscrollarea.cpp deleted file mode 100644 index 9f42cb7b4..000000000 --- a/plugins/dde-dock/util/roundscrollarea.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// SPDX-FileCopyrightText: 2018 - 2023 UnionTech Software Technology Co., Ltd. -// -// SPDX-License-Identifier: LGPL-3.0-or-later - -#include "roundscrollarea.h" - -#include -#include - -#include -#include - -DWIDGET_USE_NAMESPACE - -RoundScrollArea::RoundScrollArea(QWidget *parent) - : QScrollArea(parent) - , m_radius(18) -{ - DPalette pa = DPaletteHelper::instance()->palette(this); - pa.setBrush(DPalette::Window, Qt::transparent); - DPaletteHelper::instance()->setPalette(this, pa); -} - -void RoundScrollArea::setRadius(int radius) -{ - m_radius = radius; - update(); -} - -void RoundScrollArea::paintEvent(QPaintEvent *e) -{ - QPainter painter(viewport()); - painter.setRenderHint(QPainter::Antialiasing); - - QPainterPath path; - path.addRoundedRect(viewport()->rect(), m_radius, m_radius); - painter.setClipPath(path); - painter.fillPath(path, palette().window()); -} diff --git a/plugins/dde-dock/util/roundscrollarea.h b/plugins/dde-dock/util/roundscrollarea.h deleted file mode 100644 index a7744e318..000000000 --- a/plugins/dde-dock/util/roundscrollarea.h +++ /dev/null @@ -1,25 +0,0 @@ -// SPDX-FileCopyrightText: 2018 - 2023 UnionTech Software Technology Co., Ltd. -// -// SPDX-License-Identifier: LGPL-3.0-or-later - -#ifndef ROUNDSCROLLAREA_H -#define ROUNDSCROLLAREA_H - -#include - -class RoundScrollArea : public QScrollArea -{ - Q_OBJECT -public: - explicit RoundScrollArea(QWidget* parent = nullptr); - - void setRadius(int radius); - -protected: - void paintEvent(QPaintEvent* event) override; - -private: - int m_radius; -}; - -#endif // ROUNDSCROLLAREA_H