mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-03 00:15:21 +00:00

原来的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
114 lines
2.5 KiB
C++
114 lines
2.5 KiB
C++
/*
|
|
* Copyright (C) 2011 ~ 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 CONSTANTS_H
|
|
#define CONSTANTS_H
|
|
|
|
#include <QtCore>
|
|
|
|
namespace Dock {
|
|
|
|
#define DOCK_PLUGIN_MIME "dock/plugin"
|
|
#define DOCK_PLUGIN_API_VERSION "2.0.0"
|
|
|
|
#define PROP_DISPLAY_MODE "DisplayMode"
|
|
|
|
#define PLUGIN_BACKGROUND_MAX_SIZE 40
|
|
#define PLUGIN_BACKGROUND_MIN_SIZE 20
|
|
|
|
#define PLUGIN_ICON_MAX_SIZE 20
|
|
#define PLUGIN_ITEM_WIDTH 300
|
|
|
|
// 需求变更成插件图标始终保持20x20,但16x16的资源还在。所以暂时保留此宏
|
|
#define PLUGIN_ICON_MIN_SIZE 20
|
|
|
|
// 插件最小尺寸,图标采用深色
|
|
#define PLUGIN_MIN_ICON_NAME "-dark"
|
|
|
|
// dock最小尺寸
|
|
#define DOCK_MIN_SIZE 40
|
|
// dock最大尺寸
|
|
#define DOCK_MAX_SIZE 100
|
|
///
|
|
/// \brief The DisplayMode enum
|
|
/// spec dock display mode
|
|
///
|
|
enum DisplayMode {
|
|
Fashion = 0,
|
|
Efficient = 1,
|
|
// deprecreated
|
|
// Classic = 2,
|
|
};
|
|
|
|
#define PROP_HIDE_MODE "HideMode"
|
|
///
|
|
/// \brief The HideMode enum
|
|
/// spec dock hide behavior
|
|
///
|
|
enum HideMode {
|
|
KeepShowing = 0,
|
|
KeepHidden = 1,
|
|
#ifdef USE_AM
|
|
SmartHide = 2,
|
|
#else
|
|
SmartHide = 3,
|
|
#endif
|
|
};
|
|
|
|
#define PROP_POSITION "Position"
|
|
///
|
|
/// \brief The Position enum
|
|
/// spec dock position, dock always placed at primary screen,
|
|
/// so all position is the primary screen edge.
|
|
///
|
|
enum Position {
|
|
Top = 0,
|
|
Right = 1,
|
|
Bottom = 2,
|
|
Left = 3,
|
|
};
|
|
|
|
#define PROP_HIDE_STATE "HideState"
|
|
///
|
|
/// \brief The HideState enum
|
|
/// spec current dock should hide or shown.
|
|
/// this argument works only HideMode is SmartHide
|
|
///
|
|
enum HideState {
|
|
Unknown = 0,
|
|
Show = 1,
|
|
Hide = 2,
|
|
};
|
|
|
|
enum class AniAction {
|
|
Show = 0,
|
|
Hide
|
|
};
|
|
|
|
#define IS_TOUCH_STATE "isTouchState"
|
|
|
|
}
|
|
|
|
Q_DECLARE_METATYPE(Dock::DisplayMode)
|
|
Q_DECLARE_METATYPE(Dock::Position)
|
|
|
|
#endif // CONSTANTS_H
|