mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-03 00:15:21 +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
401 lines
14 KiB
C++
401 lines
14 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 "datetimedisplayer.h"
|
||
#include "tipswidget.h"
|
||
#include "dockpopupwindow.h"
|
||
#include "utils.h"
|
||
|
||
#include <DFontSizeManager>
|
||
#include <DDBusSender>
|
||
|
||
#include <QHBoxLayout>
|
||
#include <QPainter>
|
||
#include <QFont>
|
||
#include <QMenu>
|
||
|
||
DWIDGET_USE_NAMESPACE
|
||
DGUI_USE_NAMESPACE
|
||
|
||
#define DATETIMESIZE 40
|
||
#define ITEMSPACE 8
|
||
|
||
static QMap<int, QString> dateFormat{{ 0,"yyyy/M/d" }, { 1,"yyyy-M-d" }, { 2,"yyyy.M.d" }, { 3,"yyyy/MM/dd" },
|
||
{ 4,"yyyy-MM-dd" }, { 5,"yyyy.MM.dd" }, { 6,"yy/M/d" }, { 7,"yy-M-d" }, { 8,"yy.M.d" }};
|
||
static QMap<int, QString> timeFormat{{0, "h:mm"}, {1, "hh:mm"}};
|
||
|
||
DateTimeDisplayer::DateTimeDisplayer(QWidget *parent)
|
||
: QWidget (parent)
|
||
, m_timedateInter(new Timedate("com.deepin.daemon.Timedate", "/com/deepin/daemon/Timedate", QDBusConnection::sessionBus(), this))
|
||
, m_position(Dock::Position::Bottom)
|
||
, m_dateFont(DFontSizeManager::instance()->t10())
|
||
, m_tipsWidget(new Dock::TipsWidget(this))
|
||
, m_menu(new QMenu(this))
|
||
, m_tipsTimer(new QTimer(this))
|
||
, m_currentSize(0)
|
||
, m_oneRow(false)
|
||
{
|
||
m_tipPopupWindow.reset(new DockPopupWindow);
|
||
// 日期格式变化的时候，需要重绘
|
||
connect(m_timedateInter, &Timedate::ShortDateFormatChanged, this, &DateTimeDisplayer::onDateTimeFormatChanged);
|
||
// 时间格式变化的时候，需要重绘
|
||
connect(m_timedateInter, &Timedate::ShortTimeFormatChanged, this, &DateTimeDisplayer::onDateTimeFormatChanged);
|
||
// 是否使用24小时制发生变化的时候，也需要重绘
|
||
connect(m_timedateInter, &Timedate::Use24HourFormatChanged, this, &DateTimeDisplayer::onDateTimeFormatChanged);
|
||
// 连接日期时间修改信号,更新日期时间插件的布局
|
||
connect(m_timedateInter, &Timedate::TimeUpdate, this, static_cast<void (QWidget::*)()>(&DateTimeDisplayer::update));
|
||
// 连接定时器和时间显示的tips信号,一秒钟触发一次，显示时间
|
||
connect(m_tipsTimer, &QTimer::timeout, this, &DateTimeDisplayer::onTimeChanged);
|
||
m_tipsTimer->setInterval(1000);
|
||
m_tipsTimer->start();
|
||
updatePolicy();
|
||
createMenuItem();
|
||
if (Utils::IS_WAYLAND_DISPLAY)
|
||
m_tipPopupWindow->setWindowFlags(m_tipPopupWindow->windowFlags() | Qt::FramelessWindowHint);
|
||
m_tipPopupWindow->hide();
|
||
}
|
||
|
||
DateTimeDisplayer::~DateTimeDisplayer()
|
||
{
|
||
}
|
||
|
||
void DateTimeDisplayer::setPositon(Dock::Position position)
|
||
{
|
||
if (m_position == position)
|
||
return;
|
||
|
||
m_position = position;
|
||
updatePolicy();
|
||
update();
|
||
}
|
||
|
||
void DateTimeDisplayer::setOneRow(bool oneRow)
|
||
{
|
||
m_oneRow = oneRow;
|
||
update();
|
||
}
|
||
|
||
void DateTimeDisplayer::updatePolicy()
|
||
{
|
||
switch (m_position) {
|
||
case Dock::Position::Top: {
|
||
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
|
||
m_tipPopupWindow->setArrowDirection(DArrowRectangle::ArrowDirection::ArrowTop);
|
||
m_tipPopupWindow->setContent(m_tipsWidget);
|
||
break;
|
||
}
|
||
case Dock::Position::Bottom: {
|
||
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
|
||
m_tipPopupWindow->setArrowDirection(DArrowRectangle::ArrowDirection::ArrowBottom);
|
||
m_tipPopupWindow->setContent(m_tipsWidget);
|
||
break;
|
||
}
|
||
case Dock::Position::Left: {
|
||
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
|
||
m_tipPopupWindow->setArrowDirection(DArrowRectangle::ArrowDirection::ArrowLeft);
|
||
m_tipPopupWindow->setContent(m_tipsWidget);
|
||
break;
|
||
}
|
||
case Dock::Position::Right: {
|
||
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
|
||
m_tipPopupWindow->setArrowDirection(DArrowRectangle::ArrowDirection::ArrowRight);
|
||
m_tipPopupWindow->setContent(m_tipsWidget);
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
|
||
QSize DateTimeDisplayer::suitableSize() const
|
||
{
|
||
return suitableSize(m_position);
|
||
}
|
||
|
||
QSize DateTimeDisplayer::suitableSize(const Dock::Position &position) const
|
||
{
|
||
DateTimeInfo info = dateTimeInfo(position);
|
||
if (position == Dock::Position::Top || position == Dock::Position::Bottom) {
|
||
int width = info.m_timeRect.width() + info.m_dateRect.width() + 16;
|
||
return QSize(width, height());
|
||
}
|
||
|
||
return QSize(width(), info.m_timeRect.height() + info.m_dateRect.height());
|
||
}
|
||
|
||
void DateTimeDisplayer::mousePressEvent(QMouseEvent *event)
|
||
{
|
||
if ((event->button() != Qt::RightButton))
|
||
return QWidget::mousePressEvent(event);
|
||
|
||
m_menu->exec(QCursor::pos());
|
||
}
|
||
|
||
void DateTimeDisplayer::mouseReleaseEvent(QMouseEvent *event)
|
||
{
|
||
Q_UNUSED(event);
|
||
|
||
DDBusSender().service("org.deepin.dde.Widgets")
|
||
.path("/")
|
||
.interface("org.deepin.dde.Widgets")
|
||
.method("Toggle").call();
|
||
}
|
||
|
||
QString DateTimeDisplayer::getTimeString(const Dock::Position &position) const
|
||
{
|
||
QString tFormat = QString("hh:mm");
|
||
int type = m_timedateInter->shortTimeFormat();
|
||
if (timeFormat.contains(type))
|
||
tFormat = timeFormat[type];
|
||
|
||
if (!m_timedateInter->use24HourFormat()) {
|
||
if (position == Dock::Top || position == Dock::Bottom)
|
||
tFormat = tFormat.append(" AP");
|
||
else
|
||
tFormat = tFormat.append("\nAP");
|
||
}
|
||
|
||
return QDateTime::currentDateTime().toString(tFormat);
|
||
}
|
||
|
||
QString DateTimeDisplayer::getDateString() const
|
||
{
|
||
return getDateString(m_position);
|
||
}
|
||
|
||
QString DateTimeDisplayer::getDateString(const Dock::Position &position) const
|
||
{
|
||
int type = m_timedateInter->shortDateFormat();
|
||
QString shortDateFormat = "yyyy-MM-dd";
|
||
if (dateFormat.contains(type))
|
||
shortDateFormat = dateFormat.value(type);
|
||
// 如果是左右方向，则不显示年份
|
||
if (position == Dock::Position::Left || position == Dock::Position::Right) {
|
||
static QStringList yearStrList{"yyyy/", "yyyy-", "yyyy.", "yy/", "yy-", "yy."};
|
||
for (int i = 0; i < yearStrList.size() ; i++) {
|
||
const QString &yearStr = yearStrList[i];
|
||
if (shortDateFormat.contains(yearStr)) {
|
||
shortDateFormat = shortDateFormat.remove(yearStr);
|
||
break;
|
||
}
|
||
}
|
||
}
|
||
|
||
return QDateTime::currentDateTime().toString(shortDateFormat);
|
||
}
|
||
|
||
DateTimeDisplayer::DateTimeInfo DateTimeDisplayer::dateTimeInfo(const Dock::Position &position) const
|
||
{
|
||
DateTimeInfo info;
|
||
info.m_timeRect = rect();
|
||
info.m_dateRect = rect();
|
||
|
||
info.m_time = getTimeString(position);
|
||
info.m_date = getDateString(position);
|
||
|
||
if (position == Dock::Top || position == Dock::Bottom) {
|
||
int timeWidth = QFontMetrics(timeFont()).boundingRect(info.m_time).width() + 3;
|
||
int dateWidth = QFontMetrics(m_dateFont).boundingRect(info.m_date).width() + 2;
|
||
info.m_timeRect = QRect(ITEMSPACE, 0, timeWidth, height());
|
||
int dateX = rect().width() - QFontMetrics(m_dateFont).width(info.m_date) - 2 - ITEMSPACE;
|
||
// 如果时间的X坐标小于日期的X坐标，需要手动设置坐标在日期坐标的右侧
|
||
if (dateX < info.m_timeRect.right())
|
||
dateX = info.m_timeRect.right();
|
||
info.m_dateRect = QRect(dateX, 0, dateWidth, height());
|
||
} else {
|
||
int textWidth = rect().width();
|
||
info.m_timeRect = QRect(0, 0, textWidth, DATETIMESIZE / 2);
|
||
info.m_dateRect = QRect(0, DATETIMESIZE / 2 + 1, textWidth, DATETIMESIZE / 2);
|
||
}
|
||
return info;
|
||
}
|
||
|
||
void DateTimeDisplayer::onTimeChanged()
|
||
{
|
||
const QDateTime currentDateTime = QDateTime::currentDateTime();
|
||
|
||
if (m_timedateInter->use24HourFormat())
|
||
m_tipsWidget->setText(currentDateTime.date().toString(Qt::SystemLocaleLongDate) + currentDateTime.toString(" HH:mm:ss"));
|
||
else
|
||
m_tipsWidget->setText(currentDateTime.date().toString(Qt::SystemLocaleLongDate) + currentDateTime.toString(" hh:mm:ss AP"));
|
||
|
||
// 如果时间和日期有一个不等，则实时刷新界面
|
||
if (m_lastDateString != getDateString() || m_lastTimeString != getTimeString())
|
||
update();
|
||
}
|
||
|
||
void DateTimeDisplayer::onDateTimeFormatChanged()
|
||
{
|
||
int lastSize = m_currentSize;
|
||
// 此处需要强制重绘，因为在重绘过程中才会改变m_currentSize信息，方便在后面判断是否需要调整尺寸
|
||
repaint();
|
||
// 如果日期时间的格式发生了变化，需要通知外部来调整日期时间的尺寸
|
||
if (lastSize != m_currentSize)
|
||
Q_EMIT requestUpdate();
|
||
}
|
||
|
||
void DateTimeDisplayer::paintEvent(QPaintEvent *e)
|
||
{
|
||
Q_UNUSED(e);
|
||
|
||
DateTimeInfo info = dateTimeInfo(m_position);
|
||
|
||
QPainter painter(this);
|
||
painter.setRenderHint(QPainter::Antialiasing);
|
||
painter.setPen(QPen(palette().brightText(), 1));
|
||
|
||
int timeTextFlag = Qt::AlignCenter;
|
||
int dateTextFlag = Qt::AlignCenter;
|
||
if (m_position == Dock::Top || m_position == Dock::Bottom) {
|
||
timeTextFlag = Qt::AlignLeft | Qt::AlignVCenter;
|
||
dateTextFlag = Qt::AlignRight | Qt::AlignVCenter;
|
||
}
|
||
painter.setFont(timeFont());
|
||
painter.drawText(info.m_timeRect, timeTextFlag, info.m_time);
|
||
painter.setFont(m_dateFont);
|
||
painter.drawText(info.m_dateRect, dateTextFlag, info.m_date);
|
||
|
||
updateLastData(info);
|
||
}
|
||
|
||
QPoint DateTimeDisplayer::tipsPoint() const
|
||
{
|
||
QPoint pointInTopWidget = parentWidget()->mapTo(topLevelWidget(), pos());
|
||
switch (m_position) {
|
||
case Dock::Position::Left: {
|
||
pointInTopWidget.setX(topLevelWidget()->x() + topLevelWidget()->width());
|
||
pointInTopWidget.setY(pointInTopWidget.y() + height() / 2);
|
||
break;
|
||
}
|
||
case Dock::Position::Top: {
|
||
pointInTopWidget.setY(y() + topLevelWidget()->y() + topLevelWidget()->height());
|
||
pointInTopWidget.setX(pointInTopWidget.x() + width() / 2);
|
||
break;
|
||
}
|
||
case Dock::Position::Right: {
|
||
pointInTopWidget.setY(pointInTopWidget.y() + height() / 2);
|
||
pointInTopWidget.setX(pointInTopWidget.x() - width() / 2);
|
||
break;
|
||
}
|
||
case Dock::Position::Bottom: {
|
||
pointInTopWidget.setY(0);
|
||
pointInTopWidget.setX(pointInTopWidget.x() + width() / 2);
|
||
break;
|
||
}
|
||
}
|
||
return topLevelWidget()->mapToGlobal(pointInTopWidget);
|
||
}
|
||
|
||
QFont DateTimeDisplayer::timeFont() const
|
||
{
|
||
if (m_position == Dock::Position::Left || m_position == Dock::Position::Right)
|
||
return DFontSizeManager::instance()->t6();
|
||
|
||
// 如果是上下方向，且当前只有一行，则始终显示小号字体
|
||
if (m_oneRow)
|
||
return DFontSizeManager::instance()->t10();
|
||
|
||
static QList<QFont> dateFontSize = { DFontSizeManager::instance()->t10(),
|
||
DFontSizeManager::instance()->t9(),
|
||
DFontSizeManager::instance()->t8(),
|
||
DFontSizeManager::instance()->t7(),
|
||
DFontSizeManager::instance()->t6() };
|
||
|
||
#define MINHEIGHT 16
|
||
// 获取最低高度为16，找到对应的索引值
|
||
int index = qMin(qMax(static_cast<int>((rect().height() - MINHEIGHT) / 3), 0), dateFontSize.size() - 1);
|
||
return dateFontSize[index];
|
||
}
|
||
|
||
void DateTimeDisplayer::createMenuItem()
|
||
{
|
||
QAction *timeFormatAction = new QAction(this);
|
||
if (m_timedateInter->use24HourFormat())
|
||
timeFormatAction->setText(tr("12-hour time"));
|
||
else
|
||
timeFormatAction->setText(tr("24-hour time"));
|
||
|
||
connect(timeFormatAction, &QAction::triggered, this, [ = ] {
|
||
m_timedateInter->setUse24HourFormat(!m_timedateInter->use24HourFormat());
|
||
});
|
||
m_menu->addAction(timeFormatAction);
|
||
|
||
if (!QFile::exists(ICBC_CONF_FILE)) {
|
||
QAction *timeSettingAction = new QAction(tr("Time settings"), this);
|
||
connect(timeSettingAction, &QAction::triggered, this, [ = ] {
|
||
#ifdef USE_AM
|
||
DDBusSender()
|
||
.service("org.deepin.dde.ControlCenter1")
|
||
.interface("org.deepin.dde.ControlCenter1")
|
||
.path("/org/deepin/dde/ControlCenter1")
|
||
.method(QString("ShowPage"))
|
||
.arg(QString("datetime"))
|
||
.call();
|
||
#else
|
||
DDBusSender()
|
||
.service("com.deepin.dde.ControlCenter")
|
||
.interface("com.deepin.dde.ControlCenter")
|
||
.path("/com/deepin/dde/ControlCenter")
|
||
.method(QString("ShowPage"))
|
||
.arg(QString("datetime"))
|
||
.call();
|
||
#endif
|
||
});
|
||
|
||
m_menu->addAction(timeSettingAction);
|
||
}
|
||
}
|
||
|
||
void DateTimeDisplayer::enterEvent(QEvent *event)
|
||
{
|
||
Q_UNUSED(event);
|
||
m_tipPopupWindow->show(tipsPoint());
|
||
}
|
||
|
||
void DateTimeDisplayer::leaveEvent(QEvent *event)
|
||
{
|
||
Q_UNUSED(event);
|
||
m_tipPopupWindow->hide();
|
||
}
|
||
|
||
void DateTimeDisplayer::resizeEvent(QResizeEvent *event)
|
||
{
|
||
QWidget::resizeEvent(event);
|
||
|
||
int oldSize = m_currentSize;
|
||
m_currentSize = (m_position == Dock::Position::Top || m_position == Dock::Position::Bottom) ? width() : height();
|
||
if (oldSize != m_currentSize)
|
||
Q_EMIT requestUpdate();
|
||
}
|
||
|
||
void DateTimeDisplayer::updateLastData(const DateTimeInfo &info)
|
||
{
|
||
m_lastDateString = info.m_date;
|
||
m_lastTimeString = info.m_time;
|
||
QSize dateTimeSize = suitableSize();
|
||
if (m_position == Dock::Position::Top || m_position == Dock::Position::Bottom)
|
||
m_currentSize = dateTimeSize.width();
|
||
else
|
||
m_currentSize = dateTimeSize.height();
|
||
}
|
||
|
||
QString DateTimeDisplayer::getTimeString() const
|
||
{
|
||
return getTimeString(m_position);
|
||
}
|