dde-dock/frame/window/systempluginwindow.cpp
donghualin 5e4c288cea fix: 修复智能隐藏下切换模式显示错乱的问题
原因:在切换模式的时候,需要重新计算任务栏的大小,但是由于时尚模式和高效模式下的尺寸不一样,所以在计算图标的时候会以切换之前的尺寸为参考来进行计算,导致计算的结果错误
修复:在切换模式的时候,提前设置任务栏的尺寸(上下为高度,左右为宽度),这样在下次计算图标的时候获取到的尺寸始终是以正确的尺寸进行计算,任务栏显示正常

Log: 修复智能隐藏下切换模式显示错乱
Influence: 任务栏设置为智能隐藏,从高效模式切换到时尚模式,观察任务栏显示是否正常
Bug: https://pms.uniontech.com/bug-view-176321.html
Change-Id: Ia66cb3e96d4f42c42acc921315e9457d582a82c1
2022-12-14 01:33:00 +00:00

417 lines
13 KiB
C++
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

/*
* 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 "systempluginwindow.h"
#include "systemplugincontroller.h"
#include "systempluginitem.h"
#include "quicksettingcontroller.h"
#include "utils.h"
#include <DListView>
#include <DGuiApplicationHelper>
#include <QBoxLayout>
#include <QDir>
#include <QMetaObject>
#include <QGuiApplication>
#define MAXICONSIZE 48
#define MINICONSIZE 24
#define ICONMARGIN 8
SystemPluginWindow::SystemPluginWindow(DockInter *dockInter, QWidget *parent)
: QWidget(parent)
, m_listView(new DListView(this))
, m_displayMode(Dock::DisplayMode::Efficient)
, m_position(Dock::Position::Bottom)
, m_mainLayout(new QBoxLayout(QBoxLayout::Direction::LeftToRight, this))
, m_dockInter(dockInter)
{
initUi();
initConnection();
}
SystemPluginWindow::~SystemPluginWindow()
{
}
void SystemPluginWindow::setDisplayMode(const DisplayMode &displayMode)
{
m_displayMode = displayMode;
QList<StretchPluginsItem *> items = stretchItems();
switch (m_position) {
case Dock::Position::Top:
case Dock::Position::Bottom: {
for (StretchPluginsItem *item : items)
item->setDisplayMode(displayMode);
break;
}
case Dock::Position::Left:
case Dock::Position::Right: {
for (StretchPluginsItem *item : items)
item->setDisplayMode(displayMode);
break;
}
}
}
void SystemPluginWindow::setPositon(Position position)
{
if (m_position == position)
return;
m_position = position;
if (m_position == Dock::Position::Top || m_position == Dock::Position::Bottom)
m_mainLayout->setDirection(QBoxLayout::Direction::LeftToRight);
else
m_mainLayout->setDirection(QBoxLayout::Direction::TopToBottom);
StretchPluginsItem::setPosition(position);
QObjectList childObjects = children();
for (QObject *childObject : childObjects) {
StretchPluginsItem *item = qobject_cast<StretchPluginsItem *>(childObject);
if (!item)
continue;
item->update();
}
}
QSize SystemPluginWindow::suitableSize() const
{
return suitableSize(m_position);
}
QSize SystemPluginWindow::suitableSize(const Position &position) const
{
QList<StretchPluginsItem *> items = stretchItems();
if (position == Dock::Position::Top || position == Dock::Position::Bottom) {
int itemWidth = 0;
for (StretchPluginsItem *item : items)
itemWidth += item->suitableSize(position).width();
return QSize(itemWidth, QWIDGETSIZE_MAX);
}
int itemHeight = 0;
for (StretchPluginsItem *item : items)
itemHeight += item->suitableSize(position).height();
return QSize(QWIDGETSIZE_MAX, itemHeight);
}
bool SystemPluginWindow::eventFilter(QObject *watched, QEvent *event)
{
if (event->type() == QEvent::Drop)
Q_EMIT requestDrop(static_cast<QDropEvent *>(event));
return QWidget::eventFilter(watched, event);
}
void SystemPluginWindow::initUi()
{
m_mainLayout->setContentsMargins(0, 0, 0, 0);
m_mainLayout->setSpacing(0);
installEventFilter(this);
}
void SystemPluginWindow::initConnection()
{
QuickSettingController *quickController = QuickSettingController::instance();
connect(quickController, &QuickSettingController::pluginInserted, this, [ = ](PluginsItemInterface *itemInter, const QuickSettingController::PluginAttribute pluginAttr) {
if (pluginAttr != QuickSettingController::PluginAttribute::System)
return;
pluginAdded(itemInter);
});
connect(quickController, &QuickSettingController::pluginRemoved, this, &SystemPluginWindow::onPluginItemRemoved);
connect(quickController, &QuickSettingController::pluginUpdated, this, &SystemPluginWindow::onPluginItemUpdated);
QList<PluginsItemInterface *> plugins = quickController->pluginItems(QuickSettingController::PluginAttribute::System);
for (int i = 0; i < plugins.size(); i++)
pluginAdded(plugins[i]);
}
StretchPluginsItem *SystemPluginWindow::findPluginItemWidget(PluginsItemInterface *pluginItem)
{
for (int i = 0; i < m_mainLayout->count(); i++) {
QLayoutItem *layoutItem = m_mainLayout->itemAt(i);
if (!layoutItem)
continue;
StretchPluginsItem *itemWidget = qobject_cast<StretchPluginsItem *>(layoutItem->widget());
if (itemWidget && itemWidget->pluginInter() == pluginItem)
return itemWidget;
}
return nullptr;
}
void SystemPluginWindow::pluginAdded(PluginsItemInterface *plugin)
{
StretchPluginsItem *item = new StretchPluginsItem(m_dockInter, plugin, QuickSettingController::instance()->itemKey(plugin));
item->setDisplayMode(m_displayMode);
item->setPosition(m_position);
item->installEventFilter(this);
item->setParent(this);
item->show();
m_mainLayout->addWidget(item);
Q_EMIT itemChanged();
}
QList<StretchPluginsItem *> SystemPluginWindow::stretchItems() const
{
QList<StretchPluginsItem *> items;
QObjectList childObjects = children();
for (QObject *childObject : childObjects) {
StretchPluginsItem *item = qobject_cast<StretchPluginsItem *>(childObject);
if (!item)
continue;
items << item;
}
return items;
}
void SystemPluginWindow::onPluginItemRemoved(PluginsItemInterface *pluginItem)
{
StretchPluginsItem *item = findPluginItemWidget(pluginItem);
if (item) {
item->setParent(nullptr);
item->hide();
m_mainLayout->removeWidget(item);
Q_EMIT itemChanged();
}
}
void SystemPluginWindow::onPluginItemUpdated(PluginsItemInterface *pluginItem)
{
StretchPluginsItem *item = findPluginItemWidget(pluginItem);
if (item)
item->update();
}
#define ICONSIZE 20
#define ICONTEXTSPACE 6
#define PLUGIN_ITEM_DRAG_THRESHOLD 20
Dock::Position StretchPluginsItem::m_position = Dock::Position::Bottom;
StretchPluginsItem::StretchPluginsItem(DockInter *dockInter, PluginsItemInterface * const pluginInter, const QString &itemKey, QWidget *parent)
: DockItem(parent)
, m_pluginInter(pluginInter)
, m_itemKey(itemKey)
, m_displayMode(Dock::DisplayMode::Efficient)
, m_dockInter(dockInter)
{
}
StretchPluginsItem::~StretchPluginsItem()
{
}
void StretchPluginsItem::setDisplayMode(const DisplayMode &displayMode)
{
m_displayMode = displayMode;
}
void StretchPluginsItem::setPosition(Position position)
{
m_position = position;
}
QString StretchPluginsItem::itemKey() const
{
return m_itemKey;
}
QSize StretchPluginsItem::suitableSize() const
{
return suitableSize(m_position);
}
PluginsItemInterface *StretchPluginsItem::pluginInter() const
{
return m_pluginInter;
}
void StretchPluginsItem::paintEvent(QPaintEvent *event)
{
Q_UNUSED(event);
QPainter painter(this);
QIcon icon = m_pluginInter->icon(DockPart::SystemPanel);
QRect rctPixmap(rect());
if (needShowText()) {
int textHeight = QFontMetrics(textFont()).height();
// 文本与图标的间距为6
int iconTop = (height() - textHeight - ICONSIZE - ICONTEXTSPACE) / 2;
rctPixmap.setX((width() - ICONSIZE) / 2);
rctPixmap.setY(iconTop);
rctPixmap.setWidth(ICONSIZE);
rctPixmap.setHeight(ICONSIZE);
// 先绘制下面的文本
painter.setFont(textFont());
painter.drawText(QRect(0, iconTop + ICONSIZE + ICONTEXTSPACE, width(), textHeight), Qt::AlignCenter, m_pluginInter->pluginDisplayName());
} else {
rctPixmap.setX((width() - ICONSIZE) / 2);
rctPixmap.setY((height() - ICONSIZE) / 2);
rctPixmap.setWidth(ICONSIZE);
rctPixmap.setHeight(ICONSIZE);
}
// 绘制图标
int iconSize = static_cast<int>(ICONSIZE * (qApp->devicePixelRatio()));
painter.drawPixmap(rctPixmap, icon.pixmap(iconSize, iconSize));
}
QSize StretchPluginsItem::suitableSize(const Position &position) const
{
int iconSize = static_cast<int>(ICONSIZE * (qApp->devicePixelRatio()));
if (position == Dock::Position::Top || position == Dock::Position::Bottom) {
int textWidth = 0;
if (needShowText())
textWidth = QFontMetrics(textFont(position)).boundingRect(m_pluginInter->pluginDisplayName()).width();
return QSize(qMax(textWidth, iconSize) + (m_displayMode == Dock::DisplayMode::Efficient ? 5 : 10) * 2, -1);
}
int height = 6; // 图标上边距6
height += iconSize; // 图标尺寸20
height += ICONTEXTSPACE; // 图标与文字间距6
if (needShowText()) // 只有在显示文本的时候才计算文本的高度
height += QFontMetrics(textFont(position)).height(); // 文本高度
height += 4; // 下间距4
return QSize(-1, height);
}
QFont StretchPluginsItem::textFont() const
{
return textFont(m_position);
}
QFont StretchPluginsItem::textFont(const Position &position) const
{
if (position == Dock::Position::Top || position == Dock::Position::Bottom) {
static QList<QFont> fonts{ DFontSizeManager::instance()->t9(),
DFontSizeManager::instance()->t8(),
DFontSizeManager::instance()->t7(),
DFontSizeManager::instance()->t6() };
#define MINHEIGHT 50
// 如果当前的实际位置和请求的位置不一致,说明当前正在切换位置,此时将它的宽度作为它的高度(左到下切换的时候,左侧的宽度和下面的高度一致)
int size = (m_position == position ? height() : width());
int index = qMin(qMax((size - MINHEIGHT) / 2, 0), fonts.size() - 1);
return fonts[index];
}
return DFontSizeManager::instance()->t10();
}
bool StretchPluginsItem::needShowText() const
{
// 如果是高效模式,则不需要显示下面的文本
if (m_displayMode == Dock::DisplayMode::Efficient)
return false;
// 图标的尺寸
#define ICONSIZE 20
// 图标与文本,图标距离上方和文本距离下方的尺寸
#define SPACEMARGIN 6
// 文本的高度
#define TEXTSIZE 14
// 当前插件父窗口与顶层窗口的上下边距
#define OUTMARGIN 7
// 任务栏在上方或者下方显示的时候根据设计图只有在当前区域高度大于50的时候才同时显示文本和图标
if (m_position == Dock::Position::Top || m_position == Dock::Position::Bottom)
return ((Utils::isDraging() ? topLevelWidget()->height() : m_dockInter->windowSizeFashion()) >=
(OUTMARGIN * 2 + SPACEMARGIN * 3 + ICONSIZE + TEXTSIZE));
return true;
}
const QString StretchPluginsItem::contextMenu() const
{
return m_pluginInter->itemContextMenu(m_itemKey);
}
void StretchPluginsItem::invokedMenuItem(const QString &itemId, const bool checked)
{
m_pluginInter->invokedMenuItem(m_itemKey, itemId, checked);
}
QWidget *StretchPluginsItem::popupTips()
{
return m_pluginInter->itemTipsWidget(m_itemKey);
}
void StretchPluginsItem::mousePressEvent(QMouseEvent *e)
{
m_hover = false;
update();
if (PopupWindow->isVisible())
hideNonModel();
if (e->button() == Qt::LeftButton)
m_mousePressPoint = e->pos();
m_popupTipsDelayTimer->stop();
hideNonModel();
if (e->button() == Qt::RightButton
&& perfectIconRect().contains(e->pos()))
return showContextMenu();
DockItem::mousePressEvent(e);
}
void StretchPluginsItem::mouseReleaseEvent(QMouseEvent *e)
{
DockItem::mouseReleaseEvent(e);
if (e->button() != Qt::LeftButton)
return;
if (checkAndResetTapHoldGestureState() && e->source() == Qt::MouseEventSynthesizedByQt)
return;
const QPoint distance = e->pos() - m_mousePressPoint;
if (distance.manhattanLength() < PLUGIN_ITEM_DRAG_THRESHOLD)
mouseClick();
}
void StretchPluginsItem::mouseClick()
{
QStringList commandArgument = m_pluginInter->itemCommand(m_itemKey).split(" ");
if (commandArgument.size() > 0) {
QString command = commandArgument.first();
commandArgument.removeFirst();
QProcess::startDetached(command, commandArgument);
return;
}
// request popup applet
if (QWidget *w = m_pluginInter->itemPopupApplet(m_itemKey))
showPopupApplet(w);
}