Skip to content

fix(main_window): enhance tool bar management and cleanup #840

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
May 19, 2026
Merged

fix(main_window): enhance tool bar management and cleanup #840

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
144 changes: 98 additions & 46 deletions src/main_window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,10 +342,7 @@ void MainWindow::initTreelandtAttributes() //initTreelandtAttributes
installEventFilter(this);
createWinId();

//构建截屏工具栏和相关组件
m_toolBar =new ToolBar(this);
m_toolBar->move(100,128);
m_toolBar->show();
// Treeland 截图工具栏在 sourceReady(captureRegionChanged) 后由 updateCaptureRegion 创建

m_sideBar = new SideBar(this);
m_sideBar->initSideBar(this);
Expand All @@ -367,8 +364,6 @@ void MainWindow::initTreelandtAttributes() //initTreelandtAttributes
}
m_zoomIndicator->hideMagnifier();
}
// 设置窗口大小和位置
connect(m_toolBar, &ToolBar::currentFunctionToMain, this, &MainWindow::changeFunctionButton);
m_backgroundRect = rootWindowRect;
m_backgroundRect = QRect(m_backgroundRect.topLeft() / m_pixelRatio, m_backgroundRect.size());
move(m_backgroundRect.topLeft() * m_pixelRatio);
Expand Down Expand Up @@ -915,9 +910,11 @@ void MainWindow::checkIsLockScreen()
qCInfo(dsrApp) << "Current Screen is LockScreen?" << isLockScreen;
if (isLockScreen) {
pinScreenshotsLockScreen(isLockScreen);
m_toolBar->setScrollShotDisabled(true);
m_toolBar->setOcrScreenshotsEnable(false);
m_toolBar->setButEnableOnLockScreen(false);
if (m_toolBar) {
m_toolBar->setScrollShotDisabled(true);
m_toolBar->setOcrScreenshotsEnable(false);
m_toolBar->setButEnableOnLockScreen(false);
}
}
// 电源界面判断接口
QDBusInterface ddeLockFront(
Expand All @@ -935,9 +932,11 @@ void MainWindow::checkIsLockScreen()
qCInfo(dsrApp) << "Current Screen is Powersource UI?" << isLockFront;
if (isLockFront) {
pinScreenshotsLockScreen(isLockScreen);
m_toolBar->setScrollShotDisabled(true);
m_toolBar->setOcrScreenshotsEnable(false);
m_toolBar->setButEnableOnLockScreen(false);
if (m_toolBar) {
m_toolBar->setScrollShotDisabled(true);
m_toolBar->setOcrScreenshotsEnable(false);
m_toolBar->setButEnableOnLockScreen(false);
}
}
}
void MainWindow::initDynamicLibPath()
Expand Down Expand Up @@ -1407,30 +1406,36 @@ void MainWindow::initScreenShot()
// 构建截屏工具栏按钮 by zyg
if (m_firstShot == 0) {
qCDebug(dsrApp) << "initScreenShot m_firstShot == 0";
m_toolBar->hide();
if (m_toolBar) {
m_toolBar->hide();
}
m_sideBar->hide();

// m_recordButton->hide();
// m_shotButton->hide();
m_sizeTips->hide();
}

else {
} else {
qCDebug(dsrApp) << "initScreenShot m_firstShot != 0";
m_toolBar->show();
if (m_toolBar) {
m_toolBar->show();
}
m_sideBar->hide();

// m_recordButton->hide();
// m_shotButton->show();
m_sizeTips->show();

updateToolBarPos();
if (m_toolBar) {
updateToolBarPos();
}
// updateShotButtonPos();
m_sizeTips->setRecorderTipsInfo(false);
m_sizeTips->updateTips(QPoint(recordX, recordY), QSize(recordWidth, recordHeight));
}

m_toolBar->setFocus();
if (m_toolBar) {
m_toolBar->setFocus();
}
qCDebug(dsrApp) << "initScreenShot end";
}

