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
105 lines
3.0 KiB
C++
105 lines
3.0 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 TRAYMANAGERWINDOW_H
|
|
#define TRAYMANAGERWINDOW_H
|
|
|
|
#include "constants.h"
|
|
#include "dbusutil.h"
|
|
|
|
#include <QWidget>
|
|
|
|
#include <com_deepin_daemon_timedate.h>
|
|
|
|
namespace Dtk { namespace Gui { class DRegionMonitor; };
|
|
namespace Widget { class DBlurEffectWidget; } }
|
|
|
|
using namespace Dtk::Widget;
|
|
|
|
using Timedate = com::deepin::daemon::Timedate;
|
|
|
|
class QuickPluginWindow;
|
|
class QBoxLayout;
|
|
class TrayGridView;
|
|
class TrayModel;
|
|
class TrayDelegate;
|
|
class SystemPluginWindow;
|
|
class QLabel;
|
|
class QDropEvent;
|
|
class DateTimeDisplayer;
|
|
class QPainterPath;
|
|
|
|
class TrayManagerWindow : public QWidget
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit TrayManagerWindow(QWidget *parent = nullptr);
|
|
~TrayManagerWindow() override;
|
|
|
|
void updateBorderRadius(int borderRadius);
|
|
void updateLayout();
|
|
void setPositon(Dock::Position position);
|
|
QSize suitableSize() const;
|
|
QSize suitableSize(const Dock::Position &position) const;
|
|
|
|
Q_SIGNALS:
|
|
void requestUpdate();
|
|
|
|
protected:
|
|
void resizeEvent(QResizeEvent *event) override;
|
|
void dragEnterEvent(QDragEnterEvent *e) override;
|
|
void dragMoveEvent(QDragMoveEvent *e) override;
|
|
void dropEvent(QDropEvent *e) override;
|
|
void dragLeaveEvent(QDragLeaveEvent *event) override;
|
|
void paintEvent(QPaintEvent *event) override;
|
|
|
|
private:
|
|
void initUi();
|
|
void initConnection();
|
|
|
|
void resetChildWidgetSize();
|
|
void resetMultiDirection();
|
|
void resetSingleDirection();
|
|
QColor maskColor(uint8_t alpha) const;
|
|
|
|
int appDatetimeSize(const Dock::Position &position) const;
|
|
QPainterPath roundedPaths();
|
|
|
|
private:
|
|
QWidget *m_appPluginDatetimeWidget;
|
|
SystemPluginWindow *m_systemPluginWidget;
|
|
QWidget *m_appPluginWidget;
|
|
QuickPluginWindow *m_quickIconWidget;
|
|
DateTimeDisplayer *m_dateTimeWidget;
|
|
QBoxLayout *m_appPluginLayout;
|
|
QBoxLayout *m_mainLayout;
|
|
TrayGridView *m_trayView;
|
|
TrayModel *m_model;
|
|
TrayDelegate *m_delegate;
|
|
Dock::Position m_position;
|
|
QLabel *m_splitLine;
|
|
DockInter *m_dockInter;
|
|
bool m_singleShow; // 用于记录当前日期时间和插件区域是显示一行还是显示多行
|
|
int m_borderRadius; // 圆角的值
|
|
};
|
|
|
|
#endif // PLUGINWINDOW_H
|