diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-03-17 07:48:50 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-03-17 07:48:50 +0100 |
| commit | 919dea0de60d058f57a4b9bd1e5f4513a014c693 (patch) | |
| tree | 065f1cf2a778448bfc5396c6fe333d3a2fde09a2 | |
| parent | c33e5ca62e57c16bf60ca294b3edc437fd35ba44 (diff) | |
| download | MultiMC-919dea0de60d058f57a4b9bd1e5f4513a014c693.tar MultiMC-919dea0de60d058f57a4b9bd1e5f4513a014c693.tar.gz MultiMC-919dea0de60d058f57a4b9bd1e5f4513a014c693.tar.lz MultiMC-919dea0de60d058f57a4b9bd1e5f4513a014c693.tar.xz MultiMC-919dea0de60d058f57a4b9bd1e5f4513a014c693.zip | |
Revert "Better right-click behaviour, context menu on mouse-up instead of mouse down"
This reverts commit 00a945d84b59d6469e0c85335dc0ad4067d9f2ab.
NOPE.
| -rw-r--r-- | gui/MainWindow.cpp | 2 | ||||
| -rw-r--r-- | gui/groupview/GroupView.cpp | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 3ab93ba9..17d4630b 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -177,7 +177,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi view->setFrameShape(QFrame::NoFrame); view->setModel(proxymodel); - //view->setContextMenuPolicy(Qt::CustomContextMenu); + view->setContextMenuPolicy(Qt::CustomContextMenu); connect(view, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(showInstanceContextMenu(const QPoint &))); diff --git a/gui/groupview/GroupView.cpp b/gui/groupview/GroupView.cpp index 342e2523..b650efee 100644 --- a/gui/groupview/GroupView.cpp +++ b/gui/groupview/GroupView.cpp @@ -380,14 +380,6 @@ void GroupView::mouseReleaseEvent(QMouseEvent *event) bool click = (index == m_pressedIndex && index.isValid()) || (m_pressedCategory && m_pressedCategory == categoryAt(geometryPos)); - bool isRight = event->button() == Qt::RightButton; - - if((index == m_pressedIndex && index.isValid()) && isRight) - { - emit customContextMenuRequested(event->pos()); - return; - } - if (click && m_pressedCategory) { if (state() == ExpandingState) |