Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-02 15:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: dont hide all close button

Browse Source 
Log: 由于相关接口被移除，暂时无法正确设置 m_closeAble 属性，暂改为默认 true
Task: https://github.com/linuxdeepin/developer-center/issues/3608
This commit is contained in:
wineee 2023-03-08 09:53:29 +08:00 committed by deepin-bot[bot]
parent 5743806ad8
commit c89b3cce44
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frame/item/components/appsnapshot.cpp
View File

@ -44,7 +44,7 @@ using namespace Dock;
AppSnapshot::AppSnapshot(const WId wid, QWidget *parent)
: QWidget(parent)
, m_wid(wid)
, m_closeAble(false)
, m_closeAble(true)
, m_isWidowHidden(false)
, m_title(new TipsWidget(this))
, m_3DtitleBtn(nullptr)
@ -311,17 +311,16 @@ void AppSnapshot::mousePressEvent(QMouseEvent *e)
bool AppSnapshot::eventFilter(QObject *watched, QEvent *e)
{
if (watched == m_closeBtn2D) {
// TODO 判断条件重复
if (watched == m_closeBtn2D && (e->type() == QEvent::HoverEnter || e->type() == QEvent::HoverMove)) {
if (e->type() == QEvent::HoverEnter || e->type() == QEvent::HoverMove) {
m_closeBtn2D->setIcon(QIcon(":/icons/resources/close_round_hover.svg"));
} else if (watched == m_closeBtn2D && e->type() == QEvent::HoverLeave) {
} else if (e->type() == QEvent::HoverLeave) {
m_closeBtn2D->setIcon(QIcon(":/icons/resources/close_round_normal.svg"));
} else if (watched == m_closeBtn2D && e->type() == QEvent::MouseButtonPress) {
} else if (e->type() == QEvent::MouseButtonPress) {
m_closeBtn2D->setIcon(QIcon(":/icons/resources/close_round_press.svg"));
}
}
return false;
return QWidget::eventFilter(watched, e);
}
void AppSnapshot::resizeEvent(QResizeEvent *event)

8
frame/item/components/floatingpreview.cpp
View File

@ -126,14 +126,14 @@ void FloatingPreview::mouseReleaseEvent(QMouseEvent *e)
bool FloatingPreview::eventFilter(QObject *watched, QEvent *event)
{
if(watched == m_closeBtn3D) {
if(watched == m_closeBtn3D && (event->type() == QEvent::HoverEnter || event->type() == QEvent::HoverMove)) {
if (watched == m_closeBtn3D) {
if (event->type() == QEvent::HoverEnter || event->type() == QEvent::HoverMove) {
m_closeBtn3D->setIcon(QIcon(":/icons/resources/close_round_hover.svg"));
}
else if (watched == m_closeBtn3D && event->type() == QEvent::HoverLeave) {
else if (event->type() == QEvent::HoverLeave) {
m_closeBtn3D->setIcon(QIcon(":/icons/resources/close_round_normal.svg"));
}
else if (watched == m_closeBtn3D && event->type() == QEvent::MouseButtonPress) {
else if (event->type() == QEvent::MouseButtonPress) {
m_closeBtn3D->setIcon(QIcon(":/icons/resources/close_round_press.svg"));
}
}

4
frame/item/components/previewcontainer.cpp
View File

@ -68,7 +68,9 @@ void PreviewContainer::setWindowInfos(const WindowInfoMap &infos, const WindowLi
if (!m_snapshots.contains(key))
appendSnapWidget(key);
m_snapshots[key]->setWindowInfo(it.value());
m_snapshots[key]->setCloseAble(allowClose.contains(key));
// FIXME: "GetAllowedCloseWindows" has remove form dde-daemon
// 由于相关接口被移除，暂时无法正确设置 m_closeAble 属性，暂改为默认 true
// m_snapshots[key]->setCloseAble(allowClose.contains(key));
}
if (m_snapshots.isEmpty()) {