Don't show empty context menu.
This commit is contained in:
parent
8d4a658d0b
commit
c313cfb4ec
|
@ -4454,12 +4454,16 @@ bool OverlayWidget::handleContextMenu(std::optional<QPoint> position) {
|
||||||
const style::icon *icon) {
|
const style::icon *icon) {
|
||||||
_menu->addAction(text, std::move(handler), icon);
|
_menu->addAction(text, std::move(handler), icon);
|
||||||
});
|
});
|
||||||
_menu->setDestroyedCallback(crl::guard(_widget, [=] {
|
if (_menu->empty()) {
|
||||||
activateControls();
|
_menu = nullptr;
|
||||||
_receiveMouse = false;
|
} else {
|
||||||
InvokeQueued(_widget, [=] { receiveMouse(); });
|
_menu->setDestroyedCallback(crl::guard(_widget, [=] {
|
||||||
}));
|
activateControls();
|
||||||
_menu->popup(QCursor::pos());
|
_receiveMouse = false;
|
||||||
|
InvokeQueued(_widget, [=] { receiveMouse(); });
|
||||||
|
}));
|
||||||
|
_menu->popup(QCursor::pos());
|
||||||
|
}
|
||||||
activateControls();
|
activateControls();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue