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
110 lines
4.5 KiB
C++
110 lines
4.5 KiB
C++
/*
|
|
* Copyright (C) 2016 ~ 2018 Deepin Technology Co., Ltd.
|
|
*
|
|
* Author: sbw <sbw@sbw.so>
|
|
*
|
|
* Maintainer: sbw <sbw@sbw.so>
|
|
*
|
|
* 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 DBUSDOCKADAPTORS_H
|
|
#define DBUSDOCKADAPTORS_H
|
|
|
|
#include <QtDBus/QtDBus>
|
|
|
|
#include "mainwindow.h"
|
|
|
|
/*
|
|
* Adaptor class for interface com.deepin.dde.Dock
|
|
*/
|
|
class QGSettings;
|
|
class WindowManager;
|
|
|
|
class DBusDockAdaptors: public QDBusAbstractAdaptor
|
|
{
|
|
Q_OBJECT
|
|
Q_CLASSINFO("D-Bus Interface", "com.deepin.dde.Dock")
|
|
Q_CLASSINFO("D-Bus Introspection", ""
|
|
" <interface name=\"com.deepin.dde.Dock\">\n"
|
|
" <property access=\"read\" type=\"(iiii)\" name=\"geometry\"/>\n"
|
|
" <property access=\"readwrite\" type=\"b\" name=\"showInPrimary\"/>\n"
|
|
" <method name=\"callShow\"/>"
|
|
" <method name=\"ReloadPlugins\"/>"
|
|
" <method name=\"GetLoadedPlugins\">"
|
|
" <arg name=\"list\" type=\"as\" direction=\"out\"/>"
|
|
" </method>"
|
|
" <method name=\"resizeDock\">"
|
|
" <arg name=\"offset\" type=\"i\" direction=\"in\"/>"
|
|
" <arg name=\"dragging\" type=\"b\" direction=\"in\"/>"
|
|
" </method>"
|
|
" <method name=\"getPluginKey\">"
|
|
" <arg name=\"pluginName\" type=\"s\" direction=\"in\"/>"
|
|
" <arg name=\"key\" type=\"s\" direction=\"out\"/>"
|
|
" </method>"
|
|
" <method name=\"getPluginVisible\">"
|
|
" <arg name=\"pluginName\" type=\"s\" direction=\"in\"/>"
|
|
" <arg name=\"visible\" type=\"b\" direction=\"out\"/>"
|
|
" </method>"
|
|
" <method name=\"setPluginVisible\">"
|
|
" <arg name=\"pluginName\" type=\"s\" direction=\"in\"/>"
|
|
" <arg name=\"visible\" type=\"b\" direction=\"in\"/>"
|
|
" </method>"
|
|
" <signal name=\"pluginVisibleChanged\">"
|
|
" <arg type=\"s\"/>"
|
|
" <arg type=\"b\"/>"
|
|
" </signal>"
|
|
" </interface>\n"
|
|
"")
|
|
Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged)
|
|
Q_PROPERTY(bool showInPrimary READ showInPrimary WRITE setShowInPrimary NOTIFY showInPrimaryChanged)
|
|
|
|
public:
|
|
explicit DBusDockAdaptors(WindowManager *parent);
|
|
virtual ~DBusDockAdaptors();
|
|
|
|
public Q_SLOTS: // METHODS
|
|
void callShow();
|
|
void ReloadPlugins();
|
|
|
|
QStringList GetLoadedPlugins();
|
|
|
|
void resizeDock(int offset, bool dragging);
|
|
|
|
QString getPluginKey(const QString &pluginName);
|
|
|
|
bool getPluginVisible(const QString &pluginName);
|
|
void setPluginVisible(const QString &pluginName, bool visible);
|
|
|
|
public: // PROPERTIES
|
|
QRect geometry() const;
|
|
|
|
bool showInPrimary() const;
|
|
void setShowInPrimary(bool showInPrimary);
|
|
|
|
signals:
|
|
void geometryChanged(QRect geometry);
|
|
void showInPrimaryChanged(bool);
|
|
void pluginVisibleChanged(const QString &pluginName, bool visible);
|
|
|
|
private:
|
|
bool isPluginValid(const QString &name);
|
|
|
|
private:
|
|
QGSettings *m_gsettings;
|
|
WindowManager *m_windowManager;
|
|
};
|
|
|
|
#endif //DBUSDOCKADAPTORS
|