mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-04 09:23:03 +00:00
755190472c
com.deepin.daemon.Display服务启动比任务栏启动要晚,导致获取的数据异常 Log: 修复自动化测试出现的任务栏不显示问题 Change-Id: Ida4b6986dfec4bf212cfc1e28c4ebf4dfcb63198 Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/4064 Reviewed-by: <mailman@uniontech.com> Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com> Reviewed-by: wangwei <wangwei@uniontech.com> Tested-by: <mailman@uniontech.com>
1787 lines
63 KiB
C++
1787 lines
63 KiB
C++
/*
|
||
* Copyright (C) 2018 ~ 2028 Deepin Technology Co., Ltd.
|
||
*
|
||
* Author: fanpengcheng <fanpengcheng_cm@deepin.com>
|
||
*
|
||
* Maintainer: fanpengcheng <fanpengcheng_cm@deepin.com>
|
||
*
|
||
* This program is free software: you can redistribute it and/or modify
|
||
* it under the terms of the GNU General Public License as published by
|
||
* the Free Software Foundation, either version 3 of the License, or
|
||
* any later version.
|
||
*
|
||
* This program is distributed in the hope that it will be useful,
|
||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
* GNU General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU General Public License
|
||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||
*/
|
||
|
||
#include "multiscreenworker.h"
|
||
#include "window/mainwindow.h"
|
||
|
||
#include <QWidget>
|
||
#include <QScreen>
|
||
#include <QEvent>
|
||
#include <QRegion>
|
||
#include <QSequentialAnimationGroup>
|
||
#include <QVariantAnimation>
|
||
|
||
#include <QDBusConnection>
|
||
|
||
// 保证以下数据更新顺序(大环节顺序不要变，内部还有一些小的调整，比如任务栏显示区域更新的时候，里面内容的布局方向可能也要更新...)
|
||
// Monitor数据－＞屏幕是否可停靠更新－＞监视唤醒区域更新，任务栏显示区域更新－＞拖拽区域更新－＞通知后端接口，通知窗管
|
||
|
||
// TODO 后续需要去除使用qt的接口获取屏幕信息，统一使用从com.deepin.daemon.Display服务中给定的数据
|
||
|
||
MultiScreenWorker::MultiScreenWorker(QWidget *parent, DWindowManagerHelper *helper)
|
||
: QObject(nullptr)
|
||
, m_parent(parent)
|
||
, m_wmHelper(helper)
|
||
, m_eventInter(new XEventMonitor("com.deepin.api.XEventMonitor", "/com/deepin/api/XEventMonitor", QDBusConnection::sessionBus()))
|
||
, m_extralEventInter(new XEventMonitor("com.deepin.api.XEventMonitor", "/com/deepin/api/XEventMonitor", QDBusConnection::sessionBus()))
|
||
, m_touchEventInter(new XEventMonitor("com.deepin.api.XEventMonitor", "/com/deepin/api/XEventMonitor", QDBusConnection::sessionBus()))
|
||
, m_dockInter(new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this))
|
||
, m_displayInter(new DisplayInter("com.deepin.daemon.Display", "/com/deepin/daemon/Display", QDBusConnection::sessionBus(), this))
|
||
, m_launcherInter(new DBusLuncher("com.deepin.dde.Launcher", "/com/deepin/dde/Launcher", QDBusConnection::sessionBus()))
|
||
, m_monitorUpdateTimer(new QTimer(this))
|
||
, m_delayTimer(new QTimer(this))
|
||
, m_showAni(new QVariantAnimation(this))
|
||
, m_hideAni(new QVariantAnimation(this))
|
||
, m_ds(m_displayInter->primary())
|
||
, m_aniStart(false)
|
||
, m_draging(false)
|
||
, m_autoHide(true)
|
||
, m_btnPress(false)
|
||
{
|
||
qDebug() << "init dock screen: " << m_ds.current();
|
||
initMembers();
|
||
initDBus();
|
||
initConnection();
|
||
initDisplayData();
|
||
initUI();
|
||
}
|
||
|
||
MultiScreenWorker::~MultiScreenWorker()
|
||
{
|
||
|
||
}
|
||
|
||
void MultiScreenWorker::initShow()
|
||
{
|
||
// 仅在初始化时调用一次
|
||
static bool first = true;
|
||
if (!first)
|
||
qFatal("this method can only be called once");
|
||
first = false;
|
||
|
||
// 这里是为了在调用时让MainWindow更新界面布局方向
|
||
emit requestUpdateLayout();
|
||
|
||
if (m_hideMode == HideMode::KeepShowing)
|
||
showAni(m_ds.current());
|
||
else if (m_hideMode == HideMode::KeepHidden) {
|
||
QRect rect = getDockShowGeometry(m_ds.current(), m_position, m_displayMode);
|
||
parent()->panel()->setFixedSize(rect.size());
|
||
parent()->panel()->move(0, 0);
|
||
|
||
rect = getDockHideGeometry(m_ds.current(), m_position, m_displayMode);
|
||
parent()->setFixedSize(rect.size());
|
||
parent()->setGeometry(rect);
|
||
} else if (m_hideMode == HideMode::SmartHide) {
|
||
if (m_hideState == HideState::Show)
|
||
showAni(m_ds.current());
|
||
else if (m_hideState == HideState::Hide)
|
||
hideAni(m_ds.current());
|
||
}
|
||
}
|
||
|
||
QRect MultiScreenWorker::dockRect(const QString &screenName, const Position &pos, const HideMode &hideMode, const DisplayMode &displayMode)
|
||
{
|
||
if (hideMode == HideMode::KeepShowing)
|
||
return getDockShowGeometry(screenName, pos, displayMode);
|
||
else
|
||
return getDockHideGeometry(screenName, pos, displayMode);
|
||
}
|
||
|
||
QRect MultiScreenWorker::dockRect(const QString &screenName)
|
||
{
|
||
return dockRect(screenName, m_position, m_hideMode, m_displayMode);
|
||
}
|
||
|
||
QRect MultiScreenWorker::dockRectWithoutScale(const QString &screenName, const Position &pos, const HideMode &hideMode, const DisplayMode &displayMode)
|
||
{
|
||
if (hideMode == HideMode::KeepShowing)
|
||
return getDockShowGeometry(screenName, pos, displayMode, true);
|
||
else
|
||
return getDockHideGeometry(screenName, pos, displayMode, true);
|
||
}
|
||
|
||
void MultiScreenWorker::onAutoHideChanged(bool autoHide)
|
||
{
|
||
m_autoHide = autoHide;
|
||
|
||
if (m_autoHide) {
|
||
switch (m_hideMode) {
|
||
case HideMode::KeepHidden: {
|
||
// 这时候鼠标如果在任务栏上,就不能隐藏
|
||
if (!parent()->geometry().contains(QCursor::pos()))
|
||
hideAni(m_ds.current());
|
||
}
|
||
break;
|
||
case HideMode::SmartHide: {
|
||
if (m_hideState == HideState::Show) {
|
||
showAni(m_ds.current());
|
||
} else if (m_hideState == HideState::Hide) {
|
||
hideAni(m_ds.current());
|
||
}
|
||
}
|
||
break;
|
||
case HideMode::KeepShowing:
|
||
showAni(m_ds.current());
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
|
||
void MultiScreenWorker::updateDaemonDockSize(int dockSize)
|
||
{
|
||
m_dockInter->setWindowSize(uint(dockSize));
|
||
if (m_displayMode == DisplayMode::Fashion)
|
||
m_dockInter->setWindowSizeFashion(uint(dockSize));
|
||
else
|
||
m_dockInter->setWindowSizeEfficient(uint(dockSize));
|
||
}
|
||
|
||
void MultiScreenWorker::onDragStateChanged(bool draging)
|
||
{
|
||
if (m_draging == draging)
|
||
return;
|
||
|
||
m_draging = draging;
|
||
}
|
||
|
||
void MultiScreenWorker::handleDbusSignal(QDBusMessage msg)
|
||
{
|
||
QList<QVariant> arguments = msg.arguments();
|
||
// 参数固定长度
|
||
if (3 != arguments.count())
|
||
return;
|
||
// 返回的数据中,这一部分对应的是数据发送方的interfacename,可判断是否是自己需要的服务
|
||
QString interfaceName = msg.arguments().at(0).toString();
|
||
if (interfaceName != "com.deepin.dde.daemon.Dock")
|
||
return;
|
||
QVariantMap changedProps = qdbus_cast<QVariantMap>(arguments.at(1).value<QDBusArgument>());
|
||
QStringList keys = changedProps.keys();
|
||
foreach (const QString &prop, keys) {
|
||
if (prop == "Position") {
|
||
onPositionChanged();
|
||
} else if (prop == "DisplayMode") {
|
||
onDisplayModeChanged();
|
||
} else if (prop == "HideMode") {
|
||
onHideModeChanged();
|
||
} else if (prop == "HideState") {
|
||
onHideStateChanged();
|
||
}
|
||
}
|
||
}
|
||
|
||
void MultiScreenWorker::onRegionMonitorChanged(int x, int y, const QString &key)
|
||
{
|
||
if (m_registerKey != key)
|
||
return;
|
||
|
||
// 鼠标按下状态不响应唤醒
|
||
if (m_btnPress) {
|
||
qDebug() << "mouse pressed, should return";
|
||
return;
|
||
}
|
||
|
||
tryToShowDock(x, y);
|
||
}
|
||
|
||
// 鼠标在任务栏之外移动时,任务栏该响应隐藏时需要隐藏
|
||
void MultiScreenWorker::onExtralRegionMonitorChanged(int x, int y, const QString &key)
|
||
{
|
||
Q_UNUSED(x);
|
||
Q_UNUSED(y);
|
||
if (m_extralRegisterKey != key)
|
||
return;
|
||
|
||
// 鼠标移动到任务栏界面之外，不再唤起
|
||
m_delayTimer->stop();
|
||
|
||
if (m_hideMode == HideMode::KeepHidden || m_hideMode == HideMode::SmartHide) {
|
||
if (!m_launcherInter->IsVisible() && m_autoHide && !m_draging && !m_aniStart) {
|
||
if (m_hideMode == HideMode::KeepHidden || (m_hideMode == HideMode::SmartHide && m_hideState == HideState::Hide))
|
||
hideAni(m_ds.current());
|
||
}
|
||
}
|
||
}
|
||
|
||
void MultiScreenWorker::onMonitorListChanged(const QList<QDBusObjectPath> &mons)
|
||
{
|
||
if (mons.isEmpty())
|
||
return;
|
||
|
||
QList<QString> ops;
|
||
for (const auto *mon : m_mtrInfo.data().keys())
|
||
ops << mon->path();
|
||
|
||
QList<QString> pathList;
|
||
for (auto op : mons) {
|
||
const QString path = op.path();
|
||
pathList << path;
|
||
if (!ops.contains(path))
|
||
monitorAdded(path);
|
||
}
|
||
|
||
for (auto op : ops)
|
||
if (!pathList.contains(op))
|
||
monitorRemoved(op);
|
||
}
|
||
|
||
void MultiScreenWorker::monitorAdded(const QString &path)
|
||
{
|
||
MonitorInter *inter = new MonitorInter("com.deepin.daemon.Display", path, QDBusConnection::sessionBus(), this);
|
||
Monitor *mon = new Monitor(this);
|
||
|
||
connect(inter, &MonitorInter::XChanged, mon, &Monitor::setX);
|
||
connect(inter, &MonitorInter::YChanged, mon, &Monitor::setY);
|
||
connect(inter, &MonitorInter::WidthChanged, mon, &Monitor::setW);
|
||
connect(inter, &MonitorInter::HeightChanged, mon, &Monitor::setH);
|
||
connect(inter, &MonitorInter::NameChanged, mon, &Monitor::setName);
|
||
connect(inter, &MonitorInter::EnabledChanged, mon, &Monitor::setMonitorEnable);
|
||
|
||
// 这里有可能在使用Monitor中的数据时，但实际上Monitor数据还未准备好．以Monitor中的信号为准，不能以MonitorInter中信号为准，
|
||
connect(mon, &Monitor::geometryChanged, this, &MultiScreenWorker::requestUpdateMonitorInfo);
|
||
connect(mon, &Monitor::enableChanged, this, &MultiScreenWorker::requestUpdateMonitorInfo);
|
||
|
||
// NOTE: DO NOT using async dbus call. because we need to have a unique name to distinguish each monitor
|
||
Q_ASSERT(inter->isValid());
|
||
mon->setName(inter->name());
|
||
|
||
mon->setMonitorEnable(inter->enabled());
|
||
mon->setPath(path);
|
||
mon->setX(inter->x());
|
||
mon->setY(inter->y());
|
||
mon->setW(inter->width());
|
||
mon->setH(inter->height());
|
||
|
||
m_mtrInfo.insert(mon, inter);
|
||
|
||
inter->setSync(false);
|
||
}
|
||
|
||
void MultiScreenWorker::monitorRemoved(const QString &path)
|
||
{
|
||
Monitor *monitor = nullptr;
|
||
for (auto it(m_mtrInfo.data().cbegin()); it != m_mtrInfo.data().cend(); ++it) {
|
||
if (it.key()->path() == path) {
|
||
monitor = it.key();
|
||
break;
|
||
}
|
||
}
|
||
if (!monitor)
|
||
return;
|
||
|
||
m_mtrInfo.data().value(monitor)->deleteLater();
|
||
m_mtrInfo.remove(monitor);
|
||
|
||
monitor->deleteLater();
|
||
}
|
||
|
||
void MultiScreenWorker::showAniFinished()
|
||
{
|
||
const QRect rect = dockRect(m_ds.current(), m_position, HideMode::KeepShowing, m_displayMode);
|
||
|
||
parent()->setFixedSize(rect.size());
|
||
parent()->setGeometry(rect);
|
||
|
||
parent()->panel()->setFixedSize(rect.size());
|
||
parent()->panel()->move(0, 0);
|
||
|
||
emit requestUpdateFrontendGeometry();
|
||
emit requestNotifyWindowManager();
|
||
emit requestUpdateDragArea();
|
||
}
|
||
|
||
void MultiScreenWorker::hideAniFinished()
|
||
{
|
||
// 提前更新界面布局
|
||
emit requestUpdateLayout();
|
||
|
||
const QRect rect = dockRect(m_ds.current(), m_position, HideMode::KeepHidden, m_displayMode);
|
||
|
||
parent()->setFixedSize(rect.size());
|
||
parent()->setGeometry(rect);
|
||
|
||
parent()->panel()->setFixedSize(rect.size());
|
||
parent()->panel()->move(0, 0);
|
||
|
||
DockItem::setDockPosition(m_position);
|
||
qApp->setProperty(PROP_POSITION, QVariant::fromValue(m_position));
|
||
|
||
emit requestUpdateFrontendGeometry();
|
||
emit requestNotifyWindowManager();
|
||
}
|
||
|
||
void MultiScreenWorker::onWindowSizeChanged(uint value)
|
||
{
|
||
Q_UNUSED(value);
|
||
|
||
m_monitorUpdateTimer->start();
|
||
}
|
||
|
||
void MultiScreenWorker::primaryScreenChanged()
|
||
{
|
||
// 先更新主屏信息
|
||
m_ds.updatePrimary(m_displayInter->primary());
|
||
|
||
const int screenRawHeight = m_displayInter->screenHeight();
|
||
const int screenRawWidth = m_displayInter->screenWidth();
|
||
|
||
// 无效值
|
||
if (screenRawHeight == 0 || screenRawWidth == 0) {
|
||
qDebug() << "screen raw data is not valid:" << screenRawHeight << screenRawWidth;
|
||
return;
|
||
}
|
||
|
||
m_monitorUpdateTimer->start();
|
||
}
|
||
|
||
void MultiScreenWorker::updateParentGeometry(const QVariant &value, const Position &pos)
|
||
{
|
||
const QRect &rect = value.toRect();
|
||
parent()->setFixedSize(rect.size());
|
||
parent()->setGeometry(rect);
|
||
|
||
const int panelSize = ((pos == Position::Top || pos == Position::Bottom) ? parent()->panel()->height() : parent()->panel()->width());
|
||
|
||
switch (pos) {
|
||
case Position::Top: {
|
||
parent()->panel()->move(0, rect.height() - panelSize);
|
||
}
|
||
break;
|
||
case Position::Left: {
|
||
parent()->panel()->move(rect.width() - panelSize, 0);
|
||
}
|
||
break;
|
||
case Position::Bottom:
|
||
case Position::Right: {
|
||
parent()->panel()->move(0, 0);
|
||
}
|
||
break;
|
||
}
|
||
}
|
||
|
||
void MultiScreenWorker::updateParentGeometry(const QVariant &value)
|
||
{
|
||
updateParentGeometry(value, m_position);
|
||
}
|
||
|
||
void MultiScreenWorker::delayShowDock()
|
||
{
|
||
emit requestDelayShowDock(m_delayScreen);
|
||
}
|
||
|
||
void MultiScreenWorker::onPositionChanged()
|
||
{
|
||
const Position position = Dock::Position(m_dockInter->position());
|
||
Position lastPos = m_position;
|
||
if (lastPos == position)
|
||
return;
|
||
#ifdef QT_DEBUG
|
||
qDebug() << "position change from: " << lastPos << " to: " << position;
|
||
#endif
|
||
m_position = position;
|
||
|
||
// 更新鼠标拖拽样式，在类内部设置到qApp单例上去
|
||
if ((Top == m_position) || (Bottom == m_position)) {
|
||
parent()->panel()->setCursor(Qt::SizeVerCursor);
|
||
} else {
|
||
parent()->panel()->setCursor(Qt::SizeHorCursor);
|
||
}
|
||
|
||
if (m_hideMode == HideMode::KeepHidden || (m_hideMode == HideMode::SmartHide && m_hideState == HideState::Hide)) {
|
||
// 这种情况切换位置,任务栏不需要显示
|
||
hideAni(m_ds.current());
|
||
// 更新当前屏幕信息,下次显示从目标屏幕显示
|
||
m_ds.updateDockedScreen(getValidScreen(m_position));
|
||
// 需要更新frontendWindowRect接口数据，否则会造成HideState属性值不变
|
||
emit requestUpdateFrontendGeometry();
|
||
} else {
|
||
// 一直显示的模式才需要显示
|
||
emit requestUpdatePosition(lastPos, position);
|
||
}
|
||
|
||
emit requestUpdateRegionMonitor();
|
||
}
|
||
|
||
void MultiScreenWorker::onDisplayModeChanged()
|
||
{
|
||
DisplayMode displayMode = Dock::DisplayMode(m_dockInter->displayMode());
|
||
|
||
if (displayMode == m_displayMode)
|
||
return;
|
||
|
||
qDebug() << "display mode change:" << displayMode;
|
||
|
||
m_displayMode = displayMode;
|
||
|
||
DockItem::setDockDisplayMode(displayMode);
|
||
qApp->setProperty(PROP_DISPLAY_MODE, QVariant::fromValue(displayMode));
|
||
|
||
QRect rect;
|
||
if (m_hideMode == HideMode::KeepShowing || (m_hideMode == HideMode::SmartHide && m_hideState == HideState::Show)) {
|
||
rect = dockRect(m_ds.current(), m_position, HideMode::KeepShowing, m_displayMode);
|
||
} else {
|
||
rect = dockRect(m_ds.current(), m_position, HideMode::KeepHidden, m_displayMode);
|
||
}
|
||
|
||
parent()->setFixedSize(rect.size());
|
||
parent()->move(rect.topLeft());
|
||
|
||
parent()->panel()->setFixedSize(rect.size());
|
||
parent()->panel()->move(0, 0);
|
||
parent()->panel()->setDisplayMode(m_displayMode);
|
||
|
||
emit displayModeChanegd();
|
||
emit requestUpdateRegionMonitor();
|
||
emit requestUpdateFrontendGeometry();
|
||
emit requestNotifyWindowManager();
|
||
emit requestUpdateDragArea();
|
||
}
|
||
|
||
void MultiScreenWorker::onHideModeChanged()
|
||
{
|
||
HideMode hideMode = Dock::HideMode(m_dockInter->hideMode());
|
||
|
||
if (m_hideMode == hideMode)
|
||
return;
|
||
|
||
qDebug() << "hidemode change:" << hideMode;
|
||
|
||
m_hideMode = hideMode;
|
||
|
||
emit requestUpdateFrontendGeometry();
|
||
|
||
emit requestNotifyWindowManager();
|
||
}
|
||
|
||
void MultiScreenWorker::onHideStateChanged()
|
||
{
|
||
const Dock::HideState state = Dock::HideState(m_dockInter->hideState());
|
||
|
||
if (state == Dock::Unknown)
|
||
return;
|
||
|
||
qDebug() << "hidestate change:" << state;
|
||
|
||
m_hideState = state;
|
||
|
||
// 检查当前屏幕的当前位置是否允许显示,不允许需要更新显示信息(这里应该在函数外部就处理好,不应该走到这里)
|
||
Monitor *currentMonitor = monitorByName(m_mtrInfo.validMonitor(), m_ds.current());
|
||
if (!currentMonitor) {
|
||
qDebug() << "cannot find monitor by name: " << m_ds.current();
|
||
return;
|
||
}
|
||
|
||
if (!currentMonitor->dockPosition().docked(m_position)) {
|
||
Q_ASSERT(false);
|
||
m_ds.updateDockedScreen(getValidScreen(m_position));
|
||
}
|
||
|
||
// 两种隐藏模式下都可以被唤醒
|
||
if (m_hideMode == HideMode::SmartHide || m_hideMode == HideMode::KeepHidden) {
|
||
if (m_hideState == HideState::Show)
|
||
showAni(m_ds.current());
|
||
else if (m_hideState == HideState::Hide)
|
||
hideAni(m_ds.current());
|
||
} else if (m_hideMode == HideMode::KeepShowing) {
|
||
showAni(m_ds.current());
|
||
}
|
||
}
|
||
|
||
void MultiScreenWorker::onOpacityChanged(const double value)
|
||
{
|
||
if (int(m_opacity * 100) == int(value * 100)) return;
|
||
|
||
m_opacity = value;
|
||
|
||
emit opacityChanged(quint8(value * 255));
|
||
}
|
||
|
||
void MultiScreenWorker::onRequestUpdateRegionMonitor()
|
||
{
|
||
if (!m_registerKey.isEmpty()) {
|
||
#ifdef QT_DEBUG
|
||
bool ret = m_eventInter->UnregisterArea(m_registerKey);
|
||
qDebug() << "取消唤起区域监听:" << ret;
|
||
#else
|
||
m_eventInter->UnregisterArea(m_registerKey);
|
||
#endif
|
||
m_registerKey.clear();
|
||
}
|
||
|
||
if (!m_extralRegisterKey.isEmpty()) {
|
||
#ifdef QT_DEBUG
|
||
bool ret = m_extralEventInter->UnregisterArea(m_extralRegisterKey);
|
||
qDebug() << "取消任务栏外部区域监听:" << ret;
|
||
#else
|
||
m_extralEventInter->UnregisterArea(m_extralRegisterKey);
|
||
#endif
|
||
m_extralRegisterKey.clear();
|
||
}
|
||
|
||
if (!m_touchRegisterKey.isEmpty()) {
|
||
m_touchEventInter->UnregisterArea(m_touchRegisterKey);
|
||
m_touchRegisterKey.clear();
|
||
}
|
||
|
||
const static int flags = Motion | Button | Key;
|
||
const static int monitorHeight = 15;
|
||
// 后端认为的任务栏大小(无缩放因素影响)
|
||
const int realDockSize = int(m_displayMode == DisplayMode::Fashion ? m_dockInter->windowSizeFashion() + 2 * 10/*上下的边距各10像素*/ : m_dockInter->windowSizeEfficient());
|
||
|
||
// 任务栏唤起区域
|
||
m_monitorRectList.clear();
|
||
foreach (Monitor *inter, m_mtrInfo.validMonitor()) {
|
||
// 屏幕不可用或此位置不可停靠时，不用监听这块区域
|
||
if (!inter->enable() || !inter->dockPosition().docked(m_position))
|
||
continue;
|
||
|
||
MonitRect rect;
|
||
switch (m_position) {
|
||
case Top: {
|
||
rect.x1 = inter->x();
|
||
rect.y1 = inter->y();
|
||
rect.x2 = inter->x() + inter->w();
|
||
rect.y2 = inter->y() + monitorHeight;
|
||
}
|
||
break;
|
||
case Bottom: {
|
||
rect.x1 = inter->x();
|
||
rect.y1 = inter->y() + inter->h() - monitorHeight;
|
||
rect.x2 = inter->x() + inter->w();
|
||
rect.y2 = inter->y() + inter->h();
|
||
}
|
||
break;
|
||
case Left: {
|
||
rect.x1 = inter->x();
|
||
rect.y1 = inter->y();
|
||
rect.x2 = inter->x() + monitorHeight;
|
||
rect.y2 = inter->y() + inter->h();
|
||
}
|
||
break;
|
||
case Right: {
|
||
rect.x1 = inter->x() + inter->w() - monitorHeight;
|
||
rect.y1 = inter->y();
|
||
rect.x2 = inter->x() + inter->w();
|
||
rect.y2 = inter->y() + inter->h();
|
||
}
|
||
break;
|
||
}
|
||
|
||
if (!m_monitorRectList.contains(rect)) {
|
||
m_monitorRectList << rect;
|
||
#ifdef QT_DEBUG
|
||
qDebug() << "监听区域：" << rect.x1 << rect.y1 << rect.x2 << rect.y2;
|
||
#endif
|
||
}
|
||
}
|
||
|
||
m_extralRectList.clear();
|
||
foreach (Monitor *inter, m_mtrInfo.validMonitor()) {
|
||
// 屏幕不可用或此位置不可停靠时，不用监听这块区域
|
||
if (!inter->enable() || !inter->dockPosition().docked(m_position))
|
||
continue;
|
||
|
||
MonitRect rect;
|
||
switch (m_position) {
|
||
case Top: {
|
||
rect.x1 = inter->x();
|
||
rect.y1 = inter->y() + realDockSize;
|
||
rect.x2 = inter->x() + inter->w();
|
||
rect.y2 = inter->y() + inter->h();
|
||
}
|
||
break;
|
||
case Bottom: {
|
||
rect.x1 = inter->x();
|
||
rect.y1 = inter->y();
|
||
rect.x2 = inter->x() + inter->w();
|
||
rect.y2 = inter->y() + inter->h() - realDockSize;
|
||
}
|
||
break;
|
||
case Left: {
|
||
rect.x1 = inter->x() + realDockSize;
|
||
rect.y1 = inter->y();
|
||
rect.x2 = inter->x() + inter->w();
|
||
rect.y2 = inter->y() + inter->h();
|
||
}
|
||
break;
|
||
case Right: {
|
||
rect.x1 = inter->x();
|
||
rect.y1 = inter->y();
|
||
rect.x2 = inter->x() + inter->w() - realDockSize;
|
||
rect.y2 = inter->y() + inter->h();
|
||
}
|
||
break;
|
||
}
|
||
|
||
if (!m_extralRectList.contains(rect)) {
|
||
m_extralRectList << rect;
|
||
#ifdef QT_DEBUG
|
||
qDebug() << "任务栏外部区域：" << rect.x1 << rect.y1 << rect.x2 << rect.y2;
|
||
#endif
|
||
}
|
||
}
|
||
|
||
// 触屏监控高度固定调整为最大任务栏高度100+任务栏与屏幕边缘间距
|
||
const int monitHeight = 100 + WINDOWMARGIN;
|
||
// 任务栏触屏唤起区域
|
||
m_touchRectList.clear();
|
||
foreach (Monitor *inter, m_mtrInfo.validMonitor()) {
|
||
// 屏幕不可用或此位置不可停靠时，不用监听这块区域
|
||
if (!inter->enable() || !inter->dockPosition().docked(m_position))
|
||
continue;
|
||
|
||
MonitRect touchRect;
|
||
switch (m_position) {
|
||
case Top: {
|
||
touchRect.x1 = inter->x();
|
||
touchRect.y1 = inter->y();
|
||
touchRect.x2 = inter->x() + inter->w();
|
||
touchRect.y2 = inter->y() + monitHeight;
|
||
}
|
||
break;
|
||
case Bottom: {
|
||
touchRect.x1 = inter->x();
|
||
touchRect.y1 = inter->y() + inter->h() - monitHeight;
|
||
touchRect.x2 = inter->x() + inter->w();
|
||
touchRect.y2 = inter->y() + inter->h();
|
||
}
|
||
break;
|
||
case Left: {
|
||
touchRect.x1 = inter->x();
|
||
touchRect.y1 = inter->y();
|
||
touchRect.x2 = inter->x() + monitHeight;
|
||
touchRect.y2 = inter->y() + inter->h();
|
||
}
|
||
break;
|
||
case Right: {
|
||
touchRect.x1 = inter->x() + inter->w() - monitHeight;
|
||
touchRect.y1 = inter->y();
|
||
touchRect.x2 = inter->x() + inter->w();
|
||
touchRect.y2 = inter->y() + inter->h();
|
||
}
|
||
break;
|
||
}
|
||
|
||
if (!m_touchRectList.contains(touchRect)) {
|
||
m_touchRectList << touchRect;
|
||
}
|
||
}
|
||
|
||
m_registerKey = m_eventInter->RegisterAreas(m_monitorRectList, flags);
|
||
m_extralRegisterKey = m_extralEventInter->RegisterAreas(m_extralRectList, flags);
|
||
m_touchRegisterKey = m_touchEventInter->RegisterAreas(m_touchRectList, flags);
|
||
}
|
||
|
||
void MultiScreenWorker::onRequestUpdateFrontendGeometry()
|
||
{
|
||
const QRect rect = dockRectWithoutScale(m_ds.current(), m_position, HideMode::KeepShowing, m_displayMode);
|
||
|
||
//!!! 向com.deepin.dde.daemon.Dock的SetFrontendWindowRect接口设置区域时,此区域的高度或宽度不能为0,否则会导致其HideState属性循环切换,造成任务栏循环显示或隐藏
|
||
if (rect.width() == 0 || rect.height() == 0)
|
||
return;
|
||
|
||
#ifdef QT_DEBUG
|
||
qDebug() << rect;
|
||
#endif
|
||
|
||
m_dockInter->SetFrontendWindowRect(int(rect.x()), int(rect.y()), uint(rect.width()), uint(rect.height()));
|
||
}
|
||
|
||
void MultiScreenWorker::onRequestNotifyWindowManager()
|
||
{
|
||
// 先清除原先的窗管任务栏区域
|
||
XcbMisc::instance()->clear_strut_partial(xcb_window_t(parent()->winId()));
|
||
|
||
// 在副屏时,且为一直显示时,不要挤占应用,这是sp3的新需求
|
||
if (m_ds.current() != qApp->primaryScreen()->name() && m_hideMode == HideMode::KeepShowing) {
|
||
qDebug() << "don`t set dock area";
|
||
return;
|
||
}
|
||
|
||
// 除了"一直显示"模式,其他的都不要设置任务栏区域
|
||
if (m_hideMode != Dock::KeepShowing)
|
||
return;
|
||
|
||
const auto ratio = qApp->devicePixelRatio();
|
||
|
||
const QRect rect = getDockShowGeometry(m_ds.current(), m_position, m_displayMode);
|
||
qDebug() << "wm dock area:" << rect;
|
||
const QPoint &p = rawXPosition(rect.topLeft());
|
||
|
||
XcbMisc::Orientation orientation = XcbMisc::OrientationTop;
|
||
uint strut = 0;
|
||
uint strutStart = 0;
|
||
uint strutEnd = 0;
|
||
|
||
switch (m_position) {
|
||
case Position::Top:
|
||
orientation = XcbMisc::OrientationTop;
|
||
strut = p.y() + rect.height() * ratio;
|
||
strutStart = p.x();
|
||
strutEnd = qMin(qRound(p.x() + rect.width() * ratio), rect.right());
|
||
break;
|
||
case Position::Bottom:
|
||
orientation = XcbMisc::OrientationBottom;
|
||
strut = m_screenRawHeight - p.y();
|
||
strutStart = p.x();
|
||
strutEnd = qMin(qRound(p.x() + rect.width() * ratio), rect.right());
|
||
break;
|
||
case Position::Left:
|
||
orientation = XcbMisc::OrientationLeft;
|
||
strut = p.x() + rect.width() * ratio;
|
||
strutStart = p.y();
|
||
strutEnd = qMin(qRound(p.y() + rect.height() * ratio), rect.bottom());
|
||
break;
|
||
case Position::Right:
|
||
orientation = XcbMisc::OrientationRight;
|
||
strut = m_screenRawWidth - p.x();
|
||
strutStart = p.y();
|
||
strutEnd = qMin(qRound(p.y() + rect.height() * ratio), rect.bottom());
|
||
break;
|
||
}
|
||
|
||
qDebug() << strut << strutStart << strutEnd;
|
||
XcbMisc::instance()->set_strut_partial(parent()->winId(), orientation, strut + WINDOWMARGIN * ratio, strutStart, strutEnd);
|
||
}
|
||
|
||
void MultiScreenWorker::onRequestUpdatePosition(const Position &fromPos, const Position &toPos)
|
||
{
|
||
qDebug() << "request change pos from: " << fromPos << " to: " << toPos;
|
||
// 更新要切换到的屏幕
|
||
m_ds.updateDockedScreen(getValidScreen(m_position));
|
||
|
||
qDebug() << "update allow screen: " << m_ds.current();
|
||
|
||
// 无论什么模式,都先显示
|
||
changeDockPosition(m_ds.last(), m_ds.current(), fromPos, toPos);
|
||
}
|
||
|
||
void MultiScreenWorker::onRequestUpdateMonitorInfo()
|
||
{
|
||
// 双屏，复制模式，两个屏幕的信息是一样的
|
||
if (m_mtrInfo.validMonitor().size() == 2
|
||
&& m_mtrInfo.validMonitor().first()->rect() == m_mtrInfo.validMonitor().last()->rect()) {
|
||
qDebug() << "repeat screen";
|
||
return;
|
||
}
|
||
|
||
m_monitorUpdateTimer->start();
|
||
}
|
||
|
||
void MultiScreenWorker::updateMonitorDockedInfo()
|
||
{
|
||
QList<Monitor *>screens = m_mtrInfo.validMonitor();
|
||
|
||
if (screens.size() == 1) {
|
||
// 只剩下一个可用的屏幕
|
||
screens.first()->dockPosition().reset();
|
||
updateDockScreenName(screens.first()->name());
|
||
return;
|
||
}
|
||
|
||
// 最多支持双屏,这里只计算双屏,单屏默认四边均可停靠任务栏
|
||
if (screens.size() != 2) {
|
||
qDebug() << "screen count:" << screens.count();
|
||
return;
|
||
}
|
||
|
||
Monitor *s1 = screens.at(0);
|
||
Monitor *s2 = screens.at(1);
|
||
if (!s1 || !s2) {
|
||
qFatal("shouldn't be here");
|
||
}
|
||
|
||
qDebug() << "monitor info changed" << s1->rect() << s2->rect();
|
||
|
||
// 先重置
|
||
s1->dockPosition().reset();
|
||
s2->dockPosition().reset();
|
||
|
||
// 对角拼接，重置，默认均可停靠
|
||
if (s1->bottomRight() == s2->topLeft()
|
||
|| s1->topLeft() == s2->bottomRight()) {
|
||
return;
|
||
}
|
||
|
||
// 左右拼接，s1左，s2右
|
||
if (s1->right() == s2->left()
|
||
&& (s1->topRight() == s2->topLeft() || s1->bottomRight() == s2->bottomLeft())) {
|
||
s1->dockPosition().rightDock = false;
|
||
s2->dockPosition().leftDock = false;
|
||
}
|
||
// 左右拼接，s1右，s2左
|
||
if (s1->left() == s2->right()
|
||
&& (s1->topLeft() == s2->topRight() || s1->bottomLeft() == s2->bottomRight())) {
|
||
s1->dockPosition().leftDock = false;
|
||
s2->dockPosition().rightDock = false;
|
||
}
|
||
|
||
// 上下拼接，s1上，s2下
|
||
if (s1->bottom() == s2->top()
|
||
&& (s1->bottomLeft() == s2->topLeft() || s1->bottomRight() == s2->topRight())) {
|
||
s1->dockPosition().bottomDock = false;
|
||
s2->dockPosition().topDock = false;
|
||
}
|
||
|
||
// 上下拼接，s1下，s2上
|
||
if (s1->top() == s2->bottom()
|
||
&& (s1->topLeft() == s2->bottomLeft() || s1->topRight() == s2->bottomRight())) {
|
||
s1->dockPosition().topDock = false;
|
||
s2->dockPosition().bottomDock = false;
|
||
}
|
||
}
|
||
|
||
void MultiScreenWorker::onRequestDelayShowDock(const QString &screenName)
|
||
{
|
||
// 移动Dock至相应屏相应位置
|
||
if (m_launcherInter->IsVisible())//启动器显示,则dock不显示
|
||
return;
|
||
|
||
// 复制模式．不需要响应切换屏幕
|
||
QList<Monitor *> monitorList = m_mtrInfo.validMonitor();
|
||
if (monitorList.size() == 2 && monitorList.first()->rect() == monitorList.last()->rect()) {
|
||
qDebug() << "copy mode or merge mode";
|
||
parent()->setFixedSize(dockRect(m_ds.current()).size());
|
||
parent()->setGeometry(dockRect(m_ds.current()));
|
||
return;
|
||
}
|
||
|
||
m_ds.updateDockedScreen(screenName);
|
||
|
||
Monitor *currentMonitor = monitorByName(m_mtrInfo.validMonitor(), screenName);
|
||
if (!currentMonitor) {
|
||
qDebug() << "cannot find monitor by name: " << screenName;
|
||
return;
|
||
}
|
||
|
||
// 检查边缘是否允许停靠
|
||
if (currentMonitor->dockPosition().docked(m_position)) {
|
||
if (m_hideMode == HideMode::KeepHidden || m_hideMode == HideMode::SmartHide) {
|
||
showAni(m_ds.current());
|
||
} else if (m_hideMode == HideMode::KeepShowing) {
|
||
changeDockPosition(m_ds.last(), m_ds.current(), m_position, m_position);
|
||
}
|
||
}
|
||
}
|
||
|
||
void MultiScreenWorker::initMembers()
|
||
{
|
||
m_monitorUpdateTimer->setInterval(10);
|
||
m_monitorUpdateTimer->setSingleShot(true);
|
||
|
||
m_delayTimer->setInterval(2000);
|
||
m_delayTimer->setSingleShot(true);
|
||
|
||
// 设置应用角色为任务栏
|
||
XcbMisc::instance()->set_window_type(xcb_window_t(parent()->winId()), XcbMisc::Dock);
|
||
|
||
// 初始化动画信息
|
||
m_showAni->setEasingCurve(QEasingCurve::InOutCubic);
|
||
m_hideAni->setEasingCurve(QEasingCurve::InOutCubic);
|
||
|
||
const bool composite = m_wmHelper->hasComposite();
|
||
|
||
#ifndef DISABLE_SHOW_ANIMATION
|
||
const int duration = composite ? ANIMATIONTIME : 0;
|
||
#else
|
||
const int duration = 0;
|
||
#endif
|
||
|
||
m_showAni->setDuration(duration);
|
||
m_hideAni->setDuration(duration);
|
||
|
||
// init check
|
||
checkDaemonDockService();
|
||
checkDaemonDisplayService();
|
||
checkXEventMonitorService();
|
||
}
|
||
|
||
void MultiScreenWorker::initConnection()
|
||
{
|
||
connect(m_showAni, &QVariantAnimation::valueChanged, this, static_cast<void (MultiScreenWorker::*)(const QVariant &value)>(&MultiScreenWorker::updateParentGeometry));
|
||
connect(m_hideAni, &QVariantAnimation::valueChanged, this, static_cast<void (MultiScreenWorker::*)(const QVariant &value)>(&MultiScreenWorker::updateParentGeometry));
|
||
connect(m_showAni, &QVariantAnimation::finished, this, &MultiScreenWorker::showAniFinished);
|
||
connect(m_hideAni, &QVariantAnimation::finished, this, &MultiScreenWorker::hideAniFinished);
|
||
|
||
connect(m_wmHelper, &DWindowManagerHelper::hasCompositeChanged, this, [ = ] {
|
||
const bool composite = m_wmHelper->hasComposite();
|
||
|
||
#ifndef DISABLE_SHOW_ANIMATION
|
||
const int duration = composite ? ANIMATIONTIME : 0;
|
||
#else
|
||
const int duration = 0;
|
||
#endif
|
||
|
||
m_showAni->setDuration(duration);
|
||
m_hideAni->setDuration(duration);
|
||
});
|
||
|
||
//FIX: 这里关联信号有时候收不到,未查明原因,handleDbusSignal处理
|
||
#if 0
|
||
// connect(m_dockInter, &DBusDock::PositionChanged, this, &MultiScreenWorker::onPositionChanged);
|
||
// connect(m_dockInter, &DBusDock::DisplayModeChanged, this, &MultiScreenWorker::onDisplayModeChanged);
|
||
// connect(m_dockInter, &DBusDock::HideModeChanged, this, &MultiScreenWorker::hideModeChanged);
|
||
// connect(m_dockInter, &DBusDock::HideStateChanged, this, &MultiScreenWorker::hideStateChanged);
|
||
#else
|
||
QDBusConnection::sessionBus().connect("com.deepin.dde.daemon.Dock",
|
||
"/com/deepin/dde/daemon/Dock",
|
||
"org.freedesktop.DBus.Properties",
|
||
"PropertiesChanged",
|
||
"sa{sv}as",
|
||
this, SLOT(handleDbusSignal(QDBusMessage)));
|
||
#endif
|
||
connect(&m_mtrInfo, &MonitorInfo::monitorChanged, this, &MultiScreenWorker::requestUpdateMonitorInfo);
|
||
|
||
connect(this, &MultiScreenWorker::requestUpdateRegionMonitor, this, &MultiScreenWorker::onRequestUpdateRegionMonitor);
|
||
connect(this, &MultiScreenWorker::requestUpdateFrontendGeometry, this, &MultiScreenWorker::onRequestUpdateFrontendGeometry);
|
||
connect(this, &MultiScreenWorker::requestUpdatePosition, this, &MultiScreenWorker::onRequestUpdatePosition);
|
||
connect(this, &MultiScreenWorker::requestNotifyWindowManager, this, &MultiScreenWorker::onRequestNotifyWindowManager);
|
||
connect(this, &MultiScreenWorker::requestUpdateMonitorInfo, this, &MultiScreenWorker::onRequestUpdateMonitorInfo);
|
||
connect(this, &MultiScreenWorker::requestDelayShowDock, this, &MultiScreenWorker::onRequestDelayShowDock);
|
||
|
||
connect(m_delayTimer, &QTimer::timeout, this, &MultiScreenWorker::delayShowDock);
|
||
|
||
// 更新任务栏内容展示
|
||
connect(this, &MultiScreenWorker::requestUpdateLayout, this, [ = ] {
|
||
parent()->panel()->setFixedSize(dockRect(m_ds.current(), position(), HideMode::KeepShowing, displayMode()).size());
|
||
parent()->panel()->move(0, 0);
|
||
parent()->panel()->setDisplayMode(displayMode());
|
||
parent()->panel()->setPositonValue(position());
|
||
parent()->panel()->update();
|
||
});
|
||
|
||
connect(m_monitorUpdateTimer, &QTimer::timeout, this, [ = ] {
|
||
// 更新屏幕停靠信息
|
||
updateMonitorDockedInfo();
|
||
// 更新所在屏幕
|
||
resetDockScreen();
|
||
// 更新任务栏自身信息
|
||
/**
|
||
*注意这里要先对parent()进行setFixedSize，在分辨率切换过程中，setGeometry可能会导致其大小未改变
|
||
*/
|
||
parent()->setFixedSize(dockRect(m_ds.current()).size());
|
||
parent()->setGeometry(dockRect(m_ds.current()));
|
||
parent()->panel()->setFixedSize(dockRect(m_ds.current()).size());
|
||
parent()->panel()->move(0, 0);
|
||
// 通知后端
|
||
emit requestUpdateFrontendGeometry();
|
||
// 拖拽区域
|
||
emit requestUpdateDragArea();
|
||
// 监控区域
|
||
emit requestUpdateRegionMonitor();
|
||
// 通知窗管
|
||
emit requestNotifyWindowManager();
|
||
});
|
||
}
|
||
|
||
void MultiScreenWorker::initUI()
|
||
{
|
||
// 设置界面大小
|
||
parent()->setFixedSize(dockRect(m_ds.current()).size());
|
||
parent()->move(dockRect(m_ds.current()).topLeft());
|
||
parent()->panel()->setFixedSize(dockRect(m_ds.current(), m_position, HideMode::KeepShowing, m_displayMode).size());
|
||
parent()->panel()->move(0, 0);
|
||
|
||
onPositionChanged();
|
||
onDisplayModeChanged();
|
||
onHideModeChanged();
|
||
onHideStateChanged();
|
||
onOpacityChanged(m_dockInter->opacity());
|
||
|
||
// 初始化透明度
|
||
QTimer::singleShot(0, this, [ = ] {onOpacityChanged(m_dockInter->opacity());});
|
||
}
|
||
|
||
void MultiScreenWorker::initDBus()
|
||
{
|
||
if (m_dockInter->isValid()) {
|
||
m_position = static_cast<Dock::Position >(m_dockInter->position());
|
||
m_hideMode = static_cast<Dock::HideMode >(m_dockInter->hideMode());
|
||
m_hideState = static_cast<Dock::HideState >(m_dockInter->hideState());
|
||
m_displayMode = static_cast<Dock::DisplayMode >(m_dockInter->displayMode());
|
||
m_opacity = m_dockInter->opacity();
|
||
|
||
DockItem::setDockPosition(m_position);
|
||
qApp->setProperty(PROP_POSITION, QVariant::fromValue(m_position));
|
||
DockItem::setDockDisplayMode(m_displayMode);
|
||
qApp->setProperty(PROP_DISPLAY_MODE, QVariant::fromValue(m_displayMode));
|
||
}
|
||
|
||
if (m_displayInter->isValid()) {
|
||
m_screenRawHeight = m_displayInter->screenHeight();
|
||
m_screenRawWidth = m_displayInter->screenWidth();
|
||
m_ds = DockScreen(m_displayInter->primary());
|
||
}
|
||
}
|
||
|
||
void MultiScreenWorker::initDisplayData()
|
||
{
|
||
//1\初始化monitor信息
|
||
onMonitorListChanged(m_displayInter->monitors());
|
||
|
||
//2\初始化屏幕停靠信息
|
||
updateMonitorDockedInfo();
|
||
|
||
//3\初始化监视区域
|
||
onRequestUpdateRegionMonitor();
|
||
|
||
//4\初始化任务栏停靠屏幕
|
||
resetDockScreen();
|
||
}
|
||
|
||
void MultiScreenWorker::reInitDisplayData()
|
||
{
|
||
initDBus();
|
||
initDisplayData();
|
||
}
|
||
|
||
void MultiScreenWorker::showAni(const QString &screen)
|
||
{
|
||
if (m_showAni->state() == QVariantAnimation::Running || m_aniStart)
|
||
return;
|
||
emit requestUpdateFrontendGeometry();
|
||
|
||
/************************************************************************
|
||
* 务必先走第一步，再走第二部，否则就会出现从一直隐藏切换为一直显示，任务栏不显示的问题
|
||
************************************************************************/
|
||
//1 先停掉其他的动画，否则这里的修改可能会被其他的动画覆盖掉
|
||
if (m_hideAni->state() == QVariantAnimation::Running)
|
||
m_hideAni->stop();
|
||
|
||
parent()->panel()->setFixedSize(dockRect(m_ds.current(), m_position, HideMode::KeepShowing, m_displayMode).size());
|
||
parent()->panel()->move(0, 0);
|
||
|
||
//2 任务栏位置已经正确就不需要再重复一次动画了
|
||
if (getDockShowGeometry(screen, m_position, m_displayMode) == parent()->geometry()) {
|
||
emit requestNotifyWindowManager();
|
||
return;
|
||
}
|
||
|
||
// 显示之前先更新
|
||
emit requestUpdateLayout();
|
||
|
||
m_showAni->setStartValue(getDockHideGeometry(screen, m_position, m_displayMode));
|
||
m_showAni->setEndValue(getDockShowGeometry(screen, m_position, m_displayMode));
|
||
m_showAni->start();
|
||
}
|
||
|
||
void MultiScreenWorker::hideAni(const QString &screen)
|
||
{
|
||
if (m_hideAni->state() == QVariantAnimation::Running || m_aniStart)
|
||
return;
|
||
|
||
/************************************************************************
|
||
* 务必先走第一步，再走第二部，否则就会出现从一直隐藏切换为一直显示，任务栏不显示的问题
|
||
************************************************************************/
|
||
//1 先停掉其他的动画，否则这里的修改可能会被其他的动画覆盖掉
|
||
if (m_showAni->state() == QVariantAnimation::Running)
|
||
m_showAni->stop();
|
||
|
||
parent()->panel()->setFixedSize(dockRect(m_ds.current(), m_position, HideMode::KeepShowing, m_displayMode).size());
|
||
parent()->panel()->move(0, 0);
|
||
|
||
//2 任务栏位置已经正确就不需要再重复一次动画了
|
||
if (getDockHideGeometry(screen, static_cast<Position>(m_position), m_displayMode) == parent()->geometry()) {
|
||
emit requestNotifyWindowManager();
|
||
return;
|
||
}
|
||
|
||
m_hideAni->setStartValue(getDockShowGeometry(screen, m_position, m_displayMode));
|
||
m_hideAni->setEndValue(getDockHideGeometry(screen, m_position, m_displayMode));
|
||
m_hideAni->start();
|
||
}
|
||
|
||
void MultiScreenWorker::changeDockPosition(QString fromScreen, QString toScreen, const Position &fromPos, const Position &toPos)
|
||
{
|
||
if (fromScreen == toScreen && fromPos == toPos) {
|
||
qDebug() << "shouldn't be here,nothing happend!";
|
||
return;
|
||
}
|
||
|
||
// 更新屏幕信息
|
||
m_ds.updateDockedScreen(toScreen);
|
||
|
||
// TODO: 考虑切换过快的情况,这里需要停止上一次的动画,可增加信号控制,暂时无需要
|
||
qDebug() << "from: " << fromScreen << " to: " << toScreen;
|
||
|
||
QSequentialAnimationGroup *group = new QSequentialAnimationGroup(this);
|
||
|
||
QVariantAnimation *ani1 = new QVariantAnimation(group);
|
||
QVariantAnimation *ani2 = new QVariantAnimation(group);
|
||
|
||
// 初始化动画信息
|
||
ani1->setEasingCurve(QEasingCurve::InOutCubic);
|
||
ani2->setEasingCurve(QEasingCurve::InOutCubic);
|
||
|
||
const bool composite = m_wmHelper->hasComposite();
|
||
#ifndef DISABLE_SHOW_ANIMATION
|
||
const int duration = composite ? ANIMATIONTIME : 0;
|
||
#else
|
||
const int duration = 0;
|
||
#endif
|
||
|
||
ani1->setDuration(duration);
|
||
ani2->setDuration(duration);
|
||
|
||
// 隐藏
|
||
ani1->setStartValue(getDockShowGeometry(fromScreen, fromPos, m_displayMode));
|
||
ani1->setEndValue(getDockHideGeometry(fromScreen, fromPos, m_displayMode));
|
||
qDebug() << fromScreen << "hide from :" << getDockShowGeometry(fromScreen, fromPos, m_displayMode);
|
||
qDebug() << fromScreen << "hide to :" << getDockHideGeometry(fromScreen, fromPos, m_displayMode);
|
||
|
||
// 显示
|
||
ani2->setStartValue(getDockHideGeometry(toScreen, toPos, m_displayMode));
|
||
ani2->setEndValue(getDockShowGeometry(toScreen, toPos, m_displayMode));
|
||
qDebug() << toScreen << "show from :" << getDockHideGeometry(toScreen, toPos, m_displayMode);
|
||
qDebug() << toScreen << "show to :" << getDockShowGeometry(toScreen, toPos, m_displayMode);
|
||
|
||
group->addAnimation(ani1);
|
||
group->addAnimation(ani2);
|
||
|
||
// 隐藏时固定一下内容大小
|
||
connect(ani1, &QVariantAnimation::stateChanged, this, [ = ](QAbstractAnimation::State newState, QAbstractAnimation::State oldState) {
|
||
if (newState == QVariantAnimation::Running && oldState == QVariantAnimation::Stopped) {
|
||
parent()->panel()->setFixedSize(dockRect(fromScreen, fromPos, HideMode::KeepShowing, m_displayMode).size());
|
||
parent()->panel()->move(0, 0);
|
||
}
|
||
});
|
||
|
||
connect(ani1, &QVariantAnimation::valueChanged, this, [ = ](const QVariant & value) {
|
||
updateParentGeometry(value, fromPos);
|
||
});
|
||
|
||
// 显示时固定一下内容大小
|
||
connect(ani2, &QVariantAnimation::stateChanged, this, [ = ](QAbstractAnimation::State newState, QAbstractAnimation::State oldState) {
|
||
// 位置发生变化时需要更新位置属性,且要在隐藏动画之后,显示动画之前
|
||
DockItem::setDockPosition(m_position);
|
||
qApp->setProperty(PROP_POSITION, QVariant::fromValue(m_position));
|
||
|
||
if (newState == QVariantAnimation::Running && oldState == QVariantAnimation::Stopped) {
|
||
parent()->panel()->setFixedSize(dockRect(toScreen, toPos, HideMode::KeepShowing, m_displayMode).size());
|
||
parent()->panel()->move(0, 0);
|
||
}
|
||
});
|
||
|
||
connect(ani2, &QVariantAnimation::valueChanged, this, [ = ](const QVariant & value) {
|
||
updateParentGeometry(value, toPos);
|
||
});
|
||
|
||
// 如果更改了显示位置，在显示之前应该更新一下界面布局方向
|
||
if (fromPos != toPos)
|
||
connect(ani1, &QVariantAnimation::finished, this, [ = ] {
|
||
|
||
// 先清除原先的窗管任务栏区域
|
||
XcbMisc::instance()->clear_strut_partial(xcb_window_t(parent()->winId()));
|
||
|
||
// 隐藏后需要通知界面更新布局方向
|
||
emit requestUpdateLayout();
|
||
});
|
||
|
||
connect(group, &QVariantAnimation::finished, this, [ = ] {
|
||
m_aniStart = false;
|
||
|
||
// 结束之后需要根据确定需要再隐藏
|
||
emit showAniFinished();
|
||
emit requestUpdateFrontendGeometry();
|
||
emit requestNotifyWindowManager();
|
||
});
|
||
|
||
m_aniStart = true;
|
||
|
||
group->start(QVariantAnimation::DeleteWhenStopped);
|
||
}
|
||
|
||
void MultiScreenWorker::updateDockScreenName(const QString &screenName)
|
||
{
|
||
Q_UNUSED(screenName);
|
||
|
||
m_ds.updateDockedScreen(getValidScreen(m_position));
|
||
|
||
qDebug() << "update dock screen: " << m_ds.current();
|
||
}
|
||
|
||
QString MultiScreenWorker::getValidScreen(const Position &pos)
|
||
{
|
||
QList<Monitor *> monitorList = m_mtrInfo.validMonitor();
|
||
// 查找主屏
|
||
QString primaryName;
|
||
foreach (auto monitor, monitorList) {
|
||
if (monitor->name() == qApp->primaryScreen()->name()) {
|
||
primaryName = monitor->name();
|
||
break;
|
||
}
|
||
}
|
||
|
||
if (primaryName.isEmpty()) {
|
||
qDebug() << "cannnot find primary screen";
|
||
return QString();
|
||
}
|
||
|
||
Monitor *primaryMonitor = monitorByName(m_mtrInfo.validMonitor(), primaryName);
|
||
if (!primaryMonitor) {
|
||
qDebug() << "cannot find monitor by name: " << primaryName;
|
||
return QString();
|
||
}
|
||
|
||
// 优先选用主屏显示
|
||
if (primaryMonitor->dockPosition().docked(pos))
|
||
return primaryName;
|
||
|
||
// 主屏不满足再找其他屏幕
|
||
foreach (auto monitor, monitorList) {
|
||
if (monitor->name() != primaryName && monitor->dockPosition().docked(pos)) {
|
||
return monitor->name();
|
||
}
|
||
}
|
||
|
||
Q_UNREACHABLE();
|
||
}
|
||
|
||
void MultiScreenWorker::resetDockScreen()
|
||
{
|
||
QList<Monitor *> monitorList = m_mtrInfo.validMonitor();
|
||
if (monitorList.size() == 2) {
|
||
Monitor *primaryMonitor = monitorByName(m_mtrInfo.validMonitor(), m_ds.primary());
|
||
if (!primaryMonitor) {
|
||
qDebug() << "cannot find monitor by name: " << m_ds.primary();
|
||
return;
|
||
}
|
||
if (!primaryMonitor->dockPosition().docked(position())) {
|
||
foreach (auto monitor, monitorList) {
|
||
if (monitor->name() != m_ds.current()
|
||
&& monitor->dockPosition().docked(position())) {
|
||
m_ds.updateDockedScreen(monitor->name());
|
||
qDebug() << "update dock screen: " << monitor->name();
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
void MultiScreenWorker::checkDaemonDockService()
|
||
{
|
||
auto connectionInit = [ = ](DBusDock * dockInter) {
|
||
connect(dockInter, &DBusDock::ServiceRestarted, this, [ = ] {
|
||
resetDockScreen();
|
||
|
||
emit requestUpdateFrontendGeometry();
|
||
});
|
||
connect(dockInter, &DBusDock::OpacityChanged, this, &MultiScreenWorker::onOpacityChanged);
|
||
connect(dockInter, &DBusDock::WindowSizeEfficientChanged, this, &MultiScreenWorker::onWindowSizeChanged);
|
||
connect(dockInter, &DBusDock::WindowSizeFashionChanged, this, &MultiScreenWorker::onWindowSizeChanged);
|
||
};
|
||
|
||
const QString serverName = "com.deepin.dde.daemon.Dock";
|
||
QDBusConnectionInterface *ifc = QDBusConnection::sessionBus().interface();
|
||
|
||
if (!ifc->isServiceRegistered(serverName)) {
|
||
connect(ifc, &QDBusConnectionInterface::serviceOwnerChanged, this, [ = ](const QString & name, const QString & oldOwner, const QString & newOwner) {
|
||
Q_UNUSED(oldOwner)
|
||
if (name == serverName && !newOwner.isEmpty()) {
|
||
FREE_POINT(m_dockInter);
|
||
|
||
m_dockInter = new DBusDock(serverName, "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this);
|
||
// connect
|
||
connectionInit(m_dockInter);
|
||
|
||
// reinit data
|
||
reInitDisplayData();
|
||
|
||
// operation
|
||
onPositionChanged();
|
||
onDisplayModeChanged();
|
||
onHideModeChanged();
|
||
onHideStateChanged();
|
||
onOpacityChanged(m_dockInter->opacity());
|
||
|
||
disconnect(ifc);
|
||
}
|
||
});
|
||
} else {
|
||
connectionInit(m_dockInter);
|
||
}
|
||
}
|
||
|
||
void MultiScreenWorker::checkDaemonDisplayService()
|
||
{
|
||
auto connectionInit = [ = ](DisplayInter * displayInter) {
|
||
connect(displayInter, &DisplayInter::ScreenWidthChanged, this, [ = ](ushort value) {m_screenRawWidth = value;});
|
||
connect(displayInter, &DisplayInter::ScreenHeightChanged, this, [ = ](ushort value) {m_screenRawHeight = value;});
|
||
connect(displayInter, &DisplayInter::MonitorsChanged, this, &MultiScreenWorker::onMonitorListChanged);
|
||
connect(displayInter, &DisplayInter::MonitorsChanged, this, &MultiScreenWorker::requestUpdateRegionMonitor);
|
||
connect(displayInter, &DisplayInter::PrimaryRectChanged, this, &MultiScreenWorker::primaryScreenChanged, Qt::QueuedConnection);
|
||
connect(displayInter, &DisplayInter::ScreenHeightChanged, this, &MultiScreenWorker::primaryScreenChanged, Qt::QueuedConnection);
|
||
connect(displayInter, &DisplayInter::ScreenWidthChanged, this, &MultiScreenWorker::primaryScreenChanged, Qt::QueuedConnection);
|
||
connect(displayInter, &DisplayInter::PrimaryChanged, this, &MultiScreenWorker::primaryScreenChanged, Qt::QueuedConnection);
|
||
};
|
||
|
||
const QString serverName = "com.deepin.daemon.Display";
|
||
QDBusConnectionInterface *ifc = QDBusConnection::sessionBus().interface();
|
||
|
||
if (!ifc->isServiceRegistered(serverName)) {
|
||
connect(ifc, &QDBusConnectionInterface::serviceOwnerChanged, this, [ = ](const QString & name, const QString & oldOwner, const QString & newOwner) {
|
||
Q_UNUSED(oldOwner)
|
||
if (name == serverName && !newOwner.isEmpty()) {
|
||
FREE_POINT(m_displayInter);
|
||
|
||
m_displayInter = new DisplayInter(serverName, "/com/deepin/daemon/Display", QDBusConnection::sessionBus(), this);
|
||
// connect
|
||
connectionInit(m_displayInter);
|
||
|
||
// reinit data
|
||
reInitDisplayData();
|
||
|
||
// 更新任务栏显示位置
|
||
m_monitorUpdateTimer->start();
|
||
|
||
disconnect(ifc);
|
||
}
|
||
});
|
||
} else {
|
||
connectionInit(m_displayInter);
|
||
}
|
||
}
|
||
|
||
void MultiScreenWorker::checkXEventMonitorService()
|
||
{
|
||
auto connectionInit = [ = ](XEventMonitor * eventInter, XEventMonitor * extralEventInter, XEventMonitor * touchEventInter) {
|
||
connect(eventInter, &XEventMonitor::CursorMove, this, &MultiScreenWorker::onRegionMonitorChanged);
|
||
connect(eventInter, &XEventMonitor::ButtonPress, this, [ = ] {m_btnPress = true;});
|
||
connect(eventInter, &XEventMonitor::ButtonRelease, this, [ = ] {m_btnPress = false;});
|
||
|
||
connect(extralEventInter, &XEventMonitor::CursorMove, this, &MultiScreenWorker::onExtralRegionMonitorChanged);
|
||
|
||
// 触屏时，后端只发送press、release消息，有move消息则为鼠标，press置false
|
||
connect(touchEventInter, &XEventMonitor::CursorMove, this, [ = ] {m_touchPress = false;});
|
||
connect(touchEventInter, &XEventMonitor::ButtonPress, this, &MultiScreenWorker::onTouchPress);
|
||
connect(touchEventInter, &XEventMonitor::ButtonRelease, this, &MultiScreenWorker::onTouchRelease);
|
||
};
|
||
|
||
const QString serverName = "com.deepin.api.XEventMonitor";
|
||
QDBusConnectionInterface *ifc = QDBusConnection::sessionBus().interface();
|
||
|
||
if (!ifc->isServiceRegistered(serverName)) {
|
||
connect(ifc, &QDBusConnectionInterface::serviceOwnerChanged, this, [ = ](const QString & name, const QString & oldOwner, const QString & newOwner) {
|
||
Q_UNUSED(oldOwner)
|
||
if (name == serverName && !newOwner.isEmpty()) {
|
||
FREE_POINT(m_eventInter);
|
||
FREE_POINT(m_extralEventInter);
|
||
FREE_POINT(m_touchEventInter);
|
||
|
||
m_eventInter = new XEventMonitor(serverName, "/com/deepin/api/XEventMonitor", QDBusConnection::sessionBus());
|
||
m_extralEventInter = new XEventMonitor(serverName, "/com/deepin/api/XEventMonitor", QDBusConnection::sessionBus());
|
||
m_touchEventInter = new XEventMonitor(serverName, "/com/deepin/api/XEventMonitor", QDBusConnection::sessionBus());
|
||
// connect
|
||
connectionInit(m_eventInter, m_extralEventInter, m_touchEventInter);
|
||
|
||
disconnect(ifc);
|
||
}
|
||
});
|
||
} else {
|
||
connectionInit(m_eventInter, m_extralEventInter, m_touchEventInter);
|
||
}
|
||
}
|
||
|
||
MainWindow *MultiScreenWorker::parent()
|
||
{
|
||
return static_cast<MainWindow *>(m_parent);
|
||
}
|
||
|
||
QRect MultiScreenWorker::getDockShowGeometry(const QString &screenName, const Position &pos, const DisplayMode &displaymode, bool withoutScale)
|
||
{
|
||
//!!! 注意,目前双屏情况下缩放保持一致,不会出现两个屏幕的缩放不一致的情况,如果后面出现了,那么这里可能会有问题
|
||
const qreal scale = qApp->devicePixelRatio();
|
||
QRect rect;
|
||
if (withoutScale) {//后端真实大小
|
||
foreach (Monitor *inter, m_mtrInfo.validMonitor()) {
|
||
if (inter->name() == screenName) {
|
||
// windowSizeFashion和windowSizeEfficient给出的值始终对应前端认为的界面高度或宽度（受缩放影响）
|
||
const int dockSize = int(displaymode == DisplayMode::Fashion ? m_dockInter->windowSizeFashion() : m_dockInter->windowSizeEfficient()) * scale;
|
||
switch (static_cast<Position>(pos)) {
|
||
case Top: {
|
||
rect.setX(inter->x() + WINDOWMARGIN);
|
||
rect.setY(inter->y() + WINDOWMARGIN);
|
||
rect.setWidth(inter->w() - 2 * WINDOWMARGIN);
|
||
rect.setHeight(dockSize);
|
||
}
|
||
break;
|
||
case Bottom: {
|
||
rect.setX(inter->x() + WINDOWMARGIN);
|
||
rect.setY(inter->y() + inter->h() - WINDOWMARGIN - dockSize);
|
||
rect.setWidth(inter->w() - 2 * WINDOWMARGIN);
|
||
rect.setHeight(dockSize);
|
||
}
|
||
break;
|
||
case Left: {
|
||
rect.setX(inter->x() + WINDOWMARGIN);
|
||
rect.setY(inter->y() + WINDOWMARGIN);
|
||
rect.setWidth(dockSize);
|
||
rect.setHeight(inter->h() - 2 * WINDOWMARGIN);
|
||
}
|
||
break;
|
||
case Right: {
|
||
rect.setX(inter->x() + inter->w() - WINDOWMARGIN - dockSize);
|
||
rect.setY(inter->y() + WINDOWMARGIN);
|
||
rect.setWidth(dockSize);
|
||
rect.setHeight(inter->h() - 2 * WINDOWMARGIN);
|
||
}
|
||
}
|
||
break;
|
||
}
|
||
}
|
||
} else {//前端真实大小
|
||
foreach (Monitor *inter, m_mtrInfo.validMonitor()) {
|
||
if (inter->name() == screenName) {
|
||
// windowSizeFashion和windowSizeEfficient给出的值始终对应前端认为的界面高度或宽度（受缩放影响）
|
||
const int dockSize = int(displaymode == DisplayMode::Fashion ? m_dockInter->windowSizeFashion() : m_dockInter->windowSizeEfficient());
|
||
switch (static_cast<Position>(pos)) {
|
||
case Top: {
|
||
rect.setX(inter->x() + WINDOWMARGIN);
|
||
rect.setY(inter->y() + WINDOWMARGIN);
|
||
rect.setWidth(inter->w() / scale - 2 * WINDOWMARGIN);
|
||
rect.setHeight(dockSize);
|
||
}
|
||
break;
|
||
case Bottom: {
|
||
rect.setX(inter->x() + WINDOWMARGIN);
|
||
rect.setY(inter->y() + inter->h() / scale - WINDOWMARGIN - dockSize);
|
||
rect.setWidth(inter->w() / scale - 2 * WINDOWMARGIN);
|
||
rect.setHeight(dockSize);
|
||
}
|
||
break;
|
||
case Left: {
|
||
rect.setX(inter->x() + WINDOWMARGIN);
|
||
rect.setY(inter->y() + WINDOWMARGIN);
|
||
rect.setWidth(dockSize);
|
||
rect.setHeight(inter->h() / scale - 2 * WINDOWMARGIN);
|
||
}
|
||
break;
|
||
case Right: {
|
||
rect.setX(inter->x() + inter->w() / scale - WINDOWMARGIN - dockSize);
|
||
rect.setY(inter->y() + WINDOWMARGIN);
|
||
rect.setWidth(dockSize);
|
||
rect.setHeight(inter->h() / scale - 2 * WINDOWMARGIN);
|
||
}
|
||
}
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
return rect;
|
||
}
|
||
|
||
QRect MultiScreenWorker::getDockHideGeometry(const QString &screenName, const Position &pos, const DisplayMode &displaymode, bool withoutScale)
|
||
{
|
||
//!!! 注意,目前双屏情况下缩放保持一致,不会出现两个屏幕的缩放不一致的情况,如果后面出现了,那么这里可能会有问题
|
||
const qreal scale = qApp->devicePixelRatio();
|
||
QRect rect;
|
||
if (withoutScale) {//后端真实大小
|
||
foreach (Monitor *inter, m_mtrInfo.validMonitor()) {
|
||
if (inter->name() == screenName) {
|
||
const int margin = (displaymode == DisplayMode::Fashion ? WINDOWMARGIN : 0);
|
||
|
||
switch (static_cast<Position>(pos)) {
|
||
case Top: {
|
||
rect.setX(inter->x() + margin);
|
||
rect.setY(inter->y());
|
||
rect.setWidth(inter->w() - 2 * margin);
|
||
rect.setHeight(0);
|
||
}
|
||
break;
|
||
case Bottom: {
|
||
rect.setX(inter->x() + margin);
|
||
rect.setY(inter->y() + inter->h());
|
||
rect.setWidth(inter->w() - 2 * margin);
|
||
rect.setHeight(0);
|
||
}
|
||
break;
|
||
case Left: {
|
||
rect.setX(inter->x());
|
||
rect.setY(inter->y() + margin);
|
||
rect.setWidth(0);
|
||
rect.setHeight(inter->h() - 2 * margin);
|
||
}
|
||
break;
|
||
case Right: {
|
||
rect.setX(inter->x() + inter->w());
|
||
rect.setY(inter->y() + margin);
|
||
rect.setWidth(0);
|
||
rect.setHeight(inter->h() - 2 * margin);
|
||
}
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
} else {//前端真实大小
|
||
foreach (Monitor *inter, m_mtrInfo.validMonitor()) {
|
||
if (inter->name() == screenName) {
|
||
const int margin = (displaymode == DisplayMode::Fashion ? WINDOWMARGIN : 0);
|
||
|
||
switch (static_cast<Position>(pos)) {
|
||
case Top: {
|
||
rect.setX(inter->x() + margin);
|
||
rect.setY(inter->y());
|
||
rect.setWidth(inter->w() / scale - 2 * margin);
|
||
rect.setHeight(0);
|
||
}
|
||
break;
|
||
case Bottom: {
|
||
rect.setX(inter->x() + margin);
|
||
rect.setY(inter->y() + inter->h() / scale);
|
||
rect.setWidth(inter->w() / scale - 2 * margin);
|
||
rect.setHeight(0);
|
||
}
|
||
break;
|
||
case Left: {
|
||
rect.setX(inter->x());
|
||
rect.setY(inter->y() + margin);
|
||
rect.setWidth(0);
|
||
rect.setHeight(inter->h() / scale - 2 * margin);
|
||
}
|
||
break;
|
||
case Right: {
|
||
rect.setX(inter->x() + inter->w() / scale);
|
||
rect.setY(inter->y() + margin);
|
||
rect.setWidth(0);
|
||
rect.setHeight(inter->h() / scale - 2 * margin);
|
||
}
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
return rect;
|
||
}
|
||
|
||
Monitor *MultiScreenWorker::monitorByName(const QList<Monitor *> &list, const QString &screenName)
|
||
{
|
||
foreach (auto monitor, list) {
|
||
if (monitor->name() == screenName) {
|
||
return monitor;
|
||
}
|
||
}
|
||
return nullptr;
|
||
}
|
||
|
||
QScreen *MultiScreenWorker::screenByName(const QString &screenName)
|
||
{
|
||
foreach (QScreen *screen, qApp->screens()) {
|
||
if (screen->name() == screenName)
|
||
return screen;
|
||
}
|
||
return nullptr;
|
||
}
|
||
|
||
qreal MultiScreenWorker::scaleByName(const QString &screenName)
|
||
{
|
||
foreach (auto screen, qApp->screens()) {
|
||
if (screen->name() == screenName)
|
||
return screen->devicePixelRatio();
|
||
}
|
||
|
||
return qApp->devicePixelRatio();;
|
||
}
|
||
|
||
bool MultiScreenWorker::onScreenEdge(const QString &screenName, const QPoint &point)
|
||
{
|
||
bool ret = false;
|
||
QScreen *screen = screenByName(screenName);
|
||
if (screen) {
|
||
const QRect r { screen->geometry() };
|
||
const QRect rect { r.topLeft(), r.size() *screen->devicePixelRatio() };
|
||
if (rect.x() == point.x()
|
||
|| rect.x() + rect.width() == point.x()
|
||
|| rect.y() == point.y()
|
||
|| rect.y() + rect.height() == point.y())
|
||
ret = true;
|
||
}
|
||
return ret;
|
||
}
|
||
|
||
bool MultiScreenWorker::onScreenEdge(const QPoint &point)
|
||
{
|
||
bool ret = false;
|
||
foreach (QScreen *screen, qApp->screens()) {
|
||
const QRect r { screen->geometry() };
|
||
const QRect rect { r.topLeft(), r.size() *screen->devicePixelRatio() };
|
||
if (rect.x() == point.x()
|
||
|| rect.x() + rect.width() == point.x()
|
||
|| rect.y() == point.y()
|
||
|| rect.y() + rect.height() == point.y())
|
||
ret = true;
|
||
break;
|
||
}
|
||
|
||
return ret;
|
||
}
|
||
|
||
bool MultiScreenWorker::contains(const MonitRect &rect, const QPoint &pos)
|
||
{
|
||
return (pos.x() <= rect.x2 && pos.x() >= rect.x1 && pos.y() >= rect.y1 && pos.y() <= rect.y2);
|
||
}
|
||
|
||
bool MultiScreenWorker::contains(const QList<MonitRect> &rectList, const QPoint &pos)
|
||
{
|
||
bool ret = false;
|
||
foreach (auto rect, rectList) {
|
||
if (contains(rect, pos)) {
|
||
ret = true;
|
||
break;
|
||
}
|
||
}
|
||
return ret;
|
||
}
|
||
|
||
const QPoint MultiScreenWorker::rawXPosition(const QPoint &scaledPos)
|
||
{
|
||
QScreen const *screen = Utils::screenAtByScaled(scaledPos);
|
||
|
||
return screen ? screen->geometry().topLeft() +
|
||
(scaledPos - screen->geometry().topLeft()) *
|
||
screen->devicePixelRatio()
|
||
: scaledPos;
|
||
}
|
||
|
||
const QPoint MultiScreenWorker::scaledPos(const QPoint &rawXPos)
|
||
{
|
||
QScreen const *screen = Utils::screenAt(rawXPos);
|
||
|
||
return screen
|
||
? screen->geometry().topLeft() +
|
||
(rawXPos - screen->geometry().topLeft()) / screen->devicePixelRatio()
|
||
: rawXPos;
|
||
}
|
||
|
||
void MultiScreenWorker::onTouchPress(int type, int x, int y, const QString &key)
|
||
{
|
||
Q_UNUSED(type);
|
||
if (key != m_touchRegisterKey) {
|
||
return;
|
||
}
|
||
|
||
m_touchPress = true;
|
||
m_touchPos = QPoint(x, y);
|
||
}
|
||
|
||
void MultiScreenWorker::onTouchRelease(int type, int x, int y, const QString &key)
|
||
{
|
||
Q_UNUSED(type);
|
||
if (key != m_touchRegisterKey) {
|
||
return;
|
||
}
|
||
|
||
if (!m_touchPress) {
|
||
return;
|
||
}
|
||
m_touchPress = false;
|
||
|
||
// 不从指定方向划入，不进行任务栏唤醒；如当任务栏在下，需从下往上划
|
||
switch (m_position) {
|
||
case Top:
|
||
if (m_touchPos.y() >= y) {
|
||
return;
|
||
}
|
||
break;
|
||
case Bottom:
|
||
if (m_touchPos.y() <= y) {
|
||
return;
|
||
}
|
||
break;
|
||
case Left:
|
||
if (m_touchPos.x() >= x) {
|
||
return;
|
||
}
|
||
break;
|
||
case Right:
|
||
if (m_touchPos.x() <= x) {
|
||
return;
|
||
}
|
||
break;
|
||
}
|
||
|
||
tryToShowDock(x, y);
|
||
}
|
||
|
||
void MultiScreenWorker::tryToShowDock(int eventX, int eventY)
|
||
{
|
||
if (m_draging || m_aniStart) {
|
||
qDebug() << "dock is draging or animation is running";
|
||
return;
|
||
}
|
||
|
||
QString toScreen;
|
||
QScreen *screen = Utils::screenAtByScaled(QPoint(eventX, eventY));
|
||
if (!screen) {
|
||
qDebug() << "cannot find the screen" << QPoint(eventX, eventY);
|
||
return;
|
||
}
|
||
|
||
toScreen = screen->name();
|
||
|
||
/**
|
||
* 坐标位于当前屏幕边缘时,当做屏幕内移动处理(防止鼠标移动到边缘时不唤醒任务栏)
|
||
* 使用screenAtByScaled获取屏幕名时,实际上获取的不一定是当前屏幕
|
||
* 举例:点(100,100)不在(0,0,100,100)的屏幕上
|
||
*/
|
||
if (onScreenEdge(m_ds.current(), QPoint(eventX, eventY))) {
|
||
toScreen = m_ds.current();
|
||
}
|
||
|
||
// 过滤重复坐标
|
||
static QPoint lastPos(0, 0);
|
||
if (lastPos == QPoint(eventX, eventY)) {
|
||
return;
|
||
}
|
||
lastPos = QPoint(eventX, eventY);
|
||
|
||
#ifdef QT_DEBUG
|
||
qDebug() << eventX << eventY << m_ds.current() << toScreen;
|
||
#endif
|
||
|
||
// 任务栏显示状态，但需要切换屏幕
|
||
if (toScreen != m_ds.current()) {
|
||
m_delayScreen = toScreen;
|
||
|
||
if (!m_delayTimer->isActive())
|
||
m_delayTimer->start();
|
||
} else {
|
||
// 任务栏隐藏状态，但需要显示
|
||
if (hideMode() == HideMode::KeepShowing) {
|
||
qDebug() << "showing";
|
||
parent()->setFixedSize(dockRect(m_ds.current()).size());
|
||
parent()->setGeometry(dockRect(m_ds.current()));
|
||
return;
|
||
}
|
||
|
||
if (m_showAni->state() == QVariantAnimation::Running) {
|
||
qDebug() << "animation is running";
|
||
return;
|
||
}
|
||
|
||
const QRect boundRect = parent()->visibleRegion().boundingRect();
|
||
qDebug() << "boundRect:" << boundRect;
|
||
if ((m_hideMode == HideMode::KeepHidden || m_hideMode == HideMode::SmartHide)
|
||
&& (boundRect.size().isEmpty())) {
|
||
showAni(m_ds.current());
|
||
}
|
||
}
|
||
}
|