blumia/dde-application-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修改AM重启后，任务栏上图标变成默认程序的问题

Browse Source 
调整ServiceRestarted发送位置，使其正常发送到DBus上

Log:
Task: https://pms.uniontech.com/task-view-150375.html
Influence: AM重启后，任务栏正常显示
Change-Id: I026c52c716ed950bf175b428a0bfc6e93ba5ce38
This commit is contained in:
weizhixiang 2022-06-16 14:09:01 +08:00
parent 1ba800d8a3
commit 49e6d5ae80
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/dock/dock.cpp
View File

@ -87,8 +87,6 @@ Dock::Dock(QObject *parent)
connect(x11Manager, &X11Manager::requestHandleActiveWindowChange, this, &Dock::handleActiveWindowChanged); connect(x11Manager, &X11Manager::requestHandleActiveWindowChange, this, &Dock::handleActiveWindowChanged);
connect(x11Manager, &X11Manager::requestAttachOrDetachWindow, this, &Dock::attachOrDetachWindow); connect(x11Manager, &X11Manager::requestAttachOrDetachWindow, this, &Dock::attachOrDetachWindow);
} }
Q_EMIT serviceRestarted();
} }
Dock::~Dock() Dock::~Dock()

5
src/modules/dock/dockmanager.cpp
View File

@ -38,10 +38,13 @@ DockManager::DockManager(QObject *parent)
return; return;
} }
if (!con.registerObject(dbusPath, dock, QDBusConnection::ExportAdaptors)) if (!con.registerObject(dbusPath, dock, QDBusConnection::ExportAdaptors)) {
qWarning() << "register object Dock1 error:" << con.lastError().message(); qWarning() << "register object Dock1 error:" << con.lastError().message();
} }
dock->serviceRestarted();
}
DockManager::~DockManager() DockManager::~DockManager()
{ {

2
src/modules/dock/entry.cpp
View File

@ -652,7 +652,7 @@ void Entry::active(uint32_t timestamp)
dock->doActiveWindow(xid); dock->doActiveWindow(xid);
} else if (windowInfoMap.size() == 1) { } else if (windowInfoMap.size() == 1) {
XCB->minimizeWindow(xid); XCB->minimizeWindow(xid);
} else if (dock->getActiveWindow()->getXid() == xid) { } else if (dock->getActiveWindow() && dock->getActiveWindow()->getXid() == xid) {
WindowInfoBase *nextWin = findNextLeader(); WindowInfoBase *nextWin = findNextLeader();
if (nextWin) { if (nextWin) {
nextWin->activate(); nextWin->activate();