Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "disable window shadow effects"

Browse Source 
This reverts commit 196e8df52876d3651db98d9adacd84a8dc72ce8b.

Change-Id: I57bffeebf20b559c0e5edc51c017819f4316156b
This commit is contained in:
Hualet Wang 2017-04-28 11:05:11 +08:00 committed by Deepin Code Review
parent 777291c812
commit 028b57cdb3
Notes: Deepin Code Review 2017-05-02 17:18:02 +08:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: Hualet Wang <mr.asianwang@gmail.com>
Submitted-by: Hualet Wang <mr.asianwang@gmail.com>
Submitted-at: Tue, 02 May 2017 17:17:55 +0800
Reviewed-on: https://cr.deepin.io/22678
Project: dde/dde-dock
Branch: refs/heads/master
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frame/window/mainwindow.cpp
View File

@ -14,9 +14,7 @@ MainWindow::MainWindow(QWidget *parent)
m_mainPanel(new MainPanel(this)),
#ifdef QT_DEBUG
m_platformWindowHandle(this),
#endif
m_positionUpdateTimer(new QTimer(this)),
m_expandDelayTimer(new QTimer(this)),
@ -31,13 +29,11 @@ MainWindow::MainWindow(QWidget *parent)
setWindowFlags(Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus);
setAttribute(Qt::WA_TranslucentBackground);
#ifdef QT_DEBUG
m_platformWindowHandle.setEnableBlurWindow(false);
m_platformWindowHandle.setTranslucentBackground(true);
m_platformWindowHandle.setWindowRadius(0);
m_platformWindowHandle.setBorderWidth(0);
m_platformWindowHandle.setShadowOffset(QPoint(0, 0));
#endif
m_settings = new DockSettings(this);
m_xcbMisc->set_window_type(winId(), XcbMisc::Dock);
@ -49,11 +45,9 @@ MainWindow::MainWindow(QWidget *parent)
updatePanelVisible();
connect(m_mainPanel, &MainPanel::geometryChanged, this, &MainWindow::panelGeometryChanged);
connect(&m_platformWindowHandle, &DPlatformWindowHandle::frameMarginsChanged, this, &MainWindow::adjustShadowMask);
connect(m_panelHideAni, &QPropertyAnimation::finished, this, &MainWindow::adjustShadowMask);
connect(m_panelShowAni, &QPropertyAnimation::finished, this, &MainWindow::adjustShadowMask);
#ifdef QT_DEBUG
connect(&m_platformWindowHandle, &DPlatformWindowHandle::frameMarginsChanged, this, &MainWindow::adjustShadowMask);
#endif
}
MainWindow::~MainWindow()
@ -492,7 +486,6 @@ void MainWindow::updatePanelVisible()
void MainWindow::adjustShadowMask()
{
#ifdef QT_DEBUG
if (m_mainPanel->pos() != QPoint(0, 0) ||
m_panelHideAni->state() == QPropertyAnimation::Running ||
m_panelShowAni->state() == QPauseAnimation::Running)
@ -529,5 +522,4 @@ void MainWindow::adjustShadowMask()
m_platformWindowHandle.setShadowRadius(60);
m_platformWindowHandle.setClipPath(path);
#endif
}

2
frame/window/mainwindow.h
View File

@ -57,9 +57,7 @@ private:
bool m_updatePanelVisible;
MainPanel *m_mainPanel;
#ifdef QT_DEBUG
DPlatformWindowHandle m_platformWindowHandle;
#endif
QTimer *m_positionUpdateTimer;
QTimer *m_expandDelayTimer;