Skip to content

fix: remove redundant palette setup in RoundScrollArea #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Aug 18, 2025
Merged

fix: remove redundant palette setup in RoundScrollArea #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions plugins/dde-dock/brightness/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 1 addition & 2 deletions plugins/dde-dock/brightness/brightnessapplet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions plugins/dde-dock/brightness/brightnessapplet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
#ifndef BRIGHTNESSAPPLET_H
#define BRIGHTNESSAPPLET_H

#include "jumpsettingbutton.h"

Check warning on line 8 in plugins/dde-dock/brightness/brightnessapplet.h

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "jumpsettingbutton.h" not found.
#include "monitor.h"
#include "slidercontainer.h"

Check warning on line 10 in plugins/dde-dock/brightness/brightnessapplet.h

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "slidercontainer.h" not found.
#include "roundscrollarea.h"

#include <QWidget>

Check warning on line 12 in plugins/dde-dock/brightness/brightnessapplet.h

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QWidget> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QScrollArea>

Check warning on line 13 in plugins/dde-dock/brightness/brightnessapplet.h

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QScrollArea> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QVBoxLayout>

class BrightnessApplet : public QWidget
Expand Down Expand Up @@ -39,7 +38,7 @@

private:
QWidget *m_titleWidget;
RoundScrollArea *m_scrollArea;
QScrollArea *m_scrollArea;
QVBoxLayout *m_monitorsLayout;
JumpSettingButton *m_jumpSettingButton;
int m_minHeight;
Expand Down
39 changes: 0 additions & 39 deletions plugins/dde-dock/util/roundscrollarea.cpp
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions plugins/dde-dock/util/roundscrollarea.h
View file
Open in desktop

This file was deleted.