mirror of
https://github.com/linuxdeepin/dde-dock.git
synced 2025-06-04 09:23:03 +00:00
fix: 触屏需要屏蔽hover效果
之前需求里面没有说明,没有特意做相关的屏蔽操作,导致触屏也会出现hover效果 Log: 屏蔽任务栏触屏hover效果 Bug: https://pms.uniontech.com/zentao/bug-view-46245.html Change-Id: I7a1ff66faea486a4946a5ab77d9e7ac6ae663fcd Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/3942 Reviewed-by: <mailman@uniontech.com> Reviewed-by: wangwei <wangwei@uniontech.com> Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com> Tested-by: <mailman@uniontech.com>
This commit is contained in:
parent
36e27cdd5a
commit
e1ad39dad6
@ -182,7 +182,11 @@ void DockItem::enterEvent(QEvent *e)
|
|||||||
m_hover = true;
|
m_hover = true;
|
||||||
//FIXME: 可能是qt的bug,概率性导致崩溃,待修复
|
//FIXME: 可能是qt的bug,概率性导致崩溃,待修复
|
||||||
// m_hoverEffect->setHighlighting(true);
|
// m_hoverEffect->setHighlighting(true);
|
||||||
m_popupTipsDelayTimer->start();
|
|
||||||
|
// 触屏不显示hover效果
|
||||||
|
if (!qApp->property(IS_TOUCH_STATE).toBool()) {
|
||||||
|
m_popupTipsDelayTimer->start();
|
||||||
|
}
|
||||||
|
|
||||||
update();
|
update();
|
||||||
|
|
||||||
|
@ -23,13 +23,13 @@
|
|||||||
#include "window/accessible.h"
|
#include "window/accessible.h"
|
||||||
#include "util/themeappicon.h"
|
#include "util/themeappicon.h"
|
||||||
#include "controller/dockitemmanager.h"
|
#include "controller/dockitemmanager.h"
|
||||||
|
#include "util/dockapplication.h"
|
||||||
|
|
||||||
#include <QAccessible>
|
#include <QAccessible>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
#include <QStandardPaths>
|
#include <QStandardPaths>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
|
|
||||||
#include <DApplication>
|
|
||||||
#include <DLog>
|
#include <DLog>
|
||||||
#include <DDBusSender>
|
#include <DDBusSender>
|
||||||
#include <DGuiApplicationHelper>
|
#include <DGuiApplicationHelper>
|
||||||
@ -185,7 +185,7 @@ void sig_crash(int sig)
|
|||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
DGuiApplicationHelper::setUseInactiveColorGroup(false);
|
DGuiApplicationHelper::setUseInactiveColorGroup(false);
|
||||||
DApplication app(argc, argv);
|
DockApplication app(argc, argv);
|
||||||
|
|
||||||
//崩溃信号
|
//崩溃信号
|
||||||
signal(SIGTERM, sig_crash);
|
signal(SIGTERM, sig_crash);
|
||||||
|
19
frame/util/dockapplication.cpp
Normal file
19
frame/util/dockapplication.cpp
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
#include "dockapplication.h"
|
||||||
|
#include "constants.h"
|
||||||
|
|
||||||
|
#include <QMouseEvent>
|
||||||
|
|
||||||
|
DockApplication::DockApplication(int &argc, char **argv) : DApplication (argc, argv)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DockApplication::notify(QObject *obj, QEvent *event)
|
||||||
|
{
|
||||||
|
QMouseEvent *mouseEvent = dynamic_cast<QMouseEvent *>(event);
|
||||||
|
if (mouseEvent) {
|
||||||
|
// 鼠标事件可以通过source函数确定是否触屏事件,并将结果写入qApp的动态属性中
|
||||||
|
qApp->setProperty(IS_TOUCH_STATE, (mouseEvent->source() == Qt::MouseEventSynthesizedByQt));
|
||||||
|
}
|
||||||
|
|
||||||
|
return DApplication::notify(obj, event);
|
||||||
|
}
|
50
frame/util/dockapplication.h
Normal file
50
frame/util/dockapplication.h
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 ~ 2028 Uniontech Technology Co., Ltd.
|
||||||
|
*
|
||||||
|
* Author: liuxing <liuxing@uniontech.com>
|
||||||
|
*
|
||||||
|
* Maintainer: liuxing <liuxing@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 DOCKAPPLICATION_H
|
||||||
|
#define DOCKAPPLICATION_H
|
||||||
|
|
||||||
|
#include <DApplication>
|
||||||
|
|
||||||
|
DWIDGET_USE_NAMESPACE
|
||||||
|
#ifdef DCORE_NAMESPACE
|
||||||
|
DCORE_USE_NAMESPACE
|
||||||
|
#else
|
||||||
|
DUTIL_USE_NAMESPACE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief The DockApplication class
|
||||||
|
* 本类通过重写application的notify函数监控应用的鼠标事件,判断是否为触屏状态
|
||||||
|
*/
|
||||||
|
class DockApplication : public DApplication
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
explicit DockApplication(int &argc, char **argv);
|
||||||
|
virtual bool notify(QObject *obj, QEvent *event) override;
|
||||||
|
|
||||||
|
signals:
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // DOCKAPPLICATION_H
|
@ -91,6 +91,8 @@ enum HideState {
|
|||||||
Hide = 2,
|
Hide = 2,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define IS_TOUCH_STATE "isTouchState"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Q_DECLARE_METATYPE(Dock::DisplayMode)
|
Q_DECLARE_METATYPE(Dock::DisplayMode)
|
||||||
|
@ -566,7 +566,10 @@ QPixmap SNITrayWidget::newIconPixmap(IconType iconType)
|
|||||||
|
|
||||||
void SNITrayWidget::enterEvent(QEvent *event)
|
void SNITrayWidget::enterEvent(QEvent *event)
|
||||||
{
|
{
|
||||||
m_popupTipsDelayTimer->start();
|
// 触屏不显示hover效果
|
||||||
|
if (!qApp->property(IS_TOUCH_STATE).toBool()) {
|
||||||
|
m_popupTipsDelayTimer->start();
|
||||||
|
}
|
||||||
|
|
||||||
AbstractTrayWidget::enterEvent(event);
|
AbstractTrayWidget::enterEvent(event);
|
||||||
}
|
}
|
||||||
|
@ -206,7 +206,10 @@ void SystemTrayItem::enterEvent(QEvent *event)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_popupTipsDelayTimer->start();
|
// 触屏不显示hover效果
|
||||||
|
if (!qApp->property(IS_TOUCH_STATE).toBool()) {
|
||||||
|
m_popupTipsDelayTimer->start();
|
||||||
|
}
|
||||||
update();
|
update();
|
||||||
|
|
||||||
AbstractTrayWidget::enterEvent(event);
|
AbstractTrayWidget::enterEvent(event);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user