Skip to content

fix: uncomment activateWindow/showNormal calls #873

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

Draft
add-uos wants to merge 2 commits into
base: master
Choose a base branch
from
+3 −2
Draft

fix: uncomment activateWindow/showNormal calls #873

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6cf109
fix: uncomment activateWindow/showNormal calls
add-uos Oct 23, 2026
f797328
chore: update SPDX copyright year to 2022-2026 (CI SPDX check)
add-uos Oct 26, 2026
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
5 changes: 3 additions & 2 deletions deepin-devicemanager/src/SingleDeviceManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2022-2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -84,7 +84,8 @@ void SingleDeviceManager::startDeviceManager(QString pageDescription)
if (m_qspMainWnd.get()) { //先判断当前是否已经存在一个进程。
qCDebug(appLog) << "Main window exists, activating it.";
m_qspMainWnd.get()->setWindowState((m_qspMainWnd.get()->windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
// m_qspMainWnd.get()->activateWindow(); //特效模式下激活窗口 m_qspMainWnd.get()->showNormal(); //无特效激活窗口
m_qspMainWnd.get()->activateWindow(); //特效模式下激活窗口
m_qspMainWnd.get()->showNormal(); //无特效激活窗口
}
}
}
Loading