mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-03 00:06:51 +00:00
1691e7188c
原来的TrayManagerWindow的类是放到MainPanelWindow类里面作为它的一部分，导致窗管在显示的时候有很多问题 修改方案： 1、将左右侧区域拆分成两个窗体，让它们继承自相同的基类MainWindowBase。 2、左右区域公共的部分，例如圆角、展示区域、动画获取等，都在基类中实现或者通过接口返回 3、增加WindowManager类，管理所有的界面，WindowManager类无需知道具体子类的指针，只需要根据相应的接口来获取即可 4、所有的界面类在main.cpp中创建，调用WindowManager对象设置 5、拆分MultiScreenWorker类，使MultiScreenWorker类只关心任务栏相关的逻辑，无需关心窗体或界面 Log: 优化任务栏的显示问题 Influence: 打开任务栏，观察时尚模式下圆角，左右侧区域中间是否连接在一起等 Bug: https://pms.uniontech.com/bug-view-137267.html Bug: https://pms.uniontech.com/bug-view-140029.html Bug: https://pms.uniontech.com/bug-view-134527.html Bug: https://pms.uniontech.com/bug-view-146743.html Bug: https://pms.uniontech.com/bug-view-150293.html Change-Id: I4266f6f8c983f61258b92834d93cdacd0221d7de
126 lines
3.7 KiB
C++
126 lines
3.7 KiB
C++
/*
|
|
* Copyright (C) 2022 ~ 2022 Deepin Technology Co., Ltd.
|
|
*
|
|
* Author: donghualin <donghualin@uniontech.com>
|
|
*
|
|
* Maintainer: donghualin <donghualin@uniontech.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 "dragwidget.h"
|
|
#include "utils.h"
|
|
#include "constants.h"
|
|
|
|
#include <QCoreApplication>
|
|
#include <QMouseEvent>
|
|
|
|
DragWidget::DragWidget(QWidget *parent)
|
|
: QWidget(parent)
|
|
, m_dragStatus(false)
|
|
{
|
|
setObjectName("DragWidget");
|
|
}
|
|
|
|
bool DragWidget::isDraging() const
|
|
{
|
|
return m_dragStatus;
|
|
}
|
|
|
|
void DragWidget::onTouchMove(double scaleX, double scaleY)
|
|
{
|
|
Q_UNUSED(scaleX);
|
|
Q_UNUSED(scaleY);
|
|
|
|
static QPoint lastPos;
|
|
QPoint curPos = QCursor::pos();
|
|
if (lastPos == curPos) {
|
|
return;
|
|
}
|
|
lastPos = curPos;
|
|
qApp->postEvent(this, new QMouseEvent(QEvent::MouseMove, mapFromGlobal(curPos)
|
|
, QPoint(), curPos, Qt::LeftButton, Qt::LeftButton
|
|
, Qt::NoModifier, Qt::MouseEventSynthesizedByApplication));
|
|
}
|
|
|
|
void DragWidget::mousePressEvent(QMouseEvent *event)
|
|
{
|
|
// qt转发的触屏按下信号不进行响应
|
|
if (event->source() == Qt::MouseEventSynthesizedByQt)
|
|
return;
|
|
|
|
if (event->button() == Qt::LeftButton) {
|
|
m_resizePoint = event->globalPos();
|
|
m_dragStatus = true;
|
|
this->grabMouse();
|
|
}
|
|
}
|
|
|
|
void DragWidget::mouseMoveEvent(QMouseEvent *)
|
|
{
|
|
if (m_dragStatus) {
|
|
QPoint offset = QPoint(QCursor::pos() - m_resizePoint);
|
|
emit dragPointOffset(offset);
|
|
}
|
|
}
|
|
|
|
void DragWidget::mouseReleaseEvent(QMouseEvent *)
|
|
{
|
|
if (!m_dragStatus)
|
|
return;
|
|
|
|
m_dragStatus = false;
|
|
releaseMouse();
|
|
emit dragFinished();
|
|
}
|
|
|
|
void DragWidget::enterEvent(QEvent *)
|
|
{
|
|
if (Utils::IS_WAYLAND_DISPLAY)
|
|
updateCursor();
|
|
else
|
|
QApplication::setOverrideCursor(cursor());
|
|
}
|
|
|
|
void DragWidget::leaveEvent(QEvent *)
|
|
{
|
|
QApplication::setOverrideCursor(Qt::ArrowCursor);
|
|
}
|
|
|
|
void DragWidget::updateCursor()
|
|
{
|
|
QString theme = Utils::SettingValue("com.deepin.xsettings", "/com/deepin/xsettings/", "gtk-cursor-theme-name", "bloom").toString();
|
|
int cursorSize = Utils::SettingValue("com.deepin.xsettings", "/com/deepin/xsettings/", "gtk-cursor-theme-size", 24).toInt();
|
|
Dock::Position position = static_cast<Dock::Position>(qApp->property("position").toInt());
|
|
|
|
static QString lastTheme;
|
|
static int lastPosition = -1;
|
|
static int lastCursorSize = -1;
|
|
if (theme != lastTheme || position != lastPosition || cursorSize != lastCursorSize) {
|
|
lastTheme = theme;
|
|
lastPosition = position;
|
|
lastCursorSize = cursorSize;
|
|
const char* cursorName = (position == Dock::Position::Bottom || position == Dock::Position::Top) ? "v_double_arrow" : "h_double_arrow";
|
|
QCursor *newCursor = ImageUtil::loadQCursorFromX11Cursor(theme.toStdString().c_str(), cursorName, cursorSize);
|
|
if (!newCursor)
|
|
return;
|
|
|
|
setCursor(*newCursor);
|
|
static QCursor *lastCursor = nullptr;
|
|
if (lastCursor)
|
|
delete lastCursor;
|
|
|
|
lastCursor = newCursor;
|
|
}
|
|
}
|