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
98 lines
3.1 KiB
C++
98 lines
3.1 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 WINDOWMANAGER_H
|
|
#define WINDOWMANAGER_H
|
|
|
|
#include "constants.h"
|
|
#include "statusnotifierwatcher_interface.h"
|
|
|
|
#include <QObject>
|
|
|
|
namespace Dtk {namespace Gui { class DWindowManagerHelper; }}
|
|
|
|
class MainWindowBase;
|
|
class MainWindow;
|
|
class TrayMainWindow;
|
|
class MultiScreenWorker;
|
|
class MenuWorker;
|
|
class QDBusConnectionInterface;
|
|
|
|
using namespace Dtk::Gui;
|
|
|
|
class WindowManager : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit WindowManager(MultiScreenWorker *multiScreenWorker, QObject *parent = nullptr);
|
|
~WindowManager() override;
|
|
|
|
void addWindow(MainWindowBase *window);
|
|
void launch();
|
|
void sendNotifications();
|
|
void callShow();
|
|
void resizeDock(int offset, bool dragging);
|
|
QRect geometry() const;
|
|
|
|
Q_SIGNALS:
|
|
void panelGeometryChanged();
|
|
|
|
private:
|
|
void initConnection();
|
|
void initSNIHost();
|
|
void initMember();
|
|
void updateMainGeometry(const Dock::HideState &hideState);
|
|
QParallelAnimationGroup *createAnimationGroup(const Dock::AniAction &aniAction, const QString &screenName, const Dock::Position &position) const;
|
|
|
|
void showAniFinish();
|
|
void hideAniFinish();
|
|
QRect getDockGeometry(bool withoutScale = false) const; // 计算左右侧加起来的区域大小
|
|
|
|
void RegisterDdeSession();
|
|
|
|
private Q_SLOTS:
|
|
void onRequestUpdate(); // 调整尺寸的时候
|
|
|
|
void onUpdateDockGeometry(const Dock::HideMode &hideMode);
|
|
void onPositionChanged(const Dock::Position &position);
|
|
void onDisplayModeChanged(const Dock::DisplayMode &displayMode);
|
|
|
|
void onDbusNameOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);
|
|
|
|
void onPlayAnimation(const QString &screenName, const Dock::Position &pos, Dock::AniAction act, bool containMouse = false, bool updatePos = false);
|
|
void onChangeDockPosition(QString fromScreen, QString toScreen, const Dock::Position &fromPos, const Dock::Position &toPos);
|
|
void onRequestUpdateFrontendGeometry();
|
|
void onRequestNotifyWindowManager();
|
|
|
|
private:
|
|
MultiScreenWorker *m_multiScreenWorker;
|
|
QString m_sniHostService;
|
|
|
|
Dock::DisplayMode m_displayMode;
|
|
Dock::Position m_position;
|
|
|
|
QDBusConnectionInterface *m_dbusDaemonInterface;
|
|
org::kde::StatusNotifierWatcher *m_sniWatcher; // DBUS状态通知
|
|
QList<MainWindowBase *> m_topWindows;
|
|
};
|
|
|
|
#endif // WINDOWMANAGER_H
|