From 81d43a2d103ee195a53413b514a351dae6409d3b Mon Sep 17 00:00:00 2001 From: zhangkun Date: Wed, 19 Jun 2024 09:36:41 +0800 Subject: [PATCH] fix: border color issue adjust Inner border and outer border Issue: linuxdeepin/developer-center#8342 --- dde-clipboard/mainwindow.cpp | 4 ++++ dde-clipboard/mainwindow.h | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/dde-clipboard/mainwindow.cpp b/dde-clipboard/mainwindow.cpp index cd1ecd4..8d6cc4f 100644 --- a/dde-clipboard/mainwindow.cpp +++ b/dde-clipboard/mainwindow.cpp @@ -30,7 +30,11 @@ const QString AppearancePath = QStringLiteral("/org/deepin/dde/Appearance1"); const QString AppearanceInterface = QStringLiteral("org.deepin.dde.Appearance1"); MainWindow::MainWindow(QWidget *parent) +#ifdef DTKWIDGET_CLASS_DBlurEffectWithBorderWidget + : DBlurEffectWithBorderWidget(parent) +#else : DBlurEffectWidget(parent) +#endif , m_displayInter(new DBusDisplay("org.deepin.dde.Display1", "/org/deepin/dde/Display1", QDBusConnection::sessionBus(), this)) , m_daemonDockInter(new DBusDaemonDock("org.deepin.dde.daemon.Dock1", "/org/deepin/dde/daemon/Dock1", QDBusConnection::sessionBus(), this)) , m_dockInter(new DBusDockInterface) diff --git a/dde-clipboard/mainwindow.h b/dde-clipboard/mainwindow.h index e5f1938..f3652ad 100644 --- a/dde-clipboard/mainwindow.h +++ b/dde-clipboard/mainwindow.h @@ -14,7 +14,11 @@ #include "listview.h" #include "iconbutton.h" +#ifdef DTKWIDGET_CLASS_DBlurEffectWithBorderWidget +#include +#else #include +#endif #include #include #include @@ -39,7 +43,11 @@ using DBusDaemonDock = org::deepin::dde::daemon::Dock1; * \~chinese \class MainWindow * \~chinese \brief 主窗口类 */ +#ifdef DTKWIDGET_CLASS_DBlurEffectWithBorderWidget +class MainWindow : public DBlurEffectWithBorderWidget +#else class MainWindow : public DBlurEffectWidget +#endif { Q_OBJECT Q_PROPERTY(int width READ getWidth WRITE setFixedWidth)