Expand Down Expand Up @@ -1496,24 +1501,28 @@ void MainWindow::initScreenRecorder()
// 构建截屏工具栏按钮 by zyg
if (m_firstShot == 0) {
qCDebug(dsrApp) << "initScreenRecorder m_firstShot == 0";
m_toolBar->hide();
if (m_toolBar) {
m_toolBar->hide();
}
m_sideBar->hide();

// m_recordButton->hide();
// m_shotButton->hide();
m_sizeTips->hide();
}

else {
} else {
qCDebug(dsrApp) << "initScreenRecorder m_firstShot != 0";
m_toolBar->show();
if (m_toolBar) {
m_toolBar->show();
}
m_sideBar->hide();

// m_recordButton->show();
// m_shotButton->hide();
m_sizeTips->show();

updateToolBarPos();
if (m_toolBar) {
updateToolBarPos();
}
// updateRecordButtonPos();
m_sizeTips->setRecorderTipsInfo(true);
m_sizeTips->updateTips(QPoint(recordX, recordY), QSize(recordWidth, recordHeight));
Expand All @@ -1533,7 +1542,9 @@ void MainWindow::initScreenRecorder()
}
}

m_toolBar->setFocus();
if (m_toolBar) {
m_toolBar->setFocus();
}
qCDebug(dsrApp) << "initScreenRecorder end";
}

Expand Down Expand Up @@ -2819,7 +2830,7 @@ void MainWindow::wheelEvent(QWheelEvent *event)

