mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-04 09:23:03 +00:00
5e4c288cea
原因：在切换模式的时候，需要重新计算任务栏的大小，但是由于时尚模式和高效模式下的尺寸不一样，所以在计算图标的时候会以切换之前的尺寸为参考来进行计算，导致计算的结果错误 修复：在切换模式的时候，提前设置任务栏的尺寸（上下为高度，左右为宽度），这样在下次计算图标的时候获取到的尺寸始终是以正确的尺寸进行计算，任务栏显示正常 Log: 修复智能隐藏下切换模式显示错乱 Influence: 任务栏设置为智能隐藏，从高效模式切换到时尚模式，观察任务栏显示是否正常 Bug: https://pms.uniontech.com/bug-view-176321.html Change-Id: Ia66cb3e96d4f42c42acc921315e9457d582a82c1
104 lines
2.9 KiB
C++
104 lines
2.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/>.
|
|
*/
|
|
#ifndef DATETIMEDISPLAYER_H
|
|
#define DATETIMEDISPLAYER_H
|
|
|
|
#include "constants.h"
|
|
|
|
#include "org_deepin_dde_timedate1.h"
|
|
|
|
#include <QWidget>
|
|
#include <QFont>
|
|
|
|
namespace Dock { class TipsWidget; }
|
|
|
|
class DockPopupWindow;
|
|
class QMenu;
|
|
|
|
using Timedate = org::deepin::dde::Timedate1;
|
|
|
|
class DateTimeDisplayer : public QWidget
|
|
{
|
|
Q_OBJECT
|
|
|
|
private:
|
|
struct DateTimeInfo {
|
|
QString m_time;
|
|
QString m_date;
|
|
QRect m_timeRect;
|
|
QRect m_dateRect;
|
|
};
|
|
|
|
public:
|
|
explicit DateTimeDisplayer(bool showMultiRow, QWidget *parent = nullptr);
|
|
~DateTimeDisplayer() override;
|
|
void setPositon(Dock::Position position);
|
|
void setOneRow(bool oneRow);
|
|
QSize suitableSize() const;
|
|
QSize suitableSize(const Dock::Position &position) const;
|
|
|
|
Q_SIGNALS:
|
|
void requestUpdate(); // 当日期时间格式发生变化的时候，需要通知外面来更新窗口尺寸
|
|
|
|
protected:
|
|
void mousePressEvent(QMouseEvent *event) override;
|
|
void mouseReleaseEvent(QMouseEvent *event) override;
|
|
void paintEvent(QPaintEvent *e) override;
|
|
void enterEvent(QEvent *event) override;
|
|
void leaveEvent(QEvent *event) override;
|
|
|
|
private:
|
|
void updatePolicy();
|
|
DateTimeInfo dateTimeInfo(const Dock::Position &position) const;
|
|
void updateLastData(const DateTimeInfo &info);
|
|
|
|
QString getTimeString() const;
|
|
QString getTimeString(const Dock::Position &position) const;
|
|
QString getDateString() const;
|
|
QString getDateString(const Dock::Position &position) const;
|
|
|
|
QPoint tipsPoint() const;
|
|
QFont timeFont() const;
|
|
|
|
void createMenuItem();
|
|
QRect textRect(const QRect &sourceRect) const;
|
|
|
|
private Q_SLOTS:
|
|
void onTimeChanged();
|
|
void onDateTimeFormatChanged();
|
|
|
|
private:
|
|
Timedate *m_timedateInter;
|
|
Dock::Position m_position;
|
|
QFont m_dateFont;
|
|
Dock::TipsWidget *m_tipsWidget;
|
|
QMenu *m_menu;
|
|
QSharedPointer<DockPopupWindow> m_tipPopupWindow;
|
|
QTimer *m_tipsTimer;
|
|
QString m_lastDateString;
|
|
QString m_lastTimeString;
|
|
int m_currentSize;
|
|
bool m_oneRow;
|
|
bool m_showMultiRow;
|
|
};
|
|
|
|
#endif // DATETIMEDISPLAYER_H
|