Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复右下角显示桌面在时尚模式下出现的问题

Browse Source 
切换模式时更新一下右下角'显示桌面'的区域

Log: 修复右下角显示桌面在时尚模式下出现的问题
Change-Id: Ibdad4a6c62b21598f11e3d71b5cc12adcaaae5d0
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1408
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
This commit is contained in:
Fan PengCheng 2020-08-06 21:42:27 +08:00 committed by fanpengcheng
parent 3deb70cbca
commit 6d8f391d75
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frame/panel/mainpanelcontrol.cpp
View File

@ -801,6 +801,7 @@ DockItem *MainPanelControl::dropTargetItem(DockItem *sourceItem, QPoint point)
void MainPanelControl::updateDisplayMode()
{
moveAppSonWidget();
resizeDesktopWidget();
}
void MainPanelControl::moveAppSonWidget()

4
frame/util/multiscreenworker.cpp
View File

@ -1283,7 +1283,7 @@ QRect MultiScreenWorker::getDockShowGeometry(const QString &screenName, const Po
}
#ifdef QT_DEBUG
qDebug() << rect;
// qDebug() << rect;
#endif
return rect;
@ -1332,7 +1332,7 @@ QRect MultiScreenWorker::getDockHideGeometry(const QString &screenName, const Po
}
#ifdef QT_DEBUG
qDebug() << rect;
// qDebug() << rect;
#endif
return rect;

4
frame/window/mainwindow.cpp
View File

@ -262,6 +262,7 @@ void MainWindow::initConnections()
connect(m_dragWidget, &DragWidget::dragPointOffset, m_multiScreenWorker, [ = ] {m_multiScreenWorker->onDragStateChanged(true);});
connect(m_dragWidget, &DragWidget::dragFinished, m_multiScreenWorker, [ = ] {m_multiScreenWorker->onDragStateChanged(false);});
connect(m_dragWidget, &DragWidget::dragPointOffset, this, &MainWindow::onMainWindowSizeChanged);
connect(m_dragWidget, &DragWidget::dragFinished, this, &MainWindow::onDragFinished);
@ -305,6 +306,8 @@ void MainWindow::adjustShadowMask()
DStyleHelper dstyle(style());
const int radius = dstyle.pixelMetric(DStyle::PM_TopLevelWindowRadius);
qDebug() << "#";
qDebug() << int(composite && isFasion ? radius : 0);
m_platformWindowHandle.setWindowRadius(composite && isFasion ? radius : 0);
}
@ -428,7 +431,6 @@ void MainWindow::onDragFinished()
void MainWindow::themeTypeChanged(DGuiApplicationHelper::ColorType themeType)
{
if (m_wmHelper->hasComposite()) {
if (themeType == DGuiApplicationHelper::DarkType)
m_platformWindowHandle.setBorderColor(QColor(0, 0, 0, 255 * 0.3));
else

1
frame/window/mainwindow.h
View File

@ -123,7 +123,6 @@ public:
friend class MainPanelControl;
MainPanelControl *panel() {return m_mainPanel;}
DragWidget *dragWidget() {return m_dragWidget;}
public slots:
void launch();