Skip to content

click the tray icon to pop up the menu #1640

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
hantengc wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −7
Open

click the tray icon to pop up the menu #1640

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
6 changes: 2 additions & 4 deletions src/modules/notificationitem/notificationitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ class StatusNotifierItem : public dbus::ObjectVTable<StatusNotifierItem> {
deltaAcc_ += 120;
}
}
void activate(int /*unused*/, int /*unused*/) {
parent_->instance()->toggle();
}
void activate(int /*unused*/, int /*unused*/) {}
void secondaryActivate(int /*unused*/, int /*unused*/) {}
std::string keyboardIconName() const {
if (isKDE()) {
Expand Down Expand Up @@ -270,7 +268,7 @@ class StatusNotifierItem : public dbus::ObjectVTable<StatusNotifierItem> {
FCITX_OBJECT_VTABLE_PROPERTY(tooltip, "ToolTip", "(sa(iiay)ss)",
[this]() { return tooltip(); });
FCITX_OBJECT_VTABLE_PROPERTY(itemIsMenu, "ItemIsMenu", "b",
[]() { return false; });
[]() { return true; });
FCITX_OBJECT_VTABLE_PROPERTY(menu, "Menu", "o",
[]() { return dbus::ObjectPath("/MenuBar"); });
FCITX_OBJECT_VTABLE_PROPERTY(iconThemePath, "IconThemePath", "s",
Expand Down
5 changes: 2 additions & 3 deletions src/ui/classic/xcbtraywindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,14 @@ bool XCBTrayWindow::filterEvent(xcb_generic_event_t *event) {
case XCB_BUTTON_PRESS: {
auto *press = reinterpret_cast<xcb_button_press_event_t *>(event);
if (press->event == wid_) {
if (press->detail == XCB_BUTTON_INDEX_3) {
if (press->detail == XCB_BUTTON_INDEX_1 ||
press->detail == XCB_BUTTON_INDEX_3) {
updateMenu();
XCBMenu *menu = menuPool_.requestMenu(ui_, &menu_, nullptr);
menu->show(Rect()
.setPosition(press->root_x, press->root_y)
.setSize(1, 1),
ConstrainAdjustment::Flip);
} else if (press->detail == XCB_BUTTON_INDEX_1) {
ui_->parent()->instance()->toggle();
}
return true;
}
Expand Down
Loading