Skip to content

feat: Improve countdown tooltip positioning for multi-screen scenarios #787

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

Merged
deepin-bot merged 1 commit into from
Dec 25, 2025
Merged

feat: Improve countdown tooltip positioning for multi-screen scenarios #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ AI config
.cursor/
.cursorindexingignore
.specstory/
x11_paint_demo/
x11_paint_demo/

.vscode/
86 changes: 73 additions & 13 deletions src/main_window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7227,22 +7227,82 @@ void MainWindow::startCountdown()
connect(m_tabletRecorderHandle, SIGNAL(finished()), this, SLOT(startRecord()));
m_tabletRecorderHandle->start();
} else {
// QVBoxLayout *countdownLayout = new QVBoxLayout(this);
// setLayout(countdownLayout);
countdownTooltip = new CountdownTooltip(this);
connect(countdownTooltip, SIGNAL(finished()), this, SLOT(startRecord()));

// countdownLayout->addStretch();
// countdownLayout->addWidget(countdownTooltip, 0, Qt::AlignCenter);
// countdownLayout->addStretch();
// adjustLayout(countdownLayout, countdownTooltip->rect().width(), countdownTooltip->rect().height());
// countdownTooltip->move(recordRect.x() + recordRect.width() / 2 - countdownTooltip->width() / 2, recordRect.y() +
// recordRect.height() / 2 - countdownTooltip->height() / 2);

countdownTooltip->move(static_cast<int>((recordRect.x() / m_pixelRatio +
(recordRect.width() / m_pixelRatio - countdownTooltip->width()) / 2)),
static_cast<int>((recordRect.y() / m_pixelRatio +
(recordRect.height() / m_pixelRatio - countdownTooltip->height()) / 2)));
/* https://pms.uniontech.com/story-view-39101.html
* 当录制区域跨屏时，倒计时显示在工具栏所在屏幕的中心（若工具栏也跨屏则显示在主屏中心）
* 录制区域未跨屏时，倒计时仍显示在录屏区域中心。
* 其他场景保持不变。
*/
bool isRecordAreaCrossScreen = false;
QScreen *recordAreaScreen = QGuiApplication::screenAt(recordRect.center());
if (recordAreaScreen) {
QRect screenGeom = recordAreaScreen->geometry();
QRect recordRectLogical(static_cast<int>(recordRect.x() / m_pixelRatio),
static_cast<int>(recordRect.y() / m_pixelRatio),
static_cast<int>(recordRect.width() / m_pixelRatio),
static_cast<int>(recordRect.height() / m_pixelRatio));
if (!screenGeom.contains(recordRectLogical)) {
isRecordAreaCrossScreen = true;
}
} else {
isRecordAreaCrossScreen = true;
}

int countdownX, countdownY;
// 录制区域是否跨屏
if (isRecordAreaCrossScreen) {
QRect targetScreenRect;
if (m_toolBar) {
QRect toolBarGlobalRect = m_toolBar->geometry();
toolBarGlobalRect.moveTopLeft(m_toolBar->mapToGlobal(QPoint(0, 0)));

QScreen *toolBarScreen = QGuiApplication::screenAt(toolBarGlobalRect.center());
bool isToolBarCrossScreen = false;

// 工具栏是否跨屏
if (toolBarScreen) {
QRect screenGeom = toolBarScreen->geometry();
if (!screenGeom.contains(toolBarGlobalRect)) {
isToolBarCrossScreen = true;
}
} else {
isToolBarCrossScreen = true;
}

if (isToolBarCrossScreen) {
QScreen *primaryScreen = QGuiApplication::primaryScreen();
if (primaryScreen) {
targetScreenRect = primaryScreen->geometry();
qCDebug(dsrApp) << "Countdown on primary screen (toolbar crosses screens):" << targetScreenRect;
}
} else {
targetScreenRect = toolBarScreen->geometry();
qCDebug(dsrApp) << "Countdown on toolbar screen:" << targetScreenRect;
}
}

if (targetScreenRect.isEmpty()) {
QScreen *primaryScreen = QGuiApplication::primaryScreen();
if (primaryScreen) {
targetScreenRect = primaryScreen->geometry();
}
}

// 录制区域跨屏时，倒计时显示在目标屏幕中心
countdownX = targetScreenRect.x() + (targetScreenRect.width() - countdownTooltip->width()) / 2;
countdownY = targetScreenRect.y() + (targetScreenRect.height() - countdownTooltip->height()) / 2;
qCDebug(dsrApp) << "Record area crosses screens, countdown position:" << countdownX << countdownY;
} else {
// 其他场景保持不变，倒计时显示在录屏区域中心
countdownX = static_cast<int>((recordRect.x() / m_pixelRatio +
(recordRect.width() / m_pixelRatio - countdownTooltip->width()) / 2));
countdownY = static_cast<int>((recordRect.y() / m_pixelRatio +
(recordRect.height() / m_pixelRatio - countdownTooltip->height()) / 2));
qCDebug(dsrApp) << "Record area not cross screen, countdown position (center of record area):" << countdownX << countdownY;
}
countdownTooltip->move(countdownX, countdownY);

if (m_isFullScreenRecord) {
// 全屏录制时不需要3s倒计时
Expand Down