void MainWindow::pinScreenshotsLockScreen(bool isLocked)
{
if (m_toolBarInit) {
if (m_toolBar) {
m_toolBar->setPinScreenshotsEnable(!isLocked);
}
}
Expand Down Expand Up @@ -2915,7 +2926,10 @@ void MainWindow::compositeChanged()
{
// 滚动截图过程中动态切换为2D模式，直接结束
if (m_functionType == status::shot) {
m_toolBar->setScrollShotDisabled(!m_wmHelper->hasBlurWindow());
// Treeland：工具栏在 sourceReady 后才创建，Wayland 初始化可能先触发 hasBlurWindowChanged
if (m_toolBar) {
m_toolBar->setScrollShotDisabled(!m_wmHelper->hasBlurWindow());
}
return;
}
if (!m_wmHelper->hasBlurWindow() && m_functionType == status::scrollshot) {
Expand Down Expand Up @@ -2952,7 +2966,7 @@ void MainWindow::compositeChanged()

void MainWindow::updateToolBarPos()
{
if (m_shotflag == 1) {
if (m_shotflag == 1 || !m_toolBar) {
return;
}
m_isToolBarInside = false;
Expand Down Expand Up @@ -5243,16 +5257,18 @@ int MainWindow::mouseMoveEF(QMouseEvent *mouseEvent, bool &needRepaint)
m_currentCursor = mouseEvent->pos();
// 没打开截图的编辑模式
if (!m_isShapesWidgetExist) {
if (m_toolBar->isVisible()) {
if (m_toolBar && m_toolBar->isVisible()) {
updateToolBarPos();
m_zoomIndicator->hideMagnifier();
if (m_zoomIndicator) {
m_zoomIndicator->hideMagnifier();
}
}

if (!isFirstMove) {
isFirstMove = true;
} else {
if (status::shot == m_functionType) {
if (!m_toolBar->isVisible() && !isFirstReleaseButton) {
if (m_toolBar && !m_toolBar->isVisible() && !isFirstReleaseButton) {
// QPoint curPos = this->cursor().pos(); 采用全局坐标，替换局部坐标
// mouseEvent->globalPos()此接口获取的光标坐标是已经缩放后的坐标，需还原
QPoint curPos = this->cursor().pos(); // 采用全局坐标，替换局部坐标
Expand Down Expand Up @@ -7748,7 +7764,7 @@ void MainWindow::initializeCapture()
);

connect(manager->context(), &TreelandCaptureContext::captureRegionChanged,
this, &MainWindow::updateCaptureRegion);
this, &MainWindow::updateCaptureRegion, Qt::UniqueConnection);

connect(manager, &TreelandCaptureManager::finishSelect,
this, &MainWindow::handleCaptureFinish);
Expand Down Expand Up @@ -7854,32 +7870,68 @@ void MainWindow::onFinishClicked()
TreelandCaptureManager::instance()->finishSelect();
}

void MainWindow::destroyTreelandToolBar()
{
if (!m_toolBar) {
return;
}

ToolBar *toolBar = m_toolBar;
m_toolBar = nullptr;
m_toolBarInit = false;

if (toolBar->windowHandle()) {
toolBar->windowHandle()->setParent(nullptr);
}
toolBar->blockSignals(true);
disconnect(toolBar, nullptr, nullptr, nullptr);
disconnect(nullptr, nullptr, toolBar, nullptr);
toolBar->hide();
delete toolBar;
// 选项菜单里的边框子菜单由 ImageBorderHelper 缓存，需清理悬空指针
ImageBorderHelper::instance()->pruneBorderMenus();
}

void MainWindow::updateCaptureRegion()
{
auto context = TreelandCaptureManager::instance()->context();
if (!context) return;
QRect region = context->captureRegion().toRect();
if (!context) {
return;
}

const QRect region = context->captureRegion().toRect();
// 无效选区：只销毁旧工具栏，等下一次 sourceReady 再创建
if (region.width() <= 0 || region.height() <= 0) {
destroyTreelandToolBar();
return;
}

// 每次重新选区：先析构上一块工具栏（含 Wayland subsurface），再按新选区 new
destroyTreelandToolBar();

m_toolBar = new ToolBar(this);
connect(m_toolBar, &ToolBar::currentFunctionToMain, this, &MainWindow::changeFunctionButton);
m_toolBar->initToolBar(this, isHideToolBar);
m_toolBar->setRecordLaunchMode(m_functionType);
m_toolBarInit = true;

m_toolBar->setAttribute(Qt::WA_TranslucentBackground);
m_toolBar->setWindowFlags(Qt::FramelessWindowHint | Qt::Tool | Qt::WindowStaysOnTopHint);

recordX = region.x();
recordY = region.y();
recordWidth = region.width();
recordHeight = region.height();

m_toolBar->showWidget();
QPoint pos(region.x(), qMin(region.bottom(), height() - 2 * m_toolBar->height()));
const QPoint pos(region.x(), qMin(region.bottom(), height() - 2 * m_toolBar->height()));
m_toolBar->showAt(pos);
m_toolBar->showWidget();


if(windowHandle()&&m_toolBar->windowHandle())
{
if(m_toolBar->windowHandle()->parent() != windowHandle())
{
m_toolBar->windowHandle()->setParent(windowHandle());
m_toolBar->hide();
m_toolBar->show();
}
if (windowHandle() && m_toolBar->windowHandle()
&& m_toolBar->windowHandle()->parent() != windowHandle()) {
m_toolBar->windowHandle()->setParent(windowHandle());
m_toolBar->hide();
m_toolBar->show();
}
}

Expand Down
3 changes: 3 additions & 0 deletions src/main_window.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,9 @@ public slots:
*/
void updateCaptureRegion();

/** Treeland：销毁当前工具栏（含 subsurface 解绑），便于重选区后重建 */
void destroyTreelandToolBar();

Q_SCRIPTABLE void stopRecord();
Q_SCRIPTABLE void stopApp();

Expand Down
55 changes: 42 additions & 13 deletions src/widgets/imagemenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,26 +254,49 @@ ImageBorderHelper *ImageBorderHelper::instance()
return m_imageBorderHelper;
}

void ImageBorderHelper::pruneBorderMenus()
{
for (auto it = m_allBorderMenu.begin(); it != m_allBorderMenu.end();) {
if (it.value().isNull()) {
it = m_allBorderMenu.erase(it);
} else {
++it;
}
}
}

ImageMenu *ImageBorderHelper::getBorderMenu(const BorderType type, const QString title, QWidget *parent)
{
qCDebug(dsrApp) << "ImageBorderHelper::getBorderMenu called for type:" << type << ", title:" << title;
if (!m_allBorderMenu.contains(type)) {
qCDebug(dsrApp) << "Menu for type" << type << "not found, creating new one";
m_allBorderMenu.insert(type, new ImageMenu(type, title, parent));
pruneBorderMenus();

if (ImageMenu *cached = m_allBorderMenu.value(type)) {
if (cached->parent() == parent) {
return cached;
}
m_allBorderMenu.remove(type);
delete cached;
}
qCDebug(dsrApp) << "Returning menu for type:" << type;
return m_allBorderMenu[type];

ImageMenu *menu = new ImageMenu(type, title, parent);
m_allBorderMenu.insert(type, menu);
qCDebug(dsrApp) << "Created border menu for type:" << type;
return menu;
}

void ImageBorderHelper::setActionState(const BorderType type, const bool isChecked)
{
qCDebug(dsrApp) << "ImageBorderHelper::setActionState called for type:" << type << ", isChecked:" << isChecked;
// 选中某边框，后清空其他类型的所有边框
for (auto itr = m_allBorderMenu.begin(); itr != m_allBorderMenu.end(); ++itr) {
qCDebug(dsrApp) << "Processing menu for border type:" << itr.value()->borderType();
if (itr.value()->borderType() != type) {
qCDebug(dsrApp) << "Clearing action state for other border type:" << itr.value()->borderType();
itr.value()->ActionChecked(nullptr);
ImageMenu *menu = itr.value();
if (!menu) {
continue;
}
qCDebug(dsrApp) << "Processing menu for border type:" << menu->borderType();
if (menu->borderType() != type) {
qCDebug(dsrApp) << "Clearing action state for other border type:" << menu->borderType();
menu->ActionChecked(nullptr);
}
}

Expand All @@ -287,6 +310,9 @@ int ImageBorderHelper::getBorderTypeDetail()
int typeDetail = 0;
for (auto itr = m_allBorderMenu.begin(); itr != m_allBorderMenu.end(); ++itr) {
ImageMenu *menu = itr.value();
if (!menu) {
continue;
}
qCDebug(dsrApp) << "Getting border type detail for menu of type:" << menu->borderType();
typeDetail = menu->getBorderTypeDetail();
if (typeDetail != 0) {
Expand All @@ -306,9 +332,9 @@ void ImageBorderHelper::setBorderTypeDetail(const int typeDetail)
int id = typeDetail & 0xFF;
qCDebug(dsrApp) << "Parsed type:" << type << ", ID:" << id;

if (m_allBorderMenu.contains(type)) {
if (ImageMenu *menu = m_allBorderMenu.value(type)) {
qCDebug(dsrApp) << "Menu for type" << type << "found, setting border type detail";
m_allBorderMenu[type]->setBorderTypeDetail(id);
menu->setBorderTypeDetail(id);
}
}

Expand Down Expand Up @@ -387,9 +413,12 @@ ImageBorderHelper::~ImageBorderHelper()
{
qCDebug(dsrApp) << "ImageBorderHelper destructor entered";
for (auto itr = m_allBorderMenu.begin(); itr != m_allBorderMenu.end(); ++itr) {
qCDebug(dsrApp) << "Deleting border menu for type:" << itr.value()->borderType();
delete *itr;
if (ImageMenu *menu = itr.value()) {
qCDebug(dsrApp) << "Deleting border menu for type:" << menu->borderType();
delete menu;
}
}
m_allBorderMenu.clear();
if (m_borderhandle != nullptr) {
qCDebug(dsrApp) << "Deleting border handler";
delete m_borderhandle;
Expand Down
Loading
Loading