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

fix(frame): 动画在多屏情况下异常

Browse Source 
多屏条件下添加了较多功能,而这些功能发生时改变了dock的一些状态,且这些状态有些有相叠的情况,所以删除了一些状态值,也另添了一些状态值来区分不同情况

Log: 修复任务栏在多屏情况下的一些异常
Bug: https://pms.uniontech.com/zentao/bug-view-33736.html
Bug: https://pms.uniontech.com/zentao/bug-view-33718.html
Bug: https://pms.uniontech.com/zentao/bug-view-33693.html
Bug: https://pms.uniontech.com/zentao/bug-view-33639.html
Bug: https://pms.uniontech.com/zentao/bug-view-33636.html
Bug: https://pms.uniontech.com/zentao/bug-view-32919.html
Bug: https://pms.uniontech.com/zentao/bug-view-32830.html
Bug: https://pms.uniontech.com/zentao/bug-view-34173.html
This commit is contained in:
zhaolong 2020-06-18 21:12:01 +08:00
parent 2dfaf28284
commit 18191155f3
4 changed files with 66 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frame/util/docksettings.cpp
View File

@ -155,10 +155,10 @@ DockSettings::DockSettings(QWidget *parent)
connect(m_itemManager, &DockItemManager::itemRemoved, this, &DockSettings::dockItemCountChanged, Qt::QueuedConnection); connect(m_itemManager, &DockItemManager::itemRemoved, this, &DockSettings::dockItemCountChanged, Qt::QueuedConnection);
connect(m_itemManager, &DockItemManager::trayVisableCountChanged, this, &DockSettings::trayVisableCountChanged, Qt::QueuedConnection); connect(m_itemManager, &DockItemManager::trayVisableCountChanged, this, &DockSettings::trayVisableCountChanged, Qt::QueuedConnection);
connect(m_displayInter, &DisplayInter::PrimaryRectChanged, this, &DockSettings::primaryScreenChanged, Qt::QueuedConnection); connect(m_displayInter, &DisplayInter::PrimaryRectChanged, this, &DockSettings::onPrimaryScreenChanged, Qt::QueuedConnection);
connect(m_displayInter, &DisplayInter::ScreenHeightChanged, this, &DockSettings::primaryScreenChanged, Qt::QueuedConnection); connect(m_displayInter, &DisplayInter::ScreenHeightChanged, this, &DockSettings::onPrimaryScreenChanged, Qt::QueuedConnection);
connect(m_displayInter, &DisplayInter::ScreenWidthChanged, this, &DockSettings::primaryScreenChanged, Qt::QueuedConnection); connect(m_displayInter, &DisplayInter::ScreenWidthChanged, this, &DockSettings::onPrimaryScreenChanged, Qt::QueuedConnection);
connect(m_displayInter, &DisplayInter::PrimaryChanged, this, &DockSettings::primaryScreenChanged, Qt::QueuedConnection); connect(m_displayInter, &DisplayInter::PrimaryChanged, this, &DockSettings::onPrimaryScreenChanged, Qt::QueuedConnection);
connect(m_displayInter, &DisplayInter::MonitorsChanged, this, &DockSettings::onMonitorListChanged); connect(m_displayInter, &DisplayInter::MonitorsChanged, this, &DockSettings::onMonitorListChanged);
connect(GSettingsByTrash(), &QGSettings::changed, this, &DockSettings::onTrashGSettingsChanged); connect(GSettingsByTrash(), &QGSettings::changed, this, &DockSettings::onTrashGSettingsChanged);
QTimer::singleShot(0, this, [=] {onGSettingsChanged("enable");}); QTimer::singleShot(0, this, [=] {onGSettingsChanged("enable");});
@ -468,7 +468,7 @@ void DockSettings::dockItemCountChanged()
// emit windowGeometryChanged(); // emit windowGeometryChanged();
} }
void DockSettings::primaryScreenChanged() void DockSettings::onPrimaryScreenChanged()
{ {
// qDebug() << Q_FUNC_INFO; // qDebug() << Q_FUNC_INFO;
m_primaryRawRect = m_displayInter->primaryRect(); m_primaryRawRect = m_displayInter->primaryRect();
@ -481,7 +481,7 @@ void DockSettings::primaryScreenChanged()
return; return;
} }
calculateMultiScreensPos(); calculateMultiScreensPos();
emit dataChanged(); emit primaryScreenChanged();
calculateWindowConfig(); calculateWindowConfig();
// 主屏切换时，如果缩放比例不一样，需要刷新item的图标(bug:3176) // 主屏切换时，如果缩放比例不一样，需要刷新item的图标(bug:3176)
@ -956,4 +956,14 @@ void DockSettings::onMonitorListChanged(const QList<QDBusObjectPath> &mons)
for (const auto op : ops) for (const auto op : ops)
if (!pathList.contains(op)) if (!pathList.contains(op))
monitorRemoved(op); monitorRemoved(op);
QMapIterator<Monitor *, MonitorInter *> iterator(m_monitors);
while (iterator.hasNext()) {
iterator.next();
Monitor *monitor = iterator.key();
if (monitor) {
m_mouseCauseDockScreen = monitor;
break;
}
}
} }

