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

Revert "feat: 解决点击企业微信无法显示窗口的问题"

Browse Source 
This reverts commit 3a6ae9456f4c5c73d3a0ab8279f29f550725d5da.

Change-Id: I7aaaea6253caff2c398b5dbfcfdb7a2513c4e69b
This commit is contained in:
songwentao 2021-11-19 16:06:01 +08:00
parent 055b5b342e
commit 2ebc719c3e
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/tray/xembedtraywidget.cpp
View File

@ -152,8 +152,13 @@ void XEmbedTrayWidget::paintEvent(QPaintEvent *e)
void XEmbedTrayWidget::mousePressEvent(QMouseEvent *e)
{
m_startPos = e->pos();
AbstractTrayWidget::mousePressEvent(e);
if (e->source() == Qt::MouseEventSynthesizedByQt) {
// 右键-出现
m_startPos = e->pos();
sendClick(XCB_BUTTON_INDEX_3, QCursor::pos().x(), QCursor::pos().y());
}
}
void XEmbedTrayWidget::mouseMoveEvent(QMouseEvent *e)
@ -173,18 +178,8 @@ void XEmbedTrayWidget::mouseMoveEvent(QMouseEvent *e)
void XEmbedTrayWidget::mouseReleaseEvent(QMouseEvent *e)
{
// 触摸按下且长按
if (e->source() == Qt::MouseEventSynthesizedByQt && m_longPress)
return;
AbstractTrayWidget::mouseReleaseEvent(e);
}
void XEmbedTrayWidget::contextMenuEvent(QContextMenuEvent *event)
{
Q_UNUSED(event);
sendClick(XCB_BUTTON_INDEX_3, QCursor::pos().x(), QCursor::pos().y());
// 鼠标释放事件不往父类传递
QWidget::mouseReleaseEvent(e);
}
void XEmbedTrayWidget::configContainerPosition()

1
plugins/tray/xembedtraywidget.h
View File

@ -56,7 +56,6 @@ private:
void mousePressEvent(QMouseEvent *e) override;
void mouseMoveEvent(QMouseEvent *e) override;
void mouseReleaseEvent(QMouseEvent *e) override;
void contextMenuEvent(QContextMenuEvent *event) override;
void configContainerPosition();
void wrapWindow();