diff --git a/frame/util/multiscreenworker.cpp b/frame/util/multiscreenworker.cpp index 4324d72db..adef6c538 100644 --- a/frame/util/multiscreenworker.cpp +++ b/frame/util/multiscreenworker.cpp @@ -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)); diff --git a/frame/window/mainwindow.cpp b/frame/window/mainwindow.cpp index ee1633ef4..9a55d3527 100755 --- a/frame/window/mainwindow.cpp +++ b/frame/window/mainwindow.cpp @@ -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()); diff --git a/frame/window/mainwindow.h b/frame/window/mainwindow.h index 0dac4a1b3..62ff84276 100644 --- a/frame/window/mainwindow.h +++ b/frame/window/mainwindow.h @@ -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);