mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-03 00:15:21 +00:00
c27b9788dc
1、根据需求，从任务栏将图标拖出后，释放需要回到托盘区 2、修复从托盘区将图标移动到任务栏上图标消失的问题 3、修复向上拖动图标，托盘出现的位置歪了的问题 Log: Influence: 将图标从任务栏移出，松手后图标自动移到托盘区 Bug: https://pms.uniontech.com/bug-view-171497.html Bug: https://pms.uniontech.com/bug-view-171539.html Change-Id: Icfcd63afd60f46fece0b4f5ac5e267b3cb977ff1
347 lines
9.9 KiB
C++
347 lines
9.9 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 "expandiconwidget.h"
|
|
#include "tray_gridview.h"
|
|
#include "tray_model.h"
|
|
#include "tray_delegate.h"
|
|
#include "dockpopupwindow.h"
|
|
#include "imageutil.h"
|
|
|
|
#include <DGuiApplicationHelper>
|
|
#include <DRegionMonitor>
|
|
#include <QBitmap>
|
|
#include <QPainter>
|
|
#include <QPainterPath>
|
|
|
|
#include <xcb/xproto.h>
|
|
|
|
DGUI_USE_NAMESPACE
|
|
|
|
ExpandIconWidget::ExpandIconWidget(QWidget *parent, Qt::WindowFlags f)
|
|
: BaseTrayWidget(parent, f)
|
|
, m_position(Dock::Position::Bottom)
|
|
{
|
|
}
|
|
|
|
ExpandIconWidget::~ExpandIconWidget()
|
|
{
|
|
}
|
|
|
|
void ExpandIconWidget::setPositon(Dock::Position position)
|
|
{
|
|
if (m_position != position)
|
|
m_position = position;
|
|
|
|
TrayGridWidget::setPosition(position);
|
|
}
|
|
|
|
void ExpandIconWidget::sendClick(uint8_t mouseButton, int x, int y)
|
|
{
|
|
Q_UNUSED(x);
|
|
Q_UNUSED(y);
|
|
|
|
if (mouseButton != XCB_BUTTON_INDEX_1)
|
|
return;
|
|
|
|
QWidget *gridParentView = popupTrayView();
|
|
setTrayPanelVisible(!gridParentView->isVisible());
|
|
}
|
|
|
|
void ExpandIconWidget::setTrayPanelVisible(bool visible)
|
|
{
|
|
TrayGridWidget *gridParentView = popupTrayView();
|
|
if (visible) {
|
|
gridParentView->resetPosition();
|
|
gridParentView->show();
|
|
} else {
|
|
gridParentView->hide();
|
|
}
|
|
}
|
|
|
|
QPixmap ExpandIconWidget::icon()
|
|
{
|
|
return QPixmap(dropIconFile());
|
|
}
|
|
|
|
void ExpandIconWidget::paintEvent(QPaintEvent *event)
|
|
{
|
|
QPainter painter(this);
|
|
QPixmap pixmap = ImageUtil::loadSvg(dropIconFile(), QSize(ICON_SIZE, ICON_SIZE));
|
|
QRect rectOfPixmap(rect().x() + (rect().width() - ICON_SIZE) / 2,
|
|
rect().y() + (rect().height() - ICON_SIZE) / 2,
|
|
ICON_SIZE, ICON_SIZE);
|
|
|
|
painter.drawPixmap(rectOfPixmap, pixmap);
|
|
}
|
|
|
|
void ExpandIconWidget::moveEvent(QMoveEvent *event)
|
|
{
|
|
BaseTrayWidget::moveEvent(event);
|
|
// 当前展开按钮位置发生变化的时候，需要同时改变托盘的位置
|
|
QMetaObject::invokeMethod(this, [] {
|
|
TrayGridWidget *gridView = popupTrayView();
|
|
if (gridView->isVisible())
|
|
gridView->resetPosition();
|
|
}, Qt::QueuedConnection);
|
|
}
|
|
|
|
const QString ExpandIconWidget::dropIconFile() const
|
|
{
|
|
QString arrow;
|
|
switch (m_position) {
|
|
case Dock::Position::Bottom: {
|
|
arrow = "up";
|
|
break;
|
|
}
|
|
case Dock::Position::Top: {
|
|
arrow = "down";
|
|
break;
|
|
}
|
|
case Dock::Position::Left: {
|
|
arrow = "right";
|
|
break;
|
|
}
|
|
case Dock::Position::Right: {
|
|
arrow = "left";
|
|
break;
|
|
}
|
|
}
|
|
|
|
QString iconFile = QString(":/icons/resources/arrow-%1").arg(arrow);
|
|
if (DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::LightType)
|
|
iconFile += QString("-dark");
|
|
|
|
return iconFile + ".svg";
|
|
}
|
|
|
|
TrayGridWidget *ExpandIconWidget::popupTrayView()
|
|
{
|
|
static TrayGridWidget *gridParentView = nullptr;
|
|
if (gridParentView)
|
|
return gridParentView;
|
|
|
|
gridParentView = new TrayGridWidget(nullptr);
|
|
TrayGridView *trayView = new TrayGridView(gridParentView);
|
|
TrayDelegate *trayDelegate = new TrayDelegate(trayView, trayView);
|
|
TrayModel *trayModel = TrayModel::getIconModel();
|
|
gridParentView->setTrayGridView(trayView);
|
|
|
|
gridParentView->setWindowFlags(Qt::FramelessWindowHint | Qt::Tool);
|
|
trayView->setModel(trayModel);
|
|
trayView->setItemDelegate(trayDelegate);
|
|
trayView->setSpacing(ITEM_SPACING);
|
|
trayView->setDragDistance(2);
|
|
|
|
QVBoxLayout *layout = new QVBoxLayout(gridParentView);
|
|
layout->setContentsMargins(ITEM_SPACING, ITEM_SPACING, ITEM_SPACING, ITEM_SPACING);
|
|
layout->setSpacing(0);
|
|
layout->addWidget(trayView);
|
|
|
|
auto rowCountChanged = [ = ] {
|
|
if (gridParentView->isVisible()) {
|
|
int count = trayModel->rowCount();
|
|
if (count > 0)
|
|
gridParentView->resetPosition();
|
|
else
|
|
gridParentView->hide();
|
|
}
|
|
};
|
|
|
|
connect(trayModel, &TrayModel::rowCountChanged, gridParentView, rowCountChanged);
|
|
connect(trayModel, &TrayModel::requestRefreshEditor, trayView, &TrayGridView::onUpdateEditorView);
|
|
|
|
connect(trayDelegate, &TrayDelegate::removeRow, trayView, [ = ](const QModelIndex &index) {
|
|
trayView->model()->removeRow(index.row(),index.parent());
|
|
});
|
|
connect(trayView, &TrayGridView::requestRemove, trayModel, &TrayModel::removeRow);
|
|
connect(trayModel, &TrayModel::requestOpenEditor, trayView, [ trayView ](const QModelIndex &index) {
|
|
trayView->openPersistentEditor(index);
|
|
});
|
|
|
|
QMetaObject::invokeMethod(gridParentView, rowCountChanged, Qt::QueuedConnection);
|
|
|
|
return gridParentView;
|
|
}
|
|
|
|
/**
|
|
* @brief 圆角窗体的绘制
|
|
* @param parent
|
|
*/
|
|
|
|
Dock::Position TrayGridWidget::m_position = Dock::Position::Bottom;
|
|
|
|
TrayGridWidget::TrayGridWidget(QWidget *parent)
|
|
: QWidget (parent)
|
|
, m_dockInter(new DockInter(dockServiceName(), dockServicePath(), QDBusConnection::sessionBus(), this))
|
|
, m_trayGridView(nullptr)
|
|
, m_referGridView(nullptr)
|
|
, m_regionInter(new DRegionMonitor(this))
|
|
{
|
|
initMember();
|
|
setAttribute(Qt::WA_TranslucentBackground);
|
|
}
|
|
|
|
void TrayGridWidget::setPosition(const Dock::Position &position)
|
|
{
|
|
m_position = position;
|
|
}
|
|
|
|
void TrayGridWidget::setTrayGridView(TrayGridView *trayView)
|
|
{
|
|
m_trayGridView = trayView;
|
|
}
|
|
|
|
void TrayGridWidget::setReferGridView(TrayGridView *trayView)
|
|
{
|
|
m_referGridView = trayView;
|
|
}
|
|
|
|
TrayGridView *TrayGridWidget::trayView() const
|
|
{
|
|
return m_trayGridView;
|
|
}
|
|
|
|
void TrayGridWidget::resetPosition()
|
|
{
|
|
// 如果没有设置所属窗体，则无法计算位置
|
|
ExpandIconWidget *expWidget = expandWidget();
|
|
if (!expWidget)
|
|
return;
|
|
|
|
m_trayGridView->setFixedSize(m_trayGridView->suitableSize());
|
|
setFixedSize(m_trayGridView->size() + QSize(ITEM_SPACING * 2, ITEM_SPACING * 2));
|
|
|
|
QWidget *topWidget = expWidget->topLevelWidget();
|
|
QPoint ptPos = expWidget->mapToGlobal(QPoint(0, 0));
|
|
switch (m_position) {
|
|
case Dock::Position::Bottom: {
|
|
ptPos.setY(topWidget->y() - height());
|
|
break;
|
|
}
|
|
case Dock::Position::Top: {
|
|
ptPos.setY(topWidget->y() + topWidget->height());
|
|
break;
|
|
}
|
|
case Dock::Position::Left: {
|
|
ptPos.setX(topWidget->x() + topWidget->width());
|
|
break;
|
|
}
|
|
case Dock::Position::Right: {
|
|
ptPos.setX(topWidget->x() - width());
|
|
break;
|
|
}
|
|
}
|
|
move(ptPos);
|
|
}
|
|
|
|
void TrayGridWidget::paintEvent(QPaintEvent *event)
|
|
{
|
|
Q_UNUSED(event);
|
|
|
|
QPainter painter(this);
|
|
painter.setRenderHint(QPainter::Antialiasing);
|
|
QPainterPath path;
|
|
path.addRoundedRect(rect(), 18, 18);
|
|
painter.setCompositionMode(QPainter::CompositionMode_Xor);
|
|
painter.setClipPath(path);
|
|
|
|
painter.fillPath(path, maskColor());
|
|
}
|
|
|
|
void TrayGridWidget::showEvent(QShowEvent *event)
|
|
{
|
|
m_regionInter->registerRegion();
|
|
QWidget::showEvent(event);
|
|
}
|
|
|
|
void TrayGridWidget::hideEvent(QHideEvent *event)
|
|
{
|
|
m_regionInter->unregisterRegion();
|
|
// 在当前托盘区域隐藏后，需要设置任务栏区域的展开按钮的托盘为隐藏状态
|
|
TrayModel::getDockModel()->updateOpenExpand(false);
|
|
QWidget::hideEvent(event);
|
|
}
|
|
|
|
void TrayGridWidget::initMember()
|
|
{
|
|
connect(m_regionInter, &DRegionMonitor::buttonPress, this, [ = ](const QPoint &mousePos, const int flag) {
|
|
// 如果当前是隐藏，那么在点击任何地方都隐藏
|
|
if (!isVisible()) {
|
|
hide();
|
|
return;
|
|
}
|
|
|
|
if ((flag != DRegionMonitor::WatchedFlags::Button_Left) && (flag != DRegionMonitor::WatchedFlags::Button_Right))
|
|
return;
|
|
|
|
QPoint ptPos = parentWidget()->mapToGlobal(this->pos());
|
|
const QRect rect = QRect(ptPos, size());
|
|
if (rect.contains(mousePos))
|
|
return;
|
|
// 如果点击的是展开区域，则不做任何处理，因为点击展开区域自己会处理
|
|
if (m_referGridView) {
|
|
QAbstractItemModel *model = m_referGridView->model();
|
|
for (int i = 0; i < model->rowCount(); i++) {
|
|
ExpandIconWidget *widget = qobject_cast<ExpandIconWidget *>(m_referGridView->indexWidget(model->index(i, 0)));
|
|
if (!widget)
|
|
continue;
|
|
|
|
QRect rectExpandWidget(widget->mapToGlobal(QPoint(0, 0)), widget->size());
|
|
if (rectExpandWidget.contains(mousePos))
|
|
return;
|
|
}
|
|
}
|
|
|
|
const QRect rctView(pos(), size());
|
|
if (rctView.contains(mousePos))
|
|
return;
|
|
|
|
hide();
|
|
});
|
|
}
|
|
|
|
QColor TrayGridWidget::maskColor() const
|
|
{
|
|
QColor color = DGuiApplicationHelper::standardPalette(DGuiApplicationHelper::instance()->themeType()).window().color();
|
|
int maskAlpha(static_cast<int>(255 * m_dockInter->opacity()));
|
|
color.setAlpha(maskAlpha);
|
|
return color;
|
|
}
|
|
|
|
ExpandIconWidget *TrayGridWidget::expandWidget() const
|
|
{
|
|
if (!m_referGridView)
|
|
return nullptr;
|
|
|
|
QAbstractItemModel *dataModel = m_referGridView->model();
|
|
if (!dataModel)
|
|
return nullptr;
|
|
|
|
for (int i = 0; i < dataModel->rowCount() - 1; i++) {
|
|
QModelIndex index = dataModel->index(i, 0);
|
|
ExpandIconWidget *widget = qobject_cast<ExpandIconWidget *>(m_referGridView->indexWidget(index));
|
|
if (widget)
|
|
return widget;
|
|
}
|
|
|
|
return nullptr;
|
|
}
|