mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-04 17:33:05 +00:00
fix: 修改时尚模式下分割应用区域和插件区域的方式
原来调用的是dtk的setMaskPath方法,现换成Qt的setMask方法,实现更彻底 Log: Influence: 任务栏-时尚模式下查看左右区域的显示 Bug: https://pms.uniontech.com/bug-view-134527.html Change-Id: Ibd5e7db440ae359a59c73e77f5f08951f8571e7a
This commit is contained in:
parent
3824e9d9bb
commit
0a35f5b5e0
@ -259,7 +259,7 @@ void MainWindow::resizeEvent(QResizeEvent *event)
|
|||||||
// 任务栏大小、位置、模式改变都会触发resize,发射大小改变信号,供依赖项目更新位置
|
// 任务栏大小、位置、模式改变都会触发resize,发射大小改变信号,供依赖项目更新位置
|
||||||
Q_EMIT panelGeometryChanged();
|
Q_EMIT panelGeometryChanged();
|
||||||
|
|
||||||
setMaskPath(m_mainPanel->areaPath());
|
updateMaskArea();
|
||||||
m_mainPanel->updatePluginsLayout();
|
m_mainPanel->updatePluginsLayout();
|
||||||
m_shadowMaskOptimizeTimer->start();
|
m_shadowMaskOptimizeTimer->start();
|
||||||
|
|
||||||
@ -367,6 +367,13 @@ void MainWindow::resizeDockIcon()
|
|||||||
m_mainPanel->resizeDockIcon();
|
m_mainPanel->resizeDockIcon();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::updateMaskArea()
|
||||||
|
{
|
||||||
|
QPainterPath path = m_mainPanel->areaPath();
|
||||||
|
QPolygon polgon = path.toFillPolygon().toPolygon();
|
||||||
|
setMask(polgon);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief MainWindow::adjustShadowMask 更新任务栏的圆角大小(时尚模式下才有圆角效果)
|
* @brief MainWindow::adjustShadowMask 更新任务栏的圆角大小(时尚模式下才有圆角效果)
|
||||||
*/
|
*/
|
||||||
@ -393,7 +400,7 @@ void MainWindow::adjustShadowMask()
|
|||||||
m_platformWindowHandle.setWindowRadius(radius);
|
m_platformWindowHandle.setWindowRadius(radius);
|
||||||
m_mainPanel->updatePluginsLayout();
|
m_mainPanel->updatePluginsLayout();
|
||||||
|
|
||||||
setMaskPath(m_mainPanel->areaPath());
|
updateMaskArea();
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::onDbusNameOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner)
|
void MainWindow::onDbusNameOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner)
|
||||||
|
@ -189,6 +189,7 @@ private:
|
|||||||
void initConnections();
|
void initConnections();
|
||||||
|
|
||||||
void resizeDockIcon();
|
void resizeDockIcon();
|
||||||
|
void updateMaskArea();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void panelGeometryChanged();
|
void panelGeometryChanged();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user