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

fix: 紧急修复任务栏无法置顶的问题

Browse Source 
系qt和x的一些接口冲突，导致设置DOCK角色失败

Log:
Change-Id: I28e0cd64a9717f60e6bf060cb369ea637386875d
This commit is contained in:
Fanpengcheng 2020-10-30 14:37:40 +08:00
parent 61e3f404cc
commit 35df09ee53
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frame/util/multiscreenworker.cpp
View File

@ -932,9 +932,6 @@ void MultiScreenWorker::initMembers()
m_delayTimer->setInterval(2000);
m_delayTimer->setSingleShot(true);
//　设置应用角色为任务栏
XcbMisc::instance()->set_window_type(xcb_window_t(parent()->winId()), XcbMisc::Dock);
// init check
checkDaemonDockService();
checkDaemonDisplayService();

3
frame/window/mainwindow.cpp
View File

@ -92,7 +92,10 @@ MainWindow::MainWindow(QWidget *parent)
m_mainPanel->setAccessibleName("mainpanel");
setAttribute(Qt::WA_TranslucentBackground);
setAttribute(Qt::WA_X11DoNotAcceptFocus);
// 确保下面两行代码的先后顺序，否则会导致任务栏界面不再置顶
setWindowFlags(Qt::WindowDoesNotAcceptFocus);
XcbMisc::instance()->set_window_type(xcb_window_t(this->winId()), XcbMisc::Dock);
setMouseTracking(true);
setAcceptDrops(true);