4
frame/util/docksettings.h
View File

@ -84,7 +84,7 @@ public:
bool m_menuVisible; bool m_menuVisible;
signals: signals:
void dataChanged() const; void primaryScreenChanged() const;
void positionChanged() const; void positionChanged() const;
void autoHideChanged(const bool autoHide) const; void autoHideChanged(const bool autoHide) const;
void displayModeChanegd() const; void displayModeChanegd() const;
@ -106,7 +106,7 @@ private slots:
void hideModeChanged(); void hideModeChanged();
void hideStateChanged(); void hideStateChanged();
void dockItemCountChanged(); void dockItemCountChanged();
void primaryScreenChanged(); void onPrimaryScreenChanged();
void resetFrontendGeometry(); void resetFrontendGeometry();
void onOpacityChanged(const double value); void onOpacityChanged(const double value);
void trayVisableCountChanged(const int &count); void trayVisableCountChanged(const int &count);

80
frame/window/mainwindow.cpp
View File

@ -146,7 +146,7 @@ MainWindow::MainWindow(QWidget *parent)
, m_dbusDaemonInterface(QDBusConnection::sessionBus().interface()) , m_dbusDaemonInterface(QDBusConnection::sessionBus().interface())
, m_sniWatcher(new StatusNotifierWatcher(SNI_WATCHER_SERVICE, SNI_WATCHER_PATH, QDBusConnection::sessionBus(), this)) , m_sniWatcher(new StatusNotifierWatcher(SNI_WATCHER_SERVICE, SNI_WATCHER_PATH, QDBusConnection::sessionBus(), this))
, m_dragWidget(new DragWidget(this)) , m_dragWidget(new DragWidget(this))
, m_mouseCauseDock(false) , m_primaryScreenChanged(false)
{ {
setAccessibleName("mainwindow"); setAccessibleName("mainwindow");
m_mainPanel->setAccessibleName("mainpanel"); m_mainPanel->setAccessibleName("mainpanel");
@ -233,9 +233,7 @@ MainWindow::MainWindow(QWidget *parent)
// dock隐藏后的rect // dock隐藏后的rect
const QRect windowRect = m_settings->windowRect(m_dockPosition, false, true); const QRect windowRect = m_settings->windowRect(m_dockPosition, false, true);
const int margin = m_settings->dockMargin(); const int margin = m_settings->dockMargin();
switch (m_dockPosition) {
if (!m_mouseCauseDock) {
switch (m_dockPosition) {
case Dock::Top: case Dock::Top:
m_mainPanel->move(0, val - windowRect.height()); m_mainPanel->move(0, val - windowRect.height());
QWidget::move(windowRect.left(), windowRect.top() - margin); QWidget::move(windowRect.left(), windowRect.top() - margin);
@ -252,10 +250,7 @@ MainWindow::MainWindow(QWidget *parent)
m_mainPanel->move(0, 0); m_mainPanel->move(0, 0);
QWidget::move(windowRect.right() - val + margin, windowRect.top()); QWidget::move(windowRect.right() - val + margin, windowRect.top());
break; break;
default: break;
}
} }
if (m_dockPosition == Dock::Top || m_dockPosition == Dock::Bottom) { if (m_dockPosition == Dock::Top || m_dockPosition == Dock::Bottom) {
QWidget::setFixedHeight(val); QWidget::setFixedHeight(val);
} else { } else {
@ -263,27 +258,27 @@ MainWindow::MainWindow(QWidget *parent)
} }
}); });
// connect(m_panelShowAni, &QVariantAnimation::finished, [ this ]() { connect(m_panelShowAni, &QVariantAnimation::finished, [ this ]() {
// }); const QRect windowRect = m_settings->windowRect(m_dockPosition);
QWidget::move(windowRect.topLeft());
QWidget::setFixedSize(windowRect.size());
m_mainPanel->move(QPoint(0, 0));
qDebug() << "Show animation finished:" << frameGeometry();
qDebug() << "Show animation finished not frame:" << geometry();
});
connect(m_panelHideAni, &QVariantAnimation::finished, [ this ]() { connect(m_panelHideAni, &QVariantAnimation::finished, [ this ]() {
m_mouseCauseDock = false; // 动画完成更新dock位置
Position settingPosition = m_settings->position(); m_dockPosition = m_settings->position();
// 位置是否更新 // 动画完成更新dock设置
if (m_dockPosition != settingPosition) { m_settings->posChangedUpdateSettings();
// 动画完成更新dock位置
m_dockPosition = settingPosition;
// 动画完成更新dock设置
m_settings->posChangedUpdateSettings();
m_mainPanel->move(QPoint(0, 0));
}
m_settings->calculateWindowConfig();
const QRect windowRect = m_settings->windowRect(m_dockPosition, true); const QRect windowRect = m_settings->windowRect(m_dockPosition, true);
QWidget::move(windowRect.topLeft()); QWidget::move(windowRect.topLeft());
QWidget::setFixedSize(windowRect.size()); QWidget::setFixedSize(windowRect.size());
m_mainPanel->setFixedSize(windowRect.size()); m_mainPanel->move(QPoint(0, 0));
qDebug() << "Hide animation finished" << frameGeometry();
}); });
updateRegionMonitorWatch(); updateRegionMonitorWatch();
@ -466,7 +461,11 @@ void MainWindow::internalMove(const QPoint &p)
void MainWindow::initConnections() void MainWindow::initConnections()
{ {
connect(m_settings, &DockSettings::dataChanged, m_positionUpdateTimer, static_cast<void (QTimer::*)()>(&QTimer::start)); connect(m_settings, &DockSettings::primaryScreenChanged, [&](){
m_primaryScreenChanged = true;
updatePosition();
m_primaryScreenChanged = false;
});
connect(m_settings, &DockSettings::positionChanged, this, &MainWindow::positionChanged); connect(m_settings, &DockSettings::positionChanged, this, &MainWindow::positionChanged);
connect(m_settings, &DockSettings::autoHideChanged, m_leaveDelayTimer, static_cast<void (QTimer::*)()>(&QTimer::start)); connect(m_settings, &DockSettings::autoHideChanged, m_leaveDelayTimer, static_cast<void (QTimer::*)()>(&QTimer::start));
connect(m_settings, &DockSettings::windowGeometryChanged, this, &MainWindow::updateGeometry, Qt::DirectConnection); connect(m_settings, &DockSettings::windowGeometryChanged, this, &MainWindow::updateGeometry, Qt::DirectConnection);
@ -541,6 +540,7 @@ void MainWindow::initConnections()
void MainWindow::positionChanged() void MainWindow::positionChanged()
{ {
// paly hide animation and disable other animation // paly hide animation and disable other animation
qDebug() << "start positionChange:" << frameGeometry();
clearStrutPartial(); clearStrutPartial();
narrow(); narrow();
@ -550,7 +550,7 @@ void MainWindow::positionChanged()
void MainWindow::updatePosition() void MainWindow::updatePosition()
{ {
// all update operation need pass by timer // all update operation need pass by timer
Q_ASSERT(sender() == m_positionUpdateTimer); // Q_ASSERT(sender() == m_positionUpdateTimer);
//clearStrutPartial(); //clearStrutPartial();
updateGeometry(); updateGeometry();
@ -577,8 +577,10 @@ void MainWindow::updateGeometry()
internalMove(windowRect.topLeft()); internalMove(windowRect.topLeft());
QWidget::move(windowRect.topLeft()); if (!m_primaryScreenChanged || m_settings->hideState() != Hide) {
QWidget::setFixedSize(m_settings->m_mainWindowSize); QWidget::move(windowRect.topLeft());
QWidget::setFixedSize(m_settings->m_mainWindowSize);
}
resizeMainPanelWindow(); resizeMainPanelWindow();
@ -702,6 +704,7 @@ void MainWindow::setStrutPartial()
void MainWindow::expand() void MainWindow::expand()
{ {
qDebug() << "expand";
if (m_panelHideAni->state() == QPropertyAnimation::Running) { if (m_panelHideAni->state() == QPropertyAnimation::Running) {
m_panelHideAni->stop(); m_panelHideAni->stop();
emit m_panelHideAni->finished(); emit m_panelHideAni->finished();
@ -719,6 +722,9 @@ void MainWindow::expand()
startValue = (m_dockPosition == Top || m_dockPosition == Bottom) ? height() : width(); startValue = (m_dockPosition == Top || m_dockPosition == Bottom) ? height() : width();
endValue = (m_dockPosition == Top || m_dockPosition == Bottom) ? windowRect.height() : windowRect.width(); endValue = (m_dockPosition == Top || m_dockPosition == Bottom) ? windowRect.height() : windowRect.width();
qDebug() << "expand " << "start value:" << startValue
<< "end value:" << endValue;
if (startValue > DOCK_MAX_SIZE || endValue > DOCK_MAX_SIZE) { if (startValue > DOCK_MAX_SIZE || endValue > DOCK_MAX_SIZE) {
return; return;
} }
@ -730,13 +736,16 @@ void MainWindow::expand()
m_panelShowAni->setEndValue(endValue); m_panelShowAni->setEndValue(endValue);
m_panelShowAni->start(); m_panelShowAni->start();
m_shadowMaskOptimizeTimer->start(); m_shadowMaskOptimizeTimer->start();
m_settings->posChangedUpdateSettings();
} }
} }
void MainWindow::narrow() void MainWindow::narrow()
{ {
qDebug() << "narrow";
int startValue = ( m_dockPosition == Top || m_dockPosition == Bottom ) ? height() : width(); int startValue = ( m_dockPosition == Top || m_dockPosition == Bottom ) ? height() : width();
qDebug() << "narrow " << "start value:" << startValue;
m_panelShowAni->stop(); m_panelShowAni->stop();
m_panelHideAni->setStartValue(startValue); m_panelHideAni->setStartValue(startValue);
m_panelHideAni->setEndValue(0); m_panelHideAni->setEndValue(0);
@ -789,6 +798,7 @@ void MainWindow::updatePanelVisible()
break; break;
} }
if (!r.contains(QCursor::pos())) { if (!r.contains(QCursor::pos())) {
qDebug() << "hide narrow";
return narrow(); return narrow();
} }
} }
@ -959,7 +969,9 @@ void MainWindow::onRegionMonitorChanged(int x, int y, const QString &key)
if (m_registerKey != key) if (m_registerKey != key)
return; return;
QScreen *screen = Utils::screenAtByScaled(QPoint(x, y)); QScreen *screen = Utils::screenAt(QPoint(x, y));
if (!screen)
return;
if (screen->name() == m_settings->currentDockScreen()) { if (screen->name() == m_settings->currentDockScreen()) {
if (m_settings->hideMode() == KeepShowing) if (m_settings->hideMode() == KeepShowing)
@ -972,9 +984,11 @@ void MainWindow::onRegionMonitorChanged(int x, int y, const QString &key)
expand(); expand();
} else { } else {
// 移动Dock至相应屏相应位置 // 移动Dock至相应屏相应位置
m_mouseCauseDock = true;
if (m_settings->setDockScreen(screen->name())) if (m_settings->setDockScreen(screen->name()))
positionChanged(); if (m_settings->hideMode() == KeepShowing || m_settings->hideMode() == SmartHide)
positionChanged();
else
expand();
} }
} }
@ -995,10 +1009,10 @@ void MainWindow::updateRegionMonitorWatch()
int x, y, w, h; int x, y, w, h;
auto func = [&](MonitRect &monitRect){ auto func = [&](MonitRect &monitRect){
monitRect.x1 = int(x * scale); monitRect.x1 = x;
monitRect.y1 = int(y * scale); monitRect.y1 = y;
monitRect.x2 = int((x + w) * scale); monitRect.x2 = x + w;
monitRect.y2 = int((y + h) * scale); monitRect.y2 = y + h;
monitorAreas << monitRect; monitorAreas << monitRect;
}; };

2
frame/window/mainwindow.h
View File

@ -146,7 +146,7 @@ private:
QSize m_size; QSize m_size;
DragWidget *m_dragWidget; DragWidget *m_dragWidget;
Position m_dockPosition; Position m_dockPosition;
bool m_mouseCauseDock; bool m_primaryScreenChanged;
}; };
#endif // MAINWINDOW_H #endif // MAINWINDOW_H