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: 修复任务栏切换显示模式时图标显示异常问题

Browse Source 
任务栏切换显示模式时,未设置内部内容的大小,内部内容的大小还是另外的显示模式的大小

Log: 修复任务栏切换显示模式时图标显示异常问题
Bug: https://pms.uniontech.com/zentao/bug-view-41663.html
Change-Id: Iac23581127710b43f89ed42c7b293c338b08d55b
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1401
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
This commit is contained in:
Fan PengCheng 2020-08-06 20:26:41 +08:00 committed by fanpengcheng
parent 9dc8da9cb8
commit 08c543da63
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frame/util/multiscreenworker.cpp
View File

@ -484,6 +484,10 @@ void MultiScreenWorker::onDisplayModeChanged()
parent()->setFixedSize(dockRect(m_ds.current()).size());
parent()->move(dockRect(m_ds.current()).topLeft());
parent()->panel()->setFixedSize(dockRect(m_ds.current()).size());
parent()->panel()->move(0,0);
parent()->panel()->setDisplayMode(m_displayMode);
emit displayModeChanegd();
emit requestUpdateRegionMonitor();
emit requestUpdateFrontendGeometry(dockRect(m_ds.current(), m_position, HideMode::KeepShowing, m_displayMode));

8
frame/window/mainwindow.cpp
View File

@ -274,7 +274,7 @@ void MainWindow::initConnections()
connect(m_menuWorker, &MenuWorker::autoHideChanged, m_multiScreenWorker, &MultiScreenWorker::onAutoHideChanged);
connect(m_multiScreenWorker, &MultiScreenWorker::opacityChanged, this, &MainWindow::setMaskAlpha, Qt::QueuedConnection);
connect(m_multiScreenWorker, &MultiScreenWorker::displayModeChanegd, this, &MainWindow::updateDisplayMode, Qt::QueuedConnection);
connect(m_multiScreenWorker, &MultiScreenWorker::displayModeChanegd, this, &MainWindow::adjustShadowMask, Qt::QueuedConnection);
//　更新任务栏内容展示
connect(m_multiScreenWorker, &MultiScreenWorker::requestUpdateLayout, this, [ = ](const QString & screenName) {
@ -373,12 +373,6 @@ void MainWindow::resetDragWindow()
}
}
void MainWindow::updateDisplayMode()
{
m_mainPanel->setDisplayMode(m_multiScreenWorker->displayMode());
adjustShadowMask();
}
void MainWindow::onMainWindowSizeChanged(QPoint offset)
{
const QRect &rect = m_multiScreenWorker->dockRect(m_multiScreenWorker->deskScreen());

2
frame/window/mainwindow.h
View File

@ -154,8 +154,6 @@ public slots:
private slots:
void compositeChanged();
void updateDisplayMode();
void adjustShadowMask();
void onDbusNameOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);