diff --git a/frame/util/docksettings.cpp b/frame/util/docksettings.cpp index d029520c5..b2702a8aa 100644 --- a/frame/util/docksettings.cpp +++ b/frame/util/docksettings.cpp @@ -155,10 +155,10 @@ DockSettings::DockSettings(QWidget *parent) connect(m_itemManager, &DockItemManager::itemRemoved, this, &DockSettings::dockItemCountChanged, 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::ScreenHeightChanged, this, &DockSettings::primaryScreenChanged, Qt::QueuedConnection); - connect(m_displayInter, &DisplayInter::ScreenWidthChanged, this, &DockSettings::primaryScreenChanged, Qt::QueuedConnection); - connect(m_displayInter, &DisplayInter::PrimaryChanged, this, &DockSettings::primaryScreenChanged, Qt::QueuedConnection); + connect(m_displayInter, &DisplayInter::PrimaryRectChanged, this, &DockSettings::onPrimaryScreenChanged, Qt::QueuedConnection); + connect(m_displayInter, &DisplayInter::ScreenHeightChanged, this, &DockSettings::onPrimaryScreenChanged, Qt::QueuedConnection); + connect(m_displayInter, &DisplayInter::ScreenWidthChanged, this, &DockSettings::onPrimaryScreenChanged, Qt::QueuedConnection); + connect(m_displayInter, &DisplayInter::PrimaryChanged, this, &DockSettings::onPrimaryScreenChanged, Qt::QueuedConnection); connect(m_displayInter, &DisplayInter::MonitorsChanged, this, &DockSettings::onMonitorListChanged); connect(GSettingsByTrash(), &QGSettings::changed, this, &DockSettings::onTrashGSettingsChanged); QTimer::singleShot(0, this, [=] {onGSettingsChanged("enable");}); @@ -468,7 +468,7 @@ void DockSettings::dockItemCountChanged() // emit windowGeometryChanged(); } -void DockSettings::primaryScreenChanged() +void DockSettings::onPrimaryScreenChanged() { // qDebug() << Q_FUNC_INFO; m_primaryRawRect = m_displayInter->primaryRect(); @@ -481,7 +481,7 @@ void DockSettings::primaryScreenChanged() return; } calculateMultiScreensPos(); - emit dataChanged(); + emit primaryScreenChanged(); calculateWindowConfig(); // 主屏切换时，如果缩放比例不一样，需要刷新item的图标(bug:3176) @@ -956,4 +956,14 @@ void DockSettings::onMonitorListChanged(const QList &mons) for (const auto op : ops) if (!pathList.contains(op)) monitorRemoved(op); + + QMapIterator iterator(m_monitors); + while (iterator.hasNext()) { + iterator.next(); + Monitor *monitor = iterator.key(); + if (monitor) { + m_mouseCauseDockScreen = monitor; + break; + } + } } diff --git a/frame/util/docksettings.h b/frame/util/docksettings.h index e34b5e046..1b4984152 100644 --- a/frame/util/docksettings.h +++ b/frame/util/docksettings.h @@ -84,7 +84,7 @@ public: bool m_menuVisible; signals: - void dataChanged() const; + void primaryScreenChanged() const; void positionChanged() const; void autoHideChanged(const bool autoHide) const; void displayModeChanegd() const; @@ -106,7 +106,7 @@ private slots: void hideModeChanged(); void hideStateChanged(); void dockItemCountChanged(); - void primaryScreenChanged(); + void onPrimaryScreenChanged(); void resetFrontendGeometry(); void onOpacityChanged(const double value); void trayVisableCountChanged(const int &count); diff --git a/frame/window/mainwindow.cpp b/frame/window/mainwindow.cpp index 7755a3615..3a462136f 100755 --- a/frame/window/mainwindow.cpp +++ b/frame/window/mainwindow.cpp @@ -146,7 +146,7 @@ MainWindow::MainWindow(QWidget *parent) , m_dbusDaemonInterface(QDBusConnection::sessionBus().interface()) , m_sniWatcher(new StatusNotifierWatcher(SNI_WATCHER_SERVICE, SNI_WATCHER_PATH, QDBusConnection::sessionBus(), this)) , m_dragWidget(new DragWidget(this)) - , m_mouseCauseDock(false) + , m_primaryScreenChanged(false) { setAccessibleName("mainwindow"); m_mainPanel->setAccessibleName("mainpanel"); @@ -233,9 +233,7 @@ MainWindow::MainWindow(QWidget *parent) // dock隐藏后的rect const QRect windowRect = m_settings->windowRect(m_dockPosition, false, true); const int margin = m_settings->dockMargin(); - - if (!m_mouseCauseDock) { - switch (m_dockPosition) { + switch (m_dockPosition) { case Dock::Top: m_mainPanel->move(0, val - windowRect.height()); QWidget::move(windowRect.left(), windowRect.top() - margin); @@ -252,10 +250,7 @@ MainWindow::MainWindow(QWidget *parent) m_mainPanel->move(0, 0); QWidget::move(windowRect.right() - val + margin, windowRect.top()); break; - default: break; - } } - if (m_dockPosition == Dock::Top || m_dockPosition == Dock::Bottom) { QWidget::setFixedHeight(val); } 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 ]() { - m_mouseCauseDock = false; - Position settingPosition = m_settings->position(); - // 位置是否更新 - if (m_dockPosition != settingPosition) { - // 动画完成更新dock位置 - m_dockPosition = settingPosition; - // 动画完成更新dock设置 - m_settings->posChangedUpdateSettings(); + // 动画完成更新dock位置 + m_dockPosition = m_settings->position(); + // 动画完成更新dock设置 + m_settings->posChangedUpdateSettings(); - m_mainPanel->move(QPoint(0, 0)); - } - - m_settings->calculateWindowConfig(); const QRect windowRect = m_settings->windowRect(m_dockPosition, true); QWidget::move(windowRect.topLeft()); QWidget::setFixedSize(windowRect.size()); - m_mainPanel->setFixedSize(windowRect.size()); + m_mainPanel->move(QPoint(0, 0)); + + qDebug() << "Hide animation finished" << frameGeometry(); }); updateRegionMonitorWatch(); @@ -466,7 +461,11 @@ void MainWindow::internalMove(const QPoint &p) void MainWindow::initConnections() { - connect(m_settings, &DockSettings::dataChanged, m_positionUpdateTimer, static_cast(&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::autoHideChanged, m_leaveDelayTimer, static_cast(&QTimer::start)); connect(m_settings, &DockSettings::windowGeometryChanged, this, &MainWindow::updateGeometry, Qt::DirectConnection); @@ -541,6 +540,7 @@ void MainWindow::initConnections() void MainWindow::positionChanged() { // paly hide animation and disable other animation + qDebug() << "start positionChange:" << frameGeometry(); clearStrutPartial(); narrow(); @@ -550,7 +550,7 @@ void MainWindow::positionChanged() void MainWindow::updatePosition() { // all update operation need pass by timer - Q_ASSERT(sender() == m_positionUpdateTimer); +// Q_ASSERT(sender() == m_positionUpdateTimer); //clearStrutPartial(); updateGeometry(); @@ -577,8 +577,10 @@ void MainWindow::updateGeometry() internalMove(windowRect.topLeft()); - QWidget::move(windowRect.topLeft()); - QWidget::setFixedSize(m_settings->m_mainWindowSize); + if (!m_primaryScreenChanged || m_settings->hideState() != Hide) { + QWidget::move(windowRect.topLeft()); + QWidget::setFixedSize(m_settings->m_mainWindowSize); + } resizeMainPanelWindow(); @@ -702,6 +704,7 @@ void MainWindow::setStrutPartial() void MainWindow::expand() { + qDebug() << "expand"; if (m_panelHideAni->state() == QPropertyAnimation::Running) { m_panelHideAni->stop(); emit m_panelHideAni->finished(); @@ -719,6 +722,9 @@ void MainWindow::expand() startValue = (m_dockPosition == Top || m_dockPosition == Bottom) ? height() : 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) { return; } @@ -730,13 +736,16 @@ void MainWindow::expand() m_panelShowAni->setEndValue(endValue); m_panelShowAni->start(); m_shadowMaskOptimizeTimer->start(); + m_settings->posChangedUpdateSettings(); } } void MainWindow::narrow() { + qDebug() << "narrow"; int startValue = ( m_dockPosition == Top || m_dockPosition == Bottom ) ? height() : width(); + qDebug() << "narrow " << "start value:" << startValue; m_panelShowAni->stop(); m_panelHideAni->setStartValue(startValue); m_panelHideAni->setEndValue(0); @@ -789,6 +798,7 @@ void MainWindow::updatePanelVisible() break; } if (!r.contains(QCursor::pos())) { + qDebug() << "hide narrow"; return narrow(); } } @@ -959,7 +969,9 @@ void MainWindow::onRegionMonitorChanged(int x, int y, const QString &key) if (m_registerKey != key) 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 (m_settings->hideMode() == KeepShowing) @@ -972,9 +984,11 @@ void MainWindow::onRegionMonitorChanged(int x, int y, const QString &key) expand(); } else { // 移动Dock至相应屏相应位置 - m_mouseCauseDock = true; 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; auto func = [&](MonitRect &monitRect){ - monitRect.x1 = int(x * scale); - monitRect.y1 = int(y * scale); - monitRect.x2 = int((x + w) * scale); - monitRect.y2 = int((y + h) * scale); + monitRect.x1 = x; + monitRect.y1 = y; + monitRect.x2 = x + w; + monitRect.y2 = y + h; monitorAreas << monitRect; }; diff --git a/frame/window/mainwindow.h b/frame/window/mainwindow.h index eb6490ebb..8f58acd09 100644 --- a/frame/window/mainwindow.h +++ b/frame/window/mainwindow.h @@ -146,7 +146,7 @@ private: QSize m_size; DragWidget *m_dragWidget; Position m_dockPosition; - bool m_mouseCauseDock; + bool m_primaryScreenChanged; }; #endif // MAINWINDOW_H