Skip to content

fix: 点击托盘企业微信图标，无反应 #766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chao0903 wants to merge 1 commit into
base: release/5.4.4
Choose a base branch
from
Open

fix: 点击托盘企业微信图标，无反应 #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions frame/item/appitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,8 @@ QPoint AppItem::appIconPosition() const

void AppItem::updateWindowInfos(const WindowInfoMap &info)
{
if (info.size() <= 0)
return;
m_windowInfos = info;
m_currentWindowId = info.firstKey();
if (m_appPreviewTips)
Expand Down
6 changes: 3 additions & 3 deletions plugins/tray/xembedtraywidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ void XEmbedTrayWidget::sendClick(uint8_t mouseButton, int x, int y)
return;

m_sendHoverEvent->stop();
auto c = QX11Info::connection();
auto c = IS_WAYLAND_DISPLAY ? m_xcbCnn :QX11Info::connection();
if (!c) {
qWarning() << "QX11Info::connection() is " << c;
return;
Expand All @@ -379,7 +379,7 @@ void XEmbedTrayWidget::sendClick(uint8_t mouseButton, int x, int y)

Display *display = IS_WAYLAND_DISPLAY ? m_display : QX11Info::display();

if (m_injectMode == XTest) {
if (m_injectMode == XTest || IS_WAYLAND_DISPLAY) {
XTestFakeMotionEvent(display, 0, p.x(), p.y(), CurrentTime);
XFlush(display);
XTestFakeButtonEvent(display, mouseButton, true, CurrentTime);
Expand Down Expand Up @@ -661,4 +661,4 @@ uint XEmbedTrayWidget::getWindowPID(uint winId)
XCloseDisplay(display);

return pid;
}
}