@@ -407,15 +407,18 @@ 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 int minor = DSysInfo::minorVersion ().toInt ();
413+ const bool isNewFocusPolicy = minor >= 1070
414+ || DSysInfo::uosEditionType () == DSysInfo::UosCommunity;
415+ if (isNewFocusPolicy) {
413416 setWindowFlags (Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
414417 } else {
415418 setWindowFlags (Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::WindowDoesNotAcceptFocus);
416419 }
417420 if (this ->windowHandle ()) {
418- if (DSysInfo::minorVersion (). toInt () >= 1070 ) {
421+ if (isNewFocusPolicy ) {
419422 this ->windowHandle ()->setProperty (" _d_dwayland_window-type" , " override" );
420423 } else {
421424 this ->windowHandle ()->setProperty (" _d_dwayland_window-type" , " onScreenDisplay" ); // 窗管层级在1060和1070有所区别,兼容适配bug254705-275661
@@ -2642,8 +2645,11 @@ void MainWindow::save2Clipboard(const QPixmap &pix)
26422645 quality = 60 ;
26432646 }
26442647 if (Utils::is3rdInterfaceStart == false ) {
2645- if (DSysInfo::minorVersion ().toInt () >= 1070 ) {
2646- // check if save to clipboard finished
2648+ const int minor = DSysInfo::minorVersion ().toInt ();
2649+ const bool hasClipboardDaemon = minor >= 1070
2650+ || DSysInfo::uosEditionType () == DSysInfo::UosCommunity;
2651+ if (hasClipboardDaemon) {
2652+ // 连接 dde-clipboard-daemon 的 dataComing 信号,用于确认数据已被剪贴板服务接管
26472653 const QString ClipboardSignal = QStringLiteral (" dataComing" );
26482654 qCInfo (dsrApp) << " Connecting the clipboard feedback signal..."
26492655 << " \n ClipboardService: " << CLIPBOARD_NAME << " \n ClipboardPath: " << CLIPBOARD_PATH
@@ -2715,13 +2721,15 @@ void MainWindow::save2Clipboard(const QPixmap &pix)
27152721 qCDebug (dsrApp) << " Whether the data passed to the clipboard is empty? " << t_imageData->imageData ().isNull ();
27162722 }
27172723
2718- if (DSysInfo::minorVersion (). toInt () >= 1070 ) {
2724+ if (hasClipboardDaemon ) {
27192725 if (!Utils::isWaylandMode) {
27202726 this ->hide (); // 隐藏主界面
27212727 }
2722- // 根据图片大小动态计算等待时间,如果数据还没有传递到剪切板,则退出程序
2728+ // 等待 dde-clipboard-daemon 通过 dataComing 信号确认已接管数据
2729+ // 超时后仍退出,避免无限阻塞
27232730 int waitSeconds = getWaitTimeByImageSize (pix);
27242731 time_t endTime = time (nullptr ) + waitSeconds;
2732+ m_isSaveClipboard = false ;
27252733 qCInfo (dsrApp) << " Start Wait" << waitSeconds << " s for data to be saved to the clipboard..." << endTime;
27262734 time_t lastTime = 0 ;
27272735 while (1 ) {
@@ -6368,7 +6376,7 @@ void MainWindow::onLockScreenEvent(QDBusMessage msg)
63686376void MainWindow::onSaveClipboardComing (const QByteArray &msg)
63696377{
63706378 Q_UNUSED (msg);
6371- qCInfo (dsrApp) << " Received data transfer to the clipboard complete signal! " ;
6379+ qCWarning (dsrApp) << " Received dataComing signal from clipboard daemon " ;
63726380 emit saveClipboardComing ();
63736381 m_isSaveClipboard = true ;
63746382}
0 commit comments