Skip to content

Commit b59cecf

Browse files
fix(focus): update focus policy handling for Wayland and clipboard interactions
- Improved focus policy logic for fullscreen windows in Wayland and Treeland modes, ensuring proper focus behavior for screenshot and recording functionalities. - Enhanced clipboard handling by checking for the presence of the clipboard daemon, allowing for better confirmation of data transfer to the clipboard. - Updated comments for clarity regarding focus policy changes and clipboard signal handling. bug: https://pms.uniontech.com/bug-view-357249.html
1 parent 8eb791c commit b59cecf

1 file changed

Lines changed: 15 additions & 9 deletions

File tree

src/main_window.cpp

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -407,15 +407,17 @@ void MainWindow::initAttributes()
407407
// Qt::WindowStaysOnTopHint: 通知窗口系统该窗口应位于所有其他窗口之上。请注意,在 X11 上的某些窗口管理器上,您还必须传递
408408
// Qt::X11BypassWindowManagerHint 以使此标志正常工作。 Qt::X11BypassWindowManagerHint : 完全绕过窗口管理器。
409409
if (Utils::isWaylandMode || Utils::isTreelandMode) {
410-
// 1070焦点策略管理比1060严格,作为全屏窗口的截图录屏设置了无焦点属性后,窗管不会在设置为获取焦点
411-
// 因此在1070截图录屏截图录屏需要获取焦点,不然应用内快捷键无法响应。
412-
if (DSysInfo::minorVersion().toInt() >= 1070) {
410+
// V20(1070+)/V25 焦点策略更严格:全屏窗口设置了无焦点属性后,窗管不会再设置为获取焦点,
411+
// 因此截图录屏需要获取焦点,不然应用内快捷键无法响应。
412+
const bool isNewFocusPolicy = DSysInfo::majorVersion().toInt() >= 23
413+
|| DSysInfo::minorVersion().toInt() >= 1070;
414+
if (isNewFocusPolicy) {
413415
setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
414416
} else {
415417
setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::WindowDoesNotAcceptFocus);
416418
}
417419
if (this->windowHandle()) {
418-
if (DSysInfo::minorVersion().toInt() >= 1070) {
420+
if (isNewFocusPolicy) {
419421
this->windowHandle()->setProperty("_d_dwayland_window-type", "override");
420422
} else {
421423
this->windowHandle()->setProperty("_d_dwayland_window-type", "onScreenDisplay"); // 窗管层级在1060和1070有所区别,兼容适配bug254705-275661
@@ -2646,8 +2648,10 @@ void MainWindow::save2Clipboard(const QPixmap &pix)
26462648
quality = 60;
26472649
}
26482650
if (Utils::is3rdInterfaceStart == false) {
2649-
if (DSysInfo::minorVersion().toInt() >= 1070) {
2650-
// check if save to clipboard finished
2651+
const bool hasClipboardDaemon = DSysInfo::majorVersion().toInt() >= 23
2652+
|| DSysInfo::minorVersion().toInt() >= 1070;
2653+
if (hasClipboardDaemon) {
2654+
// 连接 dde-clipboard-daemon 的 dataComing 信号,用于确认数据已被剪贴板服务接管
26512655
const QString ClipboardSignal = QStringLiteral("dataComing");
26522656
qCInfo(dsrApp) << "Connecting the clipboard feedback signal..."
26532657
<< "\nClipboardService: " << CLIPBOARD_NAME << "\nClipboardPath: " << CLIPBOARD_PATH
@@ -2719,13 +2723,15 @@ void MainWindow::save2Clipboard(const QPixmap &pix)
27192723
qCDebug(dsrApp) << "Whether the data passed to the clipboard is empty? " << t_imageData->imageData().isNull();
27202724
}
27212725

2722-
if (DSysInfo::minorVersion().toInt() >= 1070) {
2726+
if (hasClipboardDaemon) {
27232727
if (!Utils::isWaylandMode) {
27242728
this->hide(); // 隐藏主界面
27252729
}
2726-
//根据图片大小动态计算等待时间,如果数据还没有传递到剪切板,则退出程序
2730+
// 等待 dde-clipboard-daemon 通过 dataComing 信号确认已接管数据
2731+
// 超时后仍退出,避免无限阻塞
27272732
int waitSeconds = getWaitTimeByImageSize(pix);
27282733
time_t endTime = time(nullptr) + waitSeconds;
2734+
m_isSaveClipboard = false;
27292735
qCInfo(dsrApp) << "Start Wait" << waitSeconds << "s for data to be saved to the clipboard..." << endTime;
27302736
time_t lastTime = 0;
27312737
while (1) {
@@ -6366,7 +6372,7 @@ void MainWindow::onLockScreenEvent(QDBusMessage msg)
63666372
void MainWindow::onSaveClipboardComing(const QByteArray &msg)
63676373
{
63686374
Q_UNUSED(msg);
6369-
qCInfo(dsrApp) << "Received data transfer to the clipboard complete signal!";
6375+
qCWarning(dsrApp) << "Received dataComing signal from clipboard daemon";
63706376
emit saveClipboardComing();
63716377
m_isSaveClipboard = true;
63726378
}

0 commit comments

Comments
 (0)