Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 修改代码结构，方便做单元测试

Browse Source 
修改代码结构，方便做单元测试

Log:
Change-Id: Icf50804d1e94c64c932583812310103f50e5c0cc
This commit is contained in:
范朋程 2021-03-05 14:26:28 +08:00 committed by fanpengcheng
parent d330600907
commit c45b917a64
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frame/controller/dockitemmanager.cpp
View File

@ -95,6 +95,11 @@ bool DockItemManager::appIsOnDock(const QString &appDesktop) const
void DockItemManager::startLoadPlugins() const void DockItemManager::startLoadPlugins() const
{ {
if (!QGSettings::isSchemaInstalled("com.deepin.dde.dock")) {
qWarning("com.deepin.dde.dock is not installed");
return;
}
QGSettings gsetting("com.deepin.dde.dock", "/com/deepin/dde/dock/"); QGSettings gsetting("com.deepin.dde.dock", "/com/deepin/dde/dock/");
QTimer::singleShot(gsetting.get("delay-plugins-time").toUInt(), m_pluginsInter, &DockPluginsController::startLoader); QTimer::singleShot(gsetting.get("delay-plugins-time").toUInt(), m_pluginsInter, &DockPluginsController::startLoader);

29
frame/item/components/appdragwidget.cpp
View File

@ -197,7 +197,7 @@ void AppDragWidget::dropEvent(QDropEvent *event)
m_followMouseTimer->stop(); m_followMouseTimer->stop();
m_bDragDrop = false; m_bDragDrop = false;
if (isRemoveAble()) { if (isRemoveAble(QCursor::pos())) {
if (DWindowManagerHelper::instance()->hasComposite()) { if (DWindowManagerHelper::instance()->hasComposite()) {
showRemoveAnimation(); showRemoveAnimation();
} else { } else {
@ -270,19 +270,12 @@ void AppDragWidget::initAnimations()
void AppDragWidget::initConfigurations() void AppDragWidget::initConfigurations()
{ {
const QString &cschema = "com.deepin.dde.dock.distancemultiple"; if (QGSettings::isSchemaInstalled("com.deepin.dde.dock.distancemultiple")) {
const QString &cpath = "/com/deepin/dde/dock/distancemultiple/"; QGSettings gsetting("com.deepin.dde.dock.distancemultiple", "/com/deepin/dde/dock/distancemultiple/");
m_distanceMultiple = gsetting.get("distance-multiple").toDouble();
const QByteArray &schema_id { } else {
cschema.toUtf8() m_distanceMultiple = 1.5;
}; }
const QByteArray &path_id {
cpath.toUtf8()
};
QGSettings gsetting(schema_id, path_id);
m_distanceMultiple = gsetting.get("distance-multiple").toDouble();
} }
void AppDragWidget::showRemoveAnimation() void AppDragWidget::showRemoveAnimation()
@ -312,13 +305,13 @@ void AppDragWidget::onRemoveAnimationStateChanged(QAbstractAnimation::State newS
/** /**
* @brief 判断图标拖到一定高度后是否可以移除 * @brief 判断图标拖到一定高度后是否可以移除
* * @param curPos 当前鼠标所在位置
* @return true * @return true
* @return false * @return false
*/ */
bool AppDragWidget::isRemoveAble() bool AppDragWidget::isRemoveAble(const QPoint &curPos)
{ {
const QPoint &p = QCursor::pos(); const QPoint &p = curPos;
switch (m_dockPosition) { switch (m_dockPosition) {
case Dock::Position::Left: case Dock::Position::Left:
if ((p.x() - m_dockGeometry.topRight().x()) > (m_dockGeometry.width() * m_distanceMultiple)) { if ((p.x() - m_dockGeometry.topRight().x()) > (m_dockGeometry.width() * m_distanceMultiple)) {
@ -394,7 +387,7 @@ void AppDragWidget::showRemoveTips()
Dock::Position pos = Dock::Position::Bottom; Dock::Position pos = Dock::Position::Bottom;
DockPopupWindow *popup = m_popupWindow; DockPopupWindow *popup = m_popupWindow;
if (isRemoveAble()) { if (isRemoveAble(QCursor::pos())) {
QWidget *lastContent = popup->getContent(); QWidget *lastContent = popup->getContent();
if (lastContent) if (lastContent)
lastContent->setVisible(false); lastContent->setVisible(false);

2
frame/item/components/appdragwidget.h
View File

@ -47,7 +47,7 @@ public:
void setAppPixmap(const QPixmap &pix); void setAppPixmap(const QPixmap &pix);
void setDockInfo(Dock::Position dockPosition, const QRect &dockGeometry); void setDockInfo(Dock::Position dockPosition, const QRect &dockGeometry);
void setOriginPos(const QPoint position); void setOriginPos(const QPoint position);
bool isRemoveAble(); bool isRemoveAble(const QPoint &curPos);
signals: signals:
void requestRemoveItem(); void requestRemoveItem();