Commit e61588a5 authored by Jekyll Wu's avatar Jekyll Wu
Browse files

Remove the #ifdef for working around contextMenuEvent on Mac OS X

The code within contextMenuEvent() works correctly on Mac OS X
now.

This effectively reverts commit 683566ce
parent b464d031
......@@ -2797,14 +2797,10 @@ bool TerminalDisplay::event(QEvent* event)
void TerminalDisplay::contextMenuEvent(QContextMenuEvent* event)
{
// FIXME: On Mac OSX opening some dialogs cause the context menu to
// get displayed. Example: Scrollback dialog via context menu.
#if !defined(Q_OS_MAC)
// the logic for the mouse case is within MousePressEvent()
if (event->reason() != QContextMenuEvent::Mouse) {
emit configureRequest(mapFromGlobal(QCursor::pos()));
}
#endif
}
/* --------------------------------------------------------------------- */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment