Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of newgeom:newgeom
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_ViewWindow.cpp
diff --git
a/src/XGUI/XGUI_ViewWindow.cpp
b/src/XGUI/XGUI_ViewWindow.cpp
index 328b293061656ab1535535b6490e27dab22ab057..5a1a9ba4097ed64aeef7c13082fce24c09e0f8ae 100644
(file)
--- a/
src/XGUI/XGUI_ViewWindow.cpp
+++ b/
src/XGUI/XGUI_ViewWindow.cpp
@@
-679,8
+679,11
@@
void XGUI_ViewWindow::vpMousePressEvent(QMouseEvent* theEvent)
//****************************************************************
void XGUI_ViewWindow::contextMenuEvent(QContextMenuEvent* theEvent)
{
//****************************************************************
void XGUI_ViewWindow::contextMenuEvent(QContextMenuEvent* theEvent)
{
- QFrame::contextMenuEvent(theEvent);
- emit contextMenuRequested(theEvent);
+ if (theEvent->modifiers() == Qt::NoModifier) {
+ // Temporary: has to be removed when viewer popup will be defined
+ //QFrame::contextMenuEvent(theEvent);
+ emit contextMenuRequested(theEvent);
+ }
}
//****************************************************************
}
//****************************